From patchwork Wed Oct 3 19:02:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 188918 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-qa0-f56.google.com (mail-qa0-f56.google.com [209.85.216.56]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 09AA92C0088 for ; Thu, 4 Oct 2012 06:44:04 +1000 (EST) Received: by qaas11 with SMTP id s11sf1754760qaa.11 for ; Wed, 03 Oct 2012 13:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=x-beenthere:received-spf:from:to:subject:date:user-agent:cc :mime-version:message-id:x-provags-id:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type; bh=68CPHRgP+OS3NYrDCGryjvvrgU1262Gr2PSJXfMSg1o=; b=GOiggf+vgv+esUvmzne2VGAF8OIkgbANa1UPU/qscpHS6qKeGNkVPduw4WTZRpUYfS 55k/HtIKQWJvjKlXdXStmoyd6nT2nsVN5EQj9vSetl0ub6rufwamJYP8EJzMcNsrvInV /NlmR4SkEBvcu594rgf7DZI71KkCEhsMzGSUfH2uvP5KO4Ob0R7Ugk3ycX+53Q0mDq/S btanP/uej/9l5jGyr1XETGfBVfU9LvxP+Ng9z4rEqwynpPtVe1lLfxurxxwXSoMDblax DFR02C/jQkJ3sK5ue5h9xrFnh5Wu8H89W9lTp6dzeWUKZu6Wbb1CNR41mNkGpL3V62/p bAhg== Received: by 10.236.150.16 with SMTP id y16mr380090yhj.8.1349290963810; Wed, 03 Oct 2012 12:02:43 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.236.92.236 with SMTP id j72ls1069194yhf.1.gmail; Wed, 03 Oct 2012 12:02:43 -0700 (PDT) Received: by 10.236.138.232 with SMTP id a68mr2145050yhj.28.1349290963386; Wed, 03 Oct 2012 12:02:43 -0700 (PDT) Received: by 10.236.138.232 with SMTP id a68mr2145048yhj.28.1349290963372; Wed, 03 Oct 2012 12:02:43 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.10]) by gmr-mx.google.com with ESMTPS id i7si687606yhj.6.2012.10.03.12.02.42 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Oct 2012 12:02:43 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.10 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.10; Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0Luphl-1TSWbK0qfZ-00zcAB; Wed, 03 Oct 2012 21:02:19 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [rtc-linux] [PATCH] ARM: footbridge: remove RTC_IRQ definition Date: Wed, 3 Oct 2012 19:02:15 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) Cc: linux-kernel@vger.kernel.org, Rob Herring , Alessandro Zummo , rtc-linux@googlegroups.com, Russell King MIME-Version: 1.0 Message-Id: <201210031902.16200.arnd@arndb.de> X-Provags-ID: V02:K0:CGElv38qc04Mt+cj3dL0BedqC7R9aOHuX41J7uduMjI lk1hhSKtIzTLQaYejPe1YEvojOeU2s+dEYyimUAAVolZ6vfIR6 si2t2wqHlcpO9dS3OGYXYu4FiKvyN7+QrTU0fj+ftMuyMwtUf6 Djz5kqmADHhPfATvbwrrZ6MqYptGUvIYq5HNZkfRh32dbFWrCL 4sduTekaa3b0A+UGOIZWuElotPPG6ydO6v6wNATp/e5Q14yJBS 9Bc3TvS/AST1ub9JAlrfFg9LAGHKAzzK3a9b4zYFa5UmfFk1bD YewIsnqm5ntmPOLOIEPajcYk9EDLX7si1oLWAojlSQLXFSjs0W 8UEo7sYZPmUIu2EujlF0= X-Original-Sender: arnd@arndb.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.227.17.10 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Since commit bd8abc9a32c "ARM: mc146818rtc: remove unnecessary include of mach/irqs.h", building footbridge_defconfig results in this warning: In file included from include/linux/mc146818rtc.h:16:0, from arch/arm/mach-footbridge/isa-rtc.c:21: arch/arm/include/asm/mc146818rtc.h:10:0: warning: "RTC_IRQ" redefined [enabled by default] arch/arm/mach-footbridge/include/mach/irqs.h:93:0: note: this is the location of the previous definition The above commit was intentionally made to catch errors like this, where code relies on the RTC_IRQ definition. The only driver using it is the legacy PC-style drivers/char/rtc.c driver. However, the ARM architecture has been using the RTC_LIB framework since at least 2006, and that doesn't use it. Signed-off-by: Arnd Bergmann Cc: Rob Herring Cc: Alessandro Zummo Cc: rtc-linux@googlegroups.com Cc: Russell King --- I've queued this in late/fixes for the current merge window. Will send later unless someone objects. diff --git a/arch/arm/mach-footbridge/include/mach/irqs.h b/arch/arm/mach-footbridge/include/mach/irqs.h index 400551e..61c714c 100644 --- a/arch/arm/mach-footbridge/include/mach/irqs.h +++ b/arch/arm/mach-footbridge/include/mach/irqs.h @@ -89,8 +89,6 @@ #define IRQ_NETWINDER_VGA _ISA_IRQ(11) #define IRQ_NETWINDER_SOUND _ISA_IRQ(12) -#undef RTC_IRQ -#define RTC_IRQ IRQ_ISA_RTC_ALARM #define I8042_KBD_IRQ IRQ_ISA_KEYBOARD #define I8042_AUX_IRQ (machine_is_netwinder() ? IRQ_NETWINDER_PS2MOUSE : IRQ_ISA_PS2MOUSE) #define IRQ_FLOPPYDISK IRQ_ISA_FLOPPY