Re: [PATCH 05/18] MMC: OMAP: Introduce new multislot structure andchange driver to use it

From: Pierre Ossman
Date: Mon Mar 24 2008 - 07:13:31 EST


On Fri, 14 Mar 2008 15:36:17 -0400
Carlos Aguiar <carlos.aguiar@xxxxxxxxxxx> wrote:

> From: Juha Yrjola <juha.yrjola@xxxxxxxxxxxxx>
>
> Introduce new MMC multislot structure and change driver to use it.
>
> Note that MMC clocking is now enabled in mmc_omap_select_slot()
> and disabled in mmc_omap_release_slot().
>
> Signed-off-by: Juha Yrjola <juha.yrjola@xxxxxxxxxxxxx>
> Signed-off-by: Jarkko Lavinen <jarkko.lavinen@xxxxxxxxx>
> Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@xxxxxxxxxxx>
> Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
> ---

*snip*

> +
> + if (slot->pdata->name != NULL) {
> + r = device_create_file(&mmc->class_dev,
> + &dev_attr_slot_name);
> + if (r < 0)
> + goto err_remove_host;
> + }
> +
> + if (slot->pdata->get_ro != NULL) {
> + r = device_create_file(&mmc->class_dev,
> + &dev_attr_ro);
> + }
> +

I guess these should have been removed as well?

> +static void mmc_omap_remove_slot(struct mmc_omap_slot *slot)
> +{
> + struct mmc_host *mmc = slot->mmc;
> +
> + if (slot->pdata->name != NULL)
> + device_remove_file(&mmc->class_dev, &dev_attr_slot_name);
> + if (slot->pdata->get_ro != NULL)
> + device_remove_file(&mmc->class_dev, &dev_attr_ro);
> +

Same thing here.

Otherwise the patch looks fine.

--
-- Pierre Ossman

Linux kernel, MMC maintainer http://www.kernel.org
PulseAudio, core developer http://pulseaudio.org
rdesktop, core developer http://www.rdesktop.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/