From patchwork Wed Aug 10 21:54:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101952 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp610427qga; Wed, 10 Aug 2016 14:59:46 -0700 (PDT) X-Received: by 10.66.233.38 with SMTP id tt6mr10871435pac.99.1470866386894; Wed, 10 Aug 2016 14:59:46 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m63si50433336pfb.137.2016.08.10.14.59.46; Wed, 10 Aug 2016 14:59:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933939AbcHJV73 (ORCPT + 27 others); Wed, 10 Aug 2016 17:59:29 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:52072 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752560AbcHJV70 (ORCPT ); Wed, 10 Aug 2016 17:59:26 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue005) with ESMTPA (Nemesis) id 0MNQCL-1bZYO60fUn-0070U4; Wed, 10 Aug 2016 23:58:07 +0200 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Arnd Bergmann , Jiri Slaby , "Ji-Ze Hong (Peter Hong)" , Peter Hurley , 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 Message-Id: <20160810215424.1926658-8-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160810215424.1926658-1-arnd@arndb.de> References: <20160810215424.1926658-1-arnd@arndb.de> X-Provags-ID: V03:K0:U5gKTrumESozNJchQNyR02gcpkJvOma/Q2eUIQGJOrrDQB+UNQU 1M1V9AjDyVt/fcv1fF06nkTU4ud4YjWt6QCsthCbDiU2iN+741SFknkC43QlnKKM4j0Anxr pX1NlGAmegBY7wJN1EXj9CHgus0LAYxKHHBXSJ09g7YRbLxwivIU1qCNm3vK+pIZcMrIwh0 jetkP+YeyPUUv1LqPRNqg== X-UI-Out-Filterresults: notjunk:1; V01:K0:3p+9jTNkgP4=:j6ChS/Fv4GS1RGNRFkcFXI Tl4dZwbRDXJ1aTIkcJH7KqVJa4zB2YAJGQAydbJ6JY1T2+y98DfXitfB6TBhdztZpaMalQ4JR A/B+mxCmwSW84obf/1TdFdp5E9F3X1q64otNl5PR8XsCUyO24g0N8+ut5Fy2BM6rV7/fbojpK /ygyn/fiGeJNQL7uQAQfR1eXDCn7OsVfwpsD/FeYLs5bwo4Bc2OhgxuKgmv4ScGkRwcJDU9mj VTpZ/VtmVESyhgrgeScZrTsB9OSTT9M2MFfHH8nLfY/SzMizQExFQPN2yGahGWGYnpawEmLGo W9cO7n9B731lfkcmeu+f/4DEckfgZzyjJnoSBv7FWVpXnHblzAjzJrdshrgqSmCe3b8miWrfc 8NM+VrXUoHHpe/JbyER5Px9GLaUT1sLEd4H5hMpJQ5An0g3t+VFGqGRErm5j4AAohXsY4eqhN sY5wGvbaiMFCSLcSltP4svIXAyoVq1SkD3G3yr2NDoUImzbQLfLRtg+LFE0sAnl4ezIMoBWP1 k6LMPjP7KHs2H4x6IIHma29QSb4PG8koqvHwU7Bsqvsaornr6MG/+J8tUkEK3rQz/h2uW5Bk/ N/V8LTdXnpdwCqnADq5Zyhv/gjkx9Q0WCTW/YINOBT1k39sR2dcoF7IuSqlR6Ce2cfvwp37Cr B59Qz3H6WZd8fsqBcYwRYQIjnRszqQJaiNIXaxI+wY96Gn3ZlYisNX+Ln3orvceQ9VlA= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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") Link: https://patchwork.kernel.org/patch/9200119/ Acked-by: Ji-Ze Hong (Peter Hong) Acked-by: Ricardo Ribalda Delgado --- 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(-) -- 2.9.0 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;