diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-19 12:49:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-20 05:30:32 +0200 |
| commit | c2955da0e101c3432ae21945e5d77786adf1f094 (patch) | |
| tree | 7d20a487bd2fd00c7876d48d21e4dbd3d96555c8 /drivers/fmc/fmc-fakedev.c | |
| parent | FMC: NULL dereference on allocation failure (diff) | |
| download | linux-c2955da0e101c3432ae21945e5d77786adf1f094.tar.xz linux-c2955da0e101c3432ae21945e5d77786adf1f094.zip | |
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 'drivers/fmc/fmc-fakedev.c')
| -rw-r--r-- | drivers/fmc/fmc-fakedev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/fmc/fmc-fakedev.c b/drivers/fmc/fmc-fakedev.c index bec94ac0764c..941d0930969a 100644 --- a/drivers/fmc/fmc-fakedev.c +++ b/drivers/fmc/fmc-fakedev.c @@ -232,8 +232,8 @@ static int ff_validate(struct fmc_device *fmc, struct fmc_driver *drv) static struct fmc_operations ff_fmc_operations = { - .readl = ff_readl, - .writel = ff_writel, + .read32 = ff_readl, + .write32 = ff_writel, .reprogram = ff_reprogram, .irq_request = ff_irq_request, .read_ee = ff_read_ee, |