Skip to content

Commit cdff1ed

Browse files
rddunlapLee Jones
authored andcommitted
mfd: lpc_sch: Rename GPIOBASE to prevent build error
One MIPS platform (mach-rc32434) defines GPIOBASE. This macro conflicts with one of the same name in lpc_sch.c. Rename the latter one to prevent the build error. ../drivers/mfd/lpc_sch.c:25: error: "GPIOBASE" redefined [-Werror] 25 | #define GPIOBASE 0x44 ../arch/mips/include/asm/mach-rc32434/rb.h:32: note: this is the location of the previous definition 32 | #define GPIOBASE 0x050000 Cc: Denis Turischev <denis@compulab.co.il> Fixes: e82c60a ("mfd: Introduce lpc_sch for Intel SCH LPC bridge") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
1 parent 452d074 commit cdff1ed

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/mfd/lpc_sch.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define SMBASE 0x40
2323
#define SMBUS_IO_SIZE 64
2424

25-
#define GPIOBASE 0x44
25+
#define GPIO_BASE 0x44
2626
#define GPIO_IO_SIZE 64
2727
#define GPIO_IO_SIZE_CENTERTON 128
2828

@@ -145,7 +145,7 @@ static int lpc_sch_probe(struct pci_dev *dev, const struct pci_device_id *id)
145145
if (ret == 0)
146146
cells++;
147147

148-
ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio",
148+
ret = lpc_sch_populate_cell(dev, GPIO_BASE, "sch_gpio",
149149
info->io_size_gpio,
150150
id->device, &lpc_sch_cells[cells]);
151151
if (ret < 0)

0 commit comments

Comments
 (0)