summaryrefslogtreecommitdiffstats
path: root/include/linux/fmc.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-19 12:49:30 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-19 20:30:32 -0700
commitc2955da0e101c3432ae21945e5d77786adf1f094 (patch)
tree7d20a487bd2fd00c7876d48d21e4dbd3d96555c8 /include/linux/fmc.h
parente42d50baf43120a78985f13f6e9c8f92fae091c2 (diff)
downloadop-kernel-dev-c2955da0e101c3432ae21945e5d77786adf1f094.zip
op-kernel-dev-c2955da0e101c3432ae21945e5d77786adf1f094.tar.gz
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>
Diffstat (limited to 'include/linux/fmc.h')
-rw-r--r--include/linux/fmc.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/fmc.h b/include/linux/fmc.h
index a3c4985..a5f0aa5 100644
--- a/include/linux/fmc.h
+++ b/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);
- void (*writel)(struct fmc_device *fmc, uint32_t value, int offset);
+ uint32_t (*read32)(struct fmc_device *fmc, 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))
- return fmc->op->readl(fmc, offset);
+ if (unlikely(fmc->op->read32))
+ 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))
- fmc->op->writel(fmc, val, off);
+ if (unlikely(fmc->op->write32))
+ fmc->op->write32(fmc, val, off);
else
writel(val, fmc->fpga_base + off);
}
OpenPOWER on IntegriCloud