From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Ball Subject: Re: [PATCH] sdhci-s3c: fixed compiler error for renamed register Date: Wed, 11 May 2011 09:52:26 -0400 Message-ID: References: <4DCA3B54.3000607@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from void.printf.net ([89.145.121.20]:57200 "EHLO void.printf.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754827Ab1EKPpO (ORCPT ); Wed, 11 May 2011 11:45:14 -0400 In-Reply-To: <4DCA3B54.3000607@samsung.com> (Jaehoon Chung's message of "Wed, 11 May 2011 16:31:32 +0900") Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Jaehoon Chung Cc: "linux-mmc@vger.kernel.org" , Ben Dooks , Kyungmin Park , "Nath, Arindam" Hi, On Wed, May 11 2011, Jaehoon Chung wrote: > In Arindam Nath's patch "mmc:sd: add support for driver type selection" > included renamed SDHCI_HOST_CONTROL1. > > In sdhci-s3c, we used SDHCI_HOST_CONTROL in sdhci_s3c_platform_8bit_width(). > Also we need to use the renamed register in sdhci-s3c.c > > Signed-off-by: Jaehoon Chung > Signed-off-by: Kyungmin Park > --- > drivers/mmc/host/sdhci-s3c.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c > index 69e3ee3..15a6195 100644 > --- a/drivers/mmc/host/sdhci-s3c.c > +++ b/drivers/mmc/host/sdhci-s3c.c > @@ -289,7 +289,7 @@ static int sdhci_s3c_platform_8bit_width(struct sdhci_host *host, int width) > { > u8 ctrl; > > - ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); > + ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL1); > > switch (width) { > case MMC_BUS_WIDTH_8: > @@ -304,7 +304,7 @@ static int sdhci_s3c_platform_8bit_width(struct sdhci_host *host, int width) > break; > } > > - sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); > + sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL1); > > return 0; > } > Thanks, this affects other drivers too: sdhci-esdhc-imx.c: case SDHCI_HOST_CONTROL: sdhci-of-esdhc.c: if (reg == SDHCI_HOST_CONTROL) sdhci-s3c.c: ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); sdhci-s3c.c: sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); sdhci-tegra.c: ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); sdhci-tegra.c: sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); Arindam, is there any problem with continuing to use SDHCI_HOST_CONTROL for the first register, and adding SDHCI_HOST_CONTROL2 for the second? I think that would be better than modifying all of the drivers. Thanks, - Chris. -- Chris Ball One Laptop Per Child