From patchwork Mon Jun 27 09:21:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102083 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp972366qgy; Mon, 27 Jun 2016 02:19:34 -0700 (PDT) X-Received: by 10.98.36.130 with SMTP id k2mr31394805pfk.118.1467019174259; Mon, 27 Jun 2016 02:19:34 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o128si25624251pfg.246.2016.06.27.02.19.34; Mon, 27 Jun 2016 02:19:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751709AbcF0JTd (ORCPT + 2 others); Mon, 27 Jun 2016 05:19:33 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:50732 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751590AbcF0JTc (ORCPT ); Mon, 27 Jun 2016 05:19:32 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue003) with ESMTPA (Nemesis) id 0McAjL-1b1iCS2jF1-00Jekf; Mon, 27 Jun 2016 11:19:23 +0200 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Arnd Bergmann , Jiri Slaby , Ricardo Ribalda Delgado , Alan Cox , "Ji-Ze Hong (Peter Hong)" , Peter Hurley , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] 8250/fintek: rename IRQ_MODE macro Date: Mon, 27 Jun 2016 11:21:10 +0200 Message-Id: <20160627092152.1430477-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:hx2KHxi1zYUwwQYGB8KdZKt5YAgT4hi156d9UxND4UPWJTa/7VE YqPCUwxEzn1sOdOh1fjUU3/1Pna89+rSfsnFirblS89z0UY6Yp17OLrfnZmGEzAgpksnapV hW/qAoTiqaB95OQgI6UlEaMKs2+ngi4WYwWi5R33LOzUQQVVluA+OMX+dcJINO7N0Ox+82M keR+Vj3qQQNjS/nvnqXgw== X-UI-Out-Filterresults: notjunk:1; V01:K0:E0Me0nX8SGk=:S3SoTdWSft2h69ivLMlPEb 8TSepx8BSZey8d16rkCX1fN7Ej+DQ4GymEXP8ymKQTsHZ33Gi1LCgb/ZxAOMK0p40w9wDPA7o TVHKxVl5e2L0bksm/0uBVaH4gbxFxrPT4k8aPiv2t3kP3Nu4acqX5D32vuN4MsJUHMrh16rCh FxkTTlGEADyF6/WVvYVByEZB508RtMsnw1QDjbJyLgQq0Jlk61zrrKyEXRUta4brBZhCY8GPM UNjmUPR80RAR1TYtG9XI5es9DyWIzyLp9ZboNY7Tsk03iZCt+mT7tpIFAD0Y/UPGSnN2PG9Oe oGVjAw2O4uEqPBKhzh0v2S6/lwjqsHTz+aabhBUsCrpNAHD4bB4A/x1Xu9pKQrZtGTpXDzpjX RmazVu6I8NQwIIDKPHovrLRkjsNnSRtEUHeM9oJVokUqsVS5R6I135c0BLuvCRzHYOOS2mPbY yxJFpOARcF0H++yQ7963kxeF4hS0FngItuCyZcK0689qZka1SirS8YpfQ6sIrUOFG9im0xLWk KBoqoQRUWddR3S1yQGNsUUL17ckfwOaR5Eh/zTbOYURi1pbAa/SJznGd0yDvYY3HuvNCHlxsp mSybjDw7XC9/fpF9RTJVKpwf5FNIdFV9G72PQj5IkxTj+wvqbwyMH9wGQ2K+dVKhKC81S2xSa SZViEZumJMEPA+pSyQm0kMSn1FNPSk4hP7DbSSiaFFvqIYKQ7xDWj8utsvS3lzni2B6s= Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org 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 Fixes: 4da22f1418cb ("serial: 8250_fintek: fix the mismatched IRQ mode") --- drivers/tty/serial/8250/8250_fintek.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;