[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090302210945.04bfa623@mjolnir.ossman.eu>
Date: Mon, 2 Mar 2009 21:09:45 +0100
From: Pierre Ossman <drzeus-mmc@...eus.cx>
To: Jorg Schummer <ext-jorg.2.schummer@...ia.com>
Cc: linux-kernel@...r.kernel.org,
Jorg Schummer <ext-jorg.2.schummer@...ia.com>
Subject: Re: [PATCH RFT] MMC: core/core.c: mmc_rescan detects card change in
one run
On Thu, 19 Feb 2009 17:26:26 +0200
Jorg Schummer <ext-jorg.2.schummer@...ia.com> wrote:
> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
> index df6ce4a..cd2e29f 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -740,6 +740,22 @@ void mmc_rescan(struct work_struct *work)
>
> mmc_bus_get(host);
>
> + /* if there is a card registered */
> + if (host->bus_ops != NULL) {
> +
> + if (host->bus_ops->detect && !host->bus_dead) {
> +
> + /* check whether the card is still present */
> + host->bus_ops->detect(host);
> +
> + /* release the bus and update bus status in case
> + the card was removed */
> + mmc_bus_put(host);
> + mmc_bus_get(host);
> + }
> + }
> +
> + /* if there is no card registered */
> if (host->bus_ops == NULL) {
> /*
> * Only we can add a new handler, so it's safe to
Perhaps it's more clear if you grab the lock for the first section,
release it after and then regrab it for the second section. A bit less
efficient, but I don't think that will be a problem in practice.
> @@ -789,12 +805,8 @@ void mmc_rescan(struct work_struct *work)
>
> mmc_release_host(host);
> mmc_power_off(host);
> - } else {
> - if (host->bus_ops->detect && !host->bus_dead)
> - host->bus_ops->detect(host);
> -
> + } else
> mmc_bus_put(host);
> - }
> out:
> if (host->caps & MMC_CAP_NEEDS_POLL)
> mmc_schedule_delayed_work(&host->detect, HZ);
The else section got a bit small here with that code removed. Perhaps
we should instead have:
if (host->bus_ops != NULL) {
mmc_bus_put(host);
goto out;
}
With some adjusted comments to make the flow clear.
Rgds
--
-- Pierre Ossman
Linux kernel, MMC maintainer http://www.kernel.org
rdesktop, core developer http://www.rdesktop.org
WARNING: This correspondence is being monitored by the
Swedish government. Make sure your server uses encryption
for SMTP traffic and consider using PGP for end-to-end
encryption.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists