Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc297c92 authored by Matt Fleming's avatar Matt Fleming Committed by Linus Torvalds
Browse files

sdhci: build fix: rename SDHCI I/O accessor functions 



Unfortunately some architectures #define their read{b,w,l} and
write{b,w,l} I/O accessors which makes the SDHCI I/O accessor functions of
the same names subject to preprocessing.  This leads to the following
compiler error,

In file included from drivers/mmc/host/sdhci.c:26:
drivers/mmc/host/sdhci.h:318:35: error: macro "writel" passed 3 arguments, but takes just 2

Rename the SDHCI I/O functions so that CONFIG_MMC_SDHCI_IO_ACCESSORS can
be enabled for architectures that implement their read{b,w,l} and
write{b,w,l} functions with macros.

Signed-off-by: default avatarMatt Fleming <matt@console-pimps.org>
Cc: Zhangfei Gao <zgao6@marvell.com>
Acked-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarBen Dooks <ben-linux@fluff.org>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a751a7d6

drivers/mmc/host/sdhci-of-esdhc.c

+6 −6
Original line number Diff line number Diff line
@@ -129,12 +129,12 @@ struct sdhci_of_data sdhci_esdhc = { 
		  SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET |

		  SDHCI_QUIRK_NO_CARD_NO_RESET,

	.ops = {

		.readl = sdhci_be32bs_readl,

		.readw = esdhc_readw,

		.readb = sdhci_be32bs_readb,

		.writel = sdhci_be32bs_writel,

		.writew = esdhc_writew,

		.writeb = esdhc_writeb,

		.read_l = sdhci_be32bs_readl,

		.read_w = esdhc_readw,

		.read_b = sdhci_be32bs_readb,

		.write_l = sdhci_be32bs_writel,

		.write_w = esdhc_writew,

		.write_b = esdhc_writeb,

		.set_clock = esdhc_set_clock,

		.enable_dma = esdhc_enable_dma,

		.get_max_clock = esdhc_get_max_clock,

drivers/mmc/host/sdhci-of-hlwd.c

+6 −6
Original line number Diff line number Diff line
@@ -55,11 +55,11 @@ struct sdhci_of_data sdhci_hlwd = { 
	.quirks = SDHCI_QUIRK_32BIT_DMA_ADDR |

		  SDHCI_QUIRK_32BIT_DMA_SIZE,

	.ops = {

		.readl = sdhci_be32bs_readl,

		.readw = sdhci_be32bs_readw,

		.readb = sdhci_be32bs_readb,

		.writel = sdhci_hlwd_writel,

		.writew = sdhci_hlwd_writew,

		.writeb = sdhci_hlwd_writeb,

		.read_l = sdhci_be32bs_readl,

		.read_w = sdhci_be32bs_readw,

		.read_b = sdhci_be32bs_readb,

		.write_l = sdhci_hlwd_writel,

		.write_w = sdhci_hlwd_writew,

		.write_b = sdhci_hlwd_writeb,

	},

};

drivers/mmc/host/sdhci.h

+18 −18
Original line number Diff line number Diff line
@@ -296,12 +296,12 @@ struct sdhci_host { 


struct sdhci_ops {

#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS

	u32		(*readl)(struct sdhci_host *host, int reg);

	u16		(*readw)(struct sdhci_host *host, int reg);

	u8		(*readb)(struct sdhci_host *host, int reg);

	void		(*writel)(struct sdhci_host *host, u32 val, int reg);

	void		(*writew)(struct sdhci_host *host, u16 val, int reg);

	void		(*writeb)(struct sdhci_host *host, u8 val, int reg);

	u32		(*read_l)(struct sdhci_host *host, int reg);

	u16		(*read_w)(struct sdhci_host *host, int reg);

	u8		(*read_b)(struct sdhci_host *host, int reg);

	void		(*write_l)(struct sdhci_host *host, u32 val, int reg);

	void		(*write_w)(struct sdhci_host *host, u16 val, int reg);

	void		(*write_b)(struct sdhci_host *host, u8 val, int reg);

#endif



	void	(*set_clock)(struct sdhci_host *host, unsigned int clock);
@@ -316,48 +316,48 @@ struct sdhci_ops { 


static inline void sdhci_writel(struct sdhci_host *host, u32 val, int reg)

{

	if (unlikely(host->ops->writel))

		host->ops->writel(host, val, reg);

	if (unlikely(host->ops->write_l))

		host->ops->write_l(host, val, reg);

	else

		writel(val, host->ioaddr + reg);

}



static inline void sdhci_writew(struct sdhci_host *host, u16 val, int reg)

{

	if (unlikely(host->ops->writew))

		host->ops->writew(host, val, reg);

	if (unlikely(host->ops->write_w))

		host->ops->write_w(host, val, reg);

	else

		writew(val, host->ioaddr + reg);

}



static inline void sdhci_writeb(struct sdhci_host *host, u8 val, int reg)

{

	if (unlikely(host->ops->writeb))

		host->ops->writeb(host, val, reg);

	if (unlikely(host->ops->write_b))

		host->ops->write_b(host, val, reg);

	else

		writeb(val, host->ioaddr + reg);

}



static inline u32 sdhci_readl(struct sdhci_host *host, int reg)

{

	if (unlikely(host->ops->readl))

		return host->ops->readl(host, reg);

	if (unlikely(host->ops->read_l))

		return host->ops->read_l(host, reg);

	else

		return readl(host->ioaddr + reg);

}



static inline u16 sdhci_readw(struct sdhci_host *host, int reg)

{

	if (unlikely(host->ops->readw))

		return host->ops->readw(host, reg);

	if (unlikely(host->ops->read_w))

		return host->ops->read_w(host, reg);

	else

		return readw(host->ioaddr + reg);

}



static inline u8 sdhci_readb(struct sdhci_host *host, int reg)

{

	if (unlikely(host->ops->readb))

		return host->ops->readb(host, reg);

	if (unlikely(host->ops->read_b))

		return host->ops->read_b(host, reg);

	else

		return readb(host->ioaddr + reg);

}