From: Jaehoon Chung <jh80.chung@samsung.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-mmc <linux-mmc@vger.kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Shawn Lin <shawn.lin@rock-chips.com>
Subject: Re: [PATCH] mmc: core: use the defined function to check whether card is removable
Date: Thu, 04 Feb 2016 14:56:15 +0900 [thread overview]
Message-ID: <56B2E7FF.8030903@samsung.com> (raw)
In-Reply-To: <CAPDyKFpgc_9t+fKY-=ODENR9B=_S50EnB9tc9x7+7Adfm=rX6g@mail.gmail.com>
On 02/02/2016 10:11 PM, Ulf Hansson wrote:
> On 29 January 2016 at 00:52, Jaehoon Chung <jh80.chung@samsung.com> wrote:
>> In linux/mmc/host.h, mmc_card_is_removable() is already defined.
>> There is no reason that it doesn't use.
>>
>> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
>
> Thanks, applied for next!
>
> Regarding the host drivers, as pointed out by Shawn. Let's fix them in
> one separate patch.
I will do it. Thanks!
Best Regards,
Jaehoon Chung
>
> Kind regards
> Uffe
>
>> ---
>> drivers/mmc/core/core.c | 9 ++++-----
>> 1 file changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
>> index f95d41f..9da9b60 100644
>> --- a/drivers/mmc/core/core.c
>> +++ b/drivers/mmc/core/core.c
>> @@ -2532,7 +2532,7 @@ int mmc_detect_card_removed(struct mmc_host *host)
>> if (!card)
>> return 1;
>>
>> - if (host->caps & MMC_CAP_NONREMOVABLE)
>> + if (!mmc_card_is_removable(host))
>> return 0;
>>
>> ret = mmc_card_removed(card);
>> @@ -2570,7 +2570,7 @@ void mmc_rescan(struct work_struct *work)
>> return;
>>
>> /* If there is a non-removable card registered, only scan once */
>> - if ((host->caps & MMC_CAP_NONREMOVABLE) && host->rescan_entered)
>> + if (!mmc_card_is_removable(host) && host->rescan_entered)
>> return;
>> host->rescan_entered = 1;
>>
>> @@ -2587,8 +2587,7 @@ void mmc_rescan(struct work_struct *work)
>> * if there is a _removable_ card registered, check whether it is
>> * still present
>> */
>> - if (host->bus_ops && !host->bus_dead
>> - && !(host->caps & MMC_CAP_NONREMOVABLE))
>> + if (host->bus_ops && !host->bus_dead && mmc_card_is_removable(host))
>> host->bus_ops->detect(host);
>>
>> host->detect_change = 0;
>> @@ -2613,7 +2612,7 @@ void mmc_rescan(struct work_struct *work)
>> mmc_bus_put(host);
>>
>> mmc_claim_host(host);
>> - if (!(host->caps & MMC_CAP_NONREMOVABLE) && host->ops->get_cd &&
>> + if (mmc_card_is_removable(host) && host->ops->get_cd &&
>> host->ops->get_cd(host) == 0) {
>> mmc_power_off(host);
>> mmc_release_host(host);
>> --
>> 1.9.1
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
prev parent reply other threads:[~2016-02-04 5:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-28 23:52 [PATCH] mmc: core: use the defined function to check whether card is removable Jaehoon Chung
2016-01-29 0:38 ` Shawn Lin
2016-02-02 13:11 ` Ulf Hansson
2016-02-04 5:56 ` Jaehoon Chung [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56B2E7FF.8030903@samsung.com \
--to=jh80.chung@samsung.com \
--cc=adrian.hunter@intel.com \
--cc=linux-mmc@vger.kernel.org \
--cc=shawn.lin@rock-chips.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox