Message ID | 1426625199-14127-5-git-send-email-robh@kernel.org |
---|---|
State | Accepted |
Delegated to: | Pantelis Antoniou |
Headers | show |
Hi Rob, > On Mar 17, 2015, at 22:46 , Rob Herring <robh@kernel.org> wrote: > > Change addresses to unsigned long to be compatible with 64-bit builds. > Regardless of fixing warnings, the device is still only 32-bit capable. > > Signed-off-by: Rob Herring <robh@kernel.org> > Cc: Pantelis Antoniou <panto@antoniou-consulting.com> > --- > drivers/mmc/mv_sdhci.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c > index 63e1f90..75fa014 100644 > --- a/drivers/mmc/mv_sdhci.c > +++ b/drivers/mmc/mv_sdhci.c > @@ -12,7 +12,7 @@ static struct sdhci_ops mv_ops; > static inline void mv_sdhci_writeb(struct sdhci_host *host, u8 val, int reg) > { > struct mmc *mmc = host->mmc; > - u32 ata = (u32)host->ioaddr + SD_CE_ATA_2; > + u32 ata = (unsigned long)host->ioaddr + SD_CE_ATA_2; > > if (!IS_SD(mmc) && reg == SDHCI_HOST_CONTROL) { > if (mmc->bus_width == 8) > @@ -30,7 +30,7 @@ static inline void mv_sdhci_writeb(struct sdhci_host *host, u8 val, int reg) > #endif /* CONFIG_MMC_SDHCI_IO_ACCESSORS */ > > static char *MVSDH_NAME = "mv_sdh"; > -int mv_sdh_init(u32 regbase, u32 max_clk, u32 min_clk, u32 quirks) > +int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks) > { > struct sdhci_host *host = NULL; > host = (struct sdhci_host *)malloc(sizeof(struct sdhci_host)); > -- > 2.1.0 > Thanks, applied. — Pantelis
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c index 63e1f90..75fa014 100644 --- a/drivers/mmc/mv_sdhci.c +++ b/drivers/mmc/mv_sdhci.c @@ -12,7 +12,7 @@ static struct sdhci_ops mv_ops; static inline void mv_sdhci_writeb(struct sdhci_host *host, u8 val, int reg) { struct mmc *mmc = host->mmc; - u32 ata = (u32)host->ioaddr + SD_CE_ATA_2; + u32 ata = (unsigned long)host->ioaddr + SD_CE_ATA_2; if (!IS_SD(mmc) && reg == SDHCI_HOST_CONTROL) { if (mmc->bus_width == 8) @@ -30,7 +30,7 @@ static inline void mv_sdhci_writeb(struct sdhci_host *host, u8 val, int reg) #endif /* CONFIG_MMC_SDHCI_IO_ACCESSORS */ static char *MVSDH_NAME = "mv_sdh"; -int mv_sdh_init(u32 regbase, u32 max_clk, u32 min_clk, u32 quirks) +int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks) { struct sdhci_host *host = NULL; host = (struct sdhci_host *)malloc(sizeof(struct sdhci_host));
Change addresses to unsigned long to be compatible with 64-bit builds. Regardless of fixing warnings, the device is still only 32-bit capable. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Pantelis Antoniou <panto@antoniou-consulting.com> --- drivers/mmc/mv_sdhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)