2006-12-04 10:28:57

by Sascha Hauer

Subject: mmc: pxamci compilation fix

Hi Pierre and all,

since commit fcaf71fd51f9cfc504455d3e19ec242e4b2073ed
struct mmc_host does not have a dev field. Retrieve the device with
mmc_dev() instead.

Signed-off-by: Sascha Hauer <[email protected]>

Index: drivers/mmc/pxamci.c
===================================================================
--- a/drivers/mmc/pxamci.c.orig
+++ b/drivers/mmc/pxamci.c
@@ -355,7 +355,7 @@ static int pxamci_get_ro(struct mmc_host
struct pxamci_host *host = mmc_priv(mmc);

if (host->pdata && host->pdata->get_ro)
- return host->pdata->get_ro(mmc->dev);
+ return host->pdata->get_ro(mmc_dev(mmc));
/* Host doesn't support read only detection so assume writeable */
return 0;
}
@@ -383,7 +383,7 @@ static void pxamci_set_ios(struct mmc_ho
host->power_mode = ios->power_mode;

if (host->pdata && host->pdata->setpower)
- host->pdata->setpower(mmc->dev, ios->vdd);
+ host->pdata->setpower(mmc_dev(mmc), ios->vdd);

if (ios->power_mode == MMC_POWER_ON)
host->cmdat |= CMDAT_INIT;


--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9

2006-12-05 06:40:13

by Pierre Ossman

Subject: Re: mmc: pxamci compilation fix

Sascha Hauer wrote:
> Hi Pierre and all,
>
> since commit fcaf71fd51f9cfc504455d3e19ec242e4b2073ed
> struct mmc_host does not have a dev field. Retrieve the device with
> mmc_dev() instead.
>
> Signed-off-by: Sascha Hauer <[email protected]>
>

Bad Greg ;)

Applied, thanks.

Rgds
--
-- Pierre Ossman

Linux kernel, MMC maintainer http://www.kernel.org
PulseAudio, core developer http://pulseaudio.org
rdesktop, core developer http://www.rdesktop.org