From patchwork Sun Jan 25 10:11:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 5700961 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 177649F2ED for ; Sun, 25 Jan 2015 10:12:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 155D6201EC for ; Sun, 25 Jan 2015 10:12:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AEB20201E4 for ; Sun, 25 Jan 2015 10:12:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752626AbbAYKMJ (ORCPT ); Sun, 25 Jan 2015 05:12:09 -0500 Received: from baptiste.telenet-ops.be ([195.130.132.51]:47630 "EHLO baptiste.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752594AbbAYKMI (ORCPT ); Sun, 25 Jan 2015 05:12:08 -0500 Received: from ayla.of.borg ([84.193.93.87]) by baptiste.telenet-ops.be with bizsmtp id kAC31p00g1t5w8s01AC3LJ; Sun, 25 Jan 2015 11:12:04 +0100 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1YFKAk-0005tK-Ma; Sun, 25 Jan 2015 11:12:02 +0100 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1YFKAl-0004wf-Un; Sun, 25 Jan 2015 11:12:03 +0100 From: Geert Uytterhoeven To: Andrew Morton Cc: Kevin Cernekee , Thomas Gleixner , Jason Cooper , linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] sh: Eliminate unused irq_reg_{readl,writel} accessors Date: Sun, 25 Jan 2015 11:11:51 +0100 Message-Id: <1422180711-18976-1-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kevin Cernekee Defining these macros way down in arch/sh/.../irq.c doesn't cause kernel/irq/generic-chip.c to use them. As far as I can tell this code has no effect. Signed-off-by: Kevin Cernekee Tested-by: Geert Uytterhoeven (cpp/asm comparison) As of commit 332fd7c4fef5f3b1 ("genirq: Generic chip: Change irq_reg_{readl,writel} arguments") they cause build errors in se7722_defconfig: In file included from arch/sh/boards/mach-se/7722/irq.c:18:0: include/linux/irq.h:847:91: error: conflicting types for 'iowrite16' include/asm-generic/iomap.h:35:13: note: previous declaration of 'iowrite16' was here include/linux/irq.h:856:90: error: conflicting types for 'ioread16' include/asm-generic/iomap.h:29:21: note: previous declaration of 'ioread16' was here arch/sh/boards/mach-se/7722/irq.c: In function 'se7722_irq_demux': arch/sh/boards/mach-se/7722/irq.c:43:2: error: too few arguments to function 'ioread16' include/linux/irq.h:856:90: note: declared here and se7343_defconfig: In file included from arch/sh/boards/mach-se/7343/irq.c:21:0: include/linux/irq.h:847:91: error: conflicting types for 'iowrite16' include/asm-generic/iomap.h:35:13: note: previous declaration of 'iowrite16' was here include/linux/irq.h:856:90: error: conflicting types for 'ioread16' include/asm-generic/iomap.h:29:21: note: previous declaration of 'ioread16' was here arch/sh/boards/mach-se/7343/irq.c: In function 'se7343_irq_demux': arch/sh/boards/mach-se/7343/irq.c:44:2: error: too few arguments to function 'ioread16' include/linux/irq.h:856:90: note: declared here Signed-off-by: Geert Uytterhoeven Fixes: 332fd7c4fef5f3b1 ("genirq: Generic chip: Change irq_reg_{readl,writel} arguments") --- Fixes se7722_defconfig and se7343_defconfig http://kisskb.ellerman.id.au/kisskb/buildresult/12350978/ http://kisskb.ellerman.id.au/kisskb/buildresult/12350973/ --- arch/sh/boards/mach-se/7343/irq.c | 3 --- arch/sh/boards/mach-se/7722/irq.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/arch/sh/boards/mach-se/7343/irq.c b/arch/sh/boards/mach-se/7343/irq.c index 7646bf0486c2c9b1..1087dba9b0152317 100644 --- a/arch/sh/boards/mach-se/7343/irq.c +++ b/arch/sh/boards/mach-se/7343/irq.c @@ -14,9 +14,6 @@ #define DRV_NAME "SE7343-FPGA" #define pr_fmt(fmt) DRV_NAME ": " fmt -#define irq_reg_readl ioread16 -#define irq_reg_writel iowrite16 - #include #include #include diff --git a/arch/sh/boards/mach-se/7722/irq.c b/arch/sh/boards/mach-se/7722/irq.c index f5e2af1bf040ff93..00e699232621dccf 100644 --- a/arch/sh/boards/mach-se/7722/irq.c +++ b/arch/sh/boards/mach-se/7722/irq.c @@ -11,9 +11,6 @@ #define DRV_NAME "SE7722-FPGA" #define pr_fmt(fmt) DRV_NAME ": " fmt -#define irq_reg_readl ioread16 -#define irq_reg_writel iowrite16 - #include #include #include