From: Chris Ball <cjb@laptop.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org,
Attila Kinali <attila@kinali.ch>,
Lauri Hintsala <lauri.hintsala@bluegiga.com>,
Marek Vasut <marex@denx.de>, Shawn Guo <shawn.guo@linaro.org>,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: Re: [PATCH] mmc: mxs: fix build regression from mismerge
Date: Tue, 09 Oct 2012 11:51:29 -0400 [thread overview]
Message-ID: <877gqzabjy.fsf@octavius.laptop.org> (raw)
In-Reply-To: <201210091537.23659.arnd@arndb.de> (Arnd Bergmann's message of "Tue, 9 Oct 2012 15:37:23 +0000")
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
WARNING: multiple messages have this Message-ID (diff)
From: cjb@laptop.org (Chris Ball)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] mmc: mxs: fix build regression from mismerge
Date: Tue, 09 Oct 2012 11:51:29 -0400 [thread overview]
Message-ID: <877gqzabjy.fsf@octavius.laptop.org> (raw)
In-Reply-To: <201210091537.23659.arnd@arndb.de> (Arnd Bergmann's message of "Tue, 9 Oct 2012 15:37:23 +0000")
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
next prev parent reply other threads:[~2012-10-09 15:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-09 15:37 [PATCH] mmc: mxs: fix build regression from mismerge Arnd Bergmann
2012-10-09 15:37 ` Arnd Bergmann
2012-10-09 15:42 ` Marek Vašut
2012-10-09 15:42 ` Marek Vašut
2012-10-09 15:51 ` Chris Ball [this message]
2012-10-09 15:51 ` Chris Ball
2012-10-09 17:10 ` Marek Vasut
2012-10-09 17:10 ` Marek Vasut
2012-10-09 18:23 ` Arnd Bergmann
2012-10-09 18:23 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877gqzabjy.fsf@octavius.laptop.org \
--to=cjb@laptop.org \
--cc=arnd@arndb.de \
--cc=attila@kinali.ch \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lauri.hintsala@bluegiga.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=marex@denx.de \
--cc=shawn.guo@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.