| Message ID | 201210091537.23659.arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
I sent a patch for that already, Chris was cced on it recently by Shawn too. (Sorry for top posting, Android mail client) Dne 9.10.2012 17:39 "Arnd Bergmann" <arnd@arndb.de> napsal(a): > From all I can tell, the patches > > fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop" > 829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI" > > came in through separate branches and cause this build error when > combined. > > drivers/mmc/host/mxs-mmc.c: In function 'mxs_mmc_enable_sdio_irq': > drivers/mmc/host/mxs-mmc.c:527:78: error: 'struct mxs_mmc_host' has no > member named 'base' > drivers/mmc/host/mxs-mmc.c:527:95: error: 'struct mxs_mmc_host' has no > member named 'devid' > > This does the obvious missing change. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Cc: Attila Kinali <attila@kinali.ch> > Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com> > Cc: Marek Vasut <marex@denx.de> > Cc: Chris Ball <cjb@laptop.org> > Cc: Shawn Guo <shawn.guo@linaro.org> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> > > diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c > index bb4c2bf..80d1e6d 100644 > --- a/drivers/mmc/host/mxs-mmc.c > +++ b/drivers/mmc/host/mxs-mmc.c > @@ -525,7 +525,7 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host > *mmc, int enable) > writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, > ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET); > writel(BM_SSP_CTRL1_SDIO_IRQ_EN, > - host->base + HW_SSP_CTRL1(host) + > STMP_OFFSET_REG_SET); > + ssp->base + HW_SSP_CTRL1(ssp) + > STMP_OFFSET_REG_SET); > } else { > writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, > ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR); > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
Hi, On Tue, Oct 09 2012, Arnd Bergmann wrote: > From all I can tell, the patches > > fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop" > 829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI" > > came in through separate branches and cause this build error when > combined. > > drivers/mmc/host/mxs-mmc.c: In function 'mxs_mmc_enable_sdio_irq': > drivers/mmc/host/mxs-mmc.c:527:78: error: 'struct mxs_mmc_host' has no member named 'base' > drivers/mmc/host/mxs-mmc.c:527:95: error: 'struct mxs_mmc_host' has no member named 'devid' > > This does the obvious missing change. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Cc: Attila Kinali <attila@kinali.ch> > Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com> > Cc: Marek Vasut <marex@denx.de> > Cc: Chris Ball <cjb@laptop.org> > Cc: Shawn Guo <shawn.guo@linaro.org> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> > > diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c > index bb4c2bf..80d1e6d 100644 > --- a/drivers/mmc/host/mxs-mmc.c > +++ b/drivers/mmc/host/mxs-mmc.c > @@ -525,7 +525,7 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) > writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, > ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET); > writel(BM_SSP_CTRL1_SDIO_IRQ_EN, > - host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET); > + ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET); > } else { > writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, > ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR); > I'll send Marek's change to Linus once the main MMC merge has been pulled. Thanks, - Chris.
Dear Chris Ball, > Hi, > > On Tue, Oct 09 2012, Arnd Bergmann wrote: > > From all I can tell, the patches > > > > fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop" > > 829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI" > > > > came in through separate branches and cause this build error when > > combined. [...] > > I'll send Marek's change to Linus once the main MMC merge has been pulled. > Thanks, > > - Chris. Thanks! Sorry from my previous reply from Android phone, I just saw what horrible email it generated :-( Best regards, Marek Vasut
On Tuesday 09 October 2012, Chris Ball wrote:
> I'll send Marek's change to Linus once the main MMC merge has been pulled.
Ok, thanks!
Arnd
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index bb4c2bf..80d1e6d 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -525,7 +525,7 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET); writel(BM_SSP_CTRL1_SDIO_IRQ_EN, - host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET); + ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET); } else { writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
From all I can tell, the patches fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop" 829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI" came in through separate branches and cause this build error when combined. drivers/mmc/host/mxs-mmc.c: In function 'mxs_mmc_enable_sdio_irq': drivers/mmc/host/mxs-mmc.c:527:78: error: 'struct mxs_mmc_host' has no member named 'base' drivers/mmc/host/mxs-mmc.c:527:95: error: 'struct mxs_mmc_host' has no member named 'devid' This does the obvious missing change. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Attila Kinali <attila@kinali.ch> Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com> Cc: Marek Vasut <marex@denx.de> Cc: Chris Ball <cjb@laptop.org> Cc: Shawn Guo <shawn.guo@linaro.org> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>