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

Commit c2955da0 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

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: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarAlessandro Rubini <rubini@gnudd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e42d50ba

drivers/fmc/fmc-fakedev.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

include/linux/fmc.h

+6 −6
Original line number Diff line number Diff line
@@ -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);

}