fmc: avoid readl/writel namespace conflict

The use of the 'readl' and 'writel' identifiers here causes build errors on architectures where those are macros. This renames the fields to read32/write32 to avoid the problem. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Alessandro Rubini <rubini@gnudd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

fmc: avoid readl/writel namespace conflict
The use of the 'readl' and 'writel' identifiers here causes build errors on architectures where those are macros. This renames the fields to read32/write32 to avoid the problem. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Alessandro Rubini <rubini@gnudd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
27e6b003 · Arnd Bergmann · Alessandro Rubini · e7795122 · 27e6b003 · 27e6b003
Commit 27e6b003 authored Jun 19, 2013 by Arnd Bergmann Committed by Alessandro Rubini Jul 01, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

fmc-fakedev.c kernel/fmc-fakedev.c +2 -2

fmc.h kernel/include/linux/fmc.h +6 -6

No files found.
--- a/kernel/fmc-fakedev.c
+++ b/kernel/fmc-fakedev.c
@@ -226,8 +226,8 @@ static int ff_validate(struct fmc_device *fmc, struct fmc_driver *drv)
 static struct fmc_operations ff_fmc_operations = {
-	.readl =		ff_readl,
+	.read32 =		ff_readl,
-	.writel =		ff_writel,
+	.write32 =		ff_writel,
 	.reprogram =		ff_reprogram,
 	.irq_request =		ff_irq_request,
 	.read_ee =		ff_read_ee,

--- a/kernel/include/linux/fmc.h
+++ b/kernel/include/linux/fmc.h
@@ -129,8 +129,8 @@ struct fmc_gpio {
 * the exception.
 */
 struct fmc_operations {
-	uint32_t (*readl)(struct fmc_device *fmc, int offset);
+	uint32_t (*read32)(struct fmc_device *fmc, int offset);
-	void (*writel)(struct fmc_device *fmc, uint32_t value, int offset);
+	void (*write32)(struct fmc_device *fmc, uint32_t value, int offset);
 	int (*validate)(struct fmc_device *fmc, struct fmc_driver *drv);
 	int (*reprogram)(struct fmc_device *f, struct fmc_driver *d, char *gw);
 	int (*irq_request)(struct fmc_device *fmc, irq_handler_t h,
@@ -194,14 +194,14 @@ struct fmc_device {
 */
 static inline uint32_t fmc_readl(struct fmc_device *fmc, int offset)
 {
-	if (unlikely(fmc->op->readl))
+	if (unlikely(fmc->op->read32))
-		return fmc->op->readl(fmc, offset);
+		return fmc->op->read32(fmc, offset);
 	return readl(fmc->fpga_base + offset);
 }
 static inline void fmc_writel(struct fmc_device *fmc, uint32_t val, int off)
 {
-	if (unlikely(fmc->op->writel))
+	if (unlikely(fmc->op->write32))
-		fmc->op->writel(fmc, val, off);
+		fmc->op->write32(fmc, val, off);
 	else
 		writel(val, fmc->fpga_base + off);
 }