* [PATCH] mmc: mxs: fix build regression from mismerge
@ 2012-10-09 15:37 Arnd Bergmann
2012-10-09 15:42 ` Marek Vašut
2012-10-09 15:51 ` Chris Ball
0 siblings, 2 replies; 5+ messages in thread
From: Arnd Bergmann @ 2012-10-09 15:37 UTC (permalink / raw)
To: linux-arm-kernel
>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);
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] mmc: mxs: fix build regression from mismerge
2012-10-09 15:37 [PATCH] mmc: mxs: fix build regression from mismerge Arnd Bergmann
@ 2012-10-09 15:42 ` Marek Vašut
2012-10-09 15:51 ` Chris Ball
1 sibling, 0 replies; 5+ messages in thread
From: Marek Vašut @ 2012-10-09 15:42 UTC (permalink / raw)
To: linux-arm-kernel
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 at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121009/2cf2c1ab/attachment-0001.html>
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] mmc: mxs: fix build regression from mismerge
2012-10-09 15:37 [PATCH] mmc: mxs: fix build regression from mismerge Arnd Bergmann
2012-10-09 15:42 ` Marek Vašut
@ 2012-10-09 15:51 ` Chris Ball
2012-10-09 17:10 ` Marek Vasut
2012-10-09 18:23 ` Arnd Bergmann
1 sibling, 2 replies; 5+ messages in thread
From: Chris Ball @ 2012-10-09 15:51 UTC (permalink / raw)
To: 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.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] mmc: mxs: fix build regression from mismerge
2012-10-09 15:51 ` Chris Ball
@ 2012-10-09 17:10 ` Marek Vasut
2012-10-09 18:23 ` Arnd Bergmann
1 sibling, 0 replies; 5+ messages in thread
From: Marek Vasut @ 2012-10-09 17:10 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] mmc: mxs: fix build regression from mismerge
2012-10-09 15:51 ` Chris Ball
2012-10-09 17:10 ` Marek Vasut
@ 2012-10-09 18:23 ` Arnd Bergmann
1 sibling, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2012-10-09 18:23 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-10-09 18:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-09 15:37 [PATCH] mmc: mxs: fix build regression from mismerge Arnd Bergmann
2012-10-09 15:42 ` Marek Vašut
2012-10-09 15:51 ` Chris Ball
2012-10-09 17:10 ` Marek Vasut
2012-10-09 18:23 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).