Skip to contentSkip to conversation

mmc: mxs: fix build regression from mismerge

PATCH New Arnd Bergmann 4 participants 5 messages Oct 9, 2012

Subsystems (2)
Arm i.MX and Layerscape MMC, SD and SDIO
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 mmc: mxs: fix build regression from mismerge

Quoted 1 line

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 <[email protected]>
Cc Attila Kinali <[email protected]>
Cc Lauri Hintsala <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Chris Ball <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Mark Brown <[email protected]>
drivers/mmc/host/mxs-mmc.c +1 -1
index bb4c2bf..80d1e6d 100644
@@ -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);
#1 lore raw

PATCH 1/1 mmc: mxs: fix build regression from mismerge

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" <[email protected]> napsal(a):

Quoted 41 lines

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 <[email protected]>
Cc Attila Kinali <[email protected]>
Cc Lauri Hintsala <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Chris Ball <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Mark Brown <[email protected]>
drivers/mmc/host/mxs-mmc.c +1 -1
index bb4c2bf..80d1e6d 100644
@@ -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);
Quoted 5 lines

_______________________________________________
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>

#2 lore raw

PATCH 1/1 mmc: mxs: fix build regression from mismerge

In reply to Arnd Bergmann

Hi,

Quoted 28 lines · Arnd Bergmann

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 <[email protected]>
Cc Attila Kinali <[email protected]>
Cc Lauri Hintsala <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Chris Ball <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Mark Brown <[email protected]>
drivers/mmc/host/mxs-mmc.c +0 -0
index bb4c2bf..80d1e6d 100644

drivers/mmc/host/mxs-mmc.c static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) · line 531

Quoted 8 lines
drivers/mmc/host/mxs-mmc.c +1 -1
@@ -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.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
#3 lore raw

PATCH 1/1 mmc: mxs: fix build regression from mismerge

Dear Chris Ball,

Quoted 10 lines

Hi,

Quoted 7 lines · Arnd Bergmann

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.

[...]

Quoted 5 lines

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

author
#4 lore raw

PATCH 1/1 mmc: mxs: fix build regression from mismerge

In reply to Chris Ball
Quoted 1 line · Chris Ball

I'll send Marek's change to Linus once the main MMC merge has been pulled.

Ok, thanks!

Arnd