From: Arnd Bergmann <arnd@arndb.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Jiri Slaby <jslaby@suse.com>,
"Ji-Ze Hong (Peter Hong)" <hpeter@gmail.com>,
Peter Hurley <peter@hurleysoftware.com>,
linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 7/9] 8250/fintek: rename IRQ_MODE macro
Date: Wed, 10 Aug 2016 23:54:13 +0200 [thread overview]
Message-ID: <20160810215424.1926658-8-arnd@arndb.de> (raw)
In-Reply-To: <20160810215424.1926658-1-arnd@arndb.de>
A bugfix for the fintek driver required defining some macros, but
one of them clashes with a system header on ARM:
drivers/tty/serial/8250/8250_fintek.c:34:0: error: "IRQ_MODE" redefined [-Werror]
#define IRQ_MODE 0x70
In file included from /git/arm-soc/arch/arm/include/asm/ptrace.h:13:0,
from /git/arm-soc/arch/arm/include/asm/irqflags.h:6,
from /git/arm-soc/include/linux/irqflags.h:15,
from /git/arm-soc/arch/arm/include/asm/bitops.h:27,
from /git/arm-soc/include/linux/bitops.h:36,
from /git/arm-soc/include/linux/kernel.h:10,
from /git/arm-soc/include/linux/list.h:8,
from /git/arm-soc/include/linux/module.h:9,
from /git/arm-soc/drivers/tty/serial/8250/8250_fintek.c:11:
arch/arm/include/uapi/asm/ptrace.h:55:0: note: this is the location of the previous definition
This renames the newly introduced 'IRQ_MODE' macro to FINTEK_IRQ_MODE.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 4da22f1418cb ("serial: 8250_fintek: fix the mismatched IRQ mode")
Link: https://patchwork.kernel.org/patch/9200119/
Acked-by: Ji-Ze Hong (Peter Hong) <hpeter+linux_kernel@gmail.com>
Acked-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Originally sent on June 27 when the warning appeared, but for
some reason the fix never got picked up.
---
drivers/tty/serial/8250/8250_fintek.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_fintek.c b/drivers/tty/serial/8250/8250_fintek.c
index 737b4b3957b0..0facc789fe7d 100644
--- a/drivers/tty/serial/8250/8250_fintek.c
+++ b/drivers/tty/serial/8250/8250_fintek.c
@@ -31,7 +31,7 @@
#define IO_ADDR2 0x60
#define LDN 0x7
-#define IRQ_MODE 0x70
+#define FINTEK_IRQ_MODE 0x70
#define IRQ_SHARE BIT(4)
#define IRQ_MODE_MASK (BIT(6) | BIT(5))
#define IRQ_LEVEL_LOW 0
@@ -195,7 +195,7 @@ static int fintek_8250_set_irq_mode(struct fintek_8250 *pdata, bool level_mode)
outb(LDN, pdata->base_port + ADDR_PORT);
outb(pdata->index, pdata->base_port + DATA_PORT);
- outb(IRQ_MODE, pdata->base_port + ADDR_PORT);
+ outb(FINTEK_IRQ_MODE, pdata->base_port + ADDR_PORT);
tmp = inb(pdata->base_port + DATA_PORT);
tmp &= ~IRQ_MODE_MASK;
--
2.9.0
next prev parent reply other threads:[~2016-08-10 21:59 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-10 21:54 [PATCH 0/9] v4.8 build regressions Arnd Bergmann
2016-08-10 21:54 ` [PATCH 1/9] kconfig: tinyconfig: provide whole choice blocks to avoid warnings Arnd Bergmann
2016-08-11 8:43 ` Masahiro Yamada
2016-08-11 8:59 ` Ingo Molnar
2016-08-10 21:54 ` [PATCH 2/9] dsa: mv88e6xxx: hide unused functions Arnd Bergmann
2016-08-13 0:32 ` David Miller
2016-08-10 21:54 ` [PATCH 3/9] drm/mediatek: add COMMON_CLK dependency Arnd Bergmann
2016-08-10 21:54 ` [PATCH 4/9] drm/mediatek: add CONFIG_OF dependency Arnd Bergmann
2016-08-10 21:54 ` [PATCH 5/9] drm/mediatek: add ARM_SMCCC dependency Arnd Bergmann
2016-08-10 21:54 ` [PATCH 6/9] clocksource: kona: fix get_counter error handling Arnd Bergmann
2016-08-11 0:00 ` Ray Jui
2016-08-16 13:11 ` Daniel Lezcano
2016-08-10 21:54 ` Arnd Bergmann [this message]
2016-08-10 21:54 ` [PATCH 8/9] test/hash: Fix warning in two-dimensional array init Arnd Bergmann
2016-08-10 21:54 ` [PATCH 9/9] test/hash: Fix warning in preprocessor symbol evaluation Arnd Bergmann
2016-08-10 22:45 ` Arnd Bergmann
2016-08-11 6:38 ` [PATCH 0/9] v4.8 build regressions Philipp Zabel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160810215424.1926658-8-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=hpeter@gmail.com \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=peter@hurleysoftware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome