From patchwork Sat Jun 4 09:36:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 630153 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rMG8L6CS2z9t89 for ; Sat, 4 Jun 2016 19:37:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750826AbcFDJg7 (ORCPT ); Sat, 4 Jun 2016 05:36:59 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:58863 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750761AbcFDJg6 (ORCPT ); Sat, 4 Jun 2016 05:36:58 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue001) with ESMTPA (Nemesis) id 0M9j7n-1bKvpq4APP-00D1F0; Sat, 04 Jun 2016 11:36:46 +0200 From: Arnd Bergmann To: Alexandre Belloni Cc: linux-kernel@vger.kernel.org, Jiri Kosina , rtc-linux@googlegroups.com, Arnd Bergmann , "David S. Miller" , sparclinux@vger.kernel.org Subject: [PATCH] sparc32: remove stale RTC_PORT definition Date: Sat, 4 Jun 2016 11:36:44 +0200 Message-Id: <1465033041-2512569-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:xnqMuXyrKJiwVfJN57CqsC6qQ/ZZ4tbIxwNZrLaW3DaAhFFLN4r j+Q4Y/9CMDmMvBd+H6qUiGARI8CK4noCcioMPP0ZxKgRw4lKENVK1/P1CNfSMf8EeSNSD03 bQ0DSz1WsZydFK5jgkDVObgL07Nixi+nz7jWmFaLUs4XD3cLFDN2GbNC5VCdfprdy2gr98s OC+hlqiXZJ3c1d7WZ2A2g== X-UI-Out-Filterresults: notjunk:1; V01:K0:13ok14bwFis=:+SMqU8c5UteUi1xpI8XwVf g2ysXn1S66rZBvaYEw/tQAv39zALY1VKC0SzT587YynpbY3Y9I8vu6WX5np3PNLI/oVgJvWTu oQZ6Em7wkzfJJYjhwzZloUlwPpFTZ3G0wntILfzVfMOin4fY9rEvMpJpel8dIn/bN9CDD5M8M 0fFoeKPa2+mBnUAXd5FaSt4gJBUY4W9YDo1VQ/HXBnQbihkBhtbSsAniCdsCAag8E2hz0QsZd rJ/ajgfuVMnwAOz6kEPBD9kU5zgXeqrgeQM/kcybwg3PL9DneTEmV2Ex+GoHZ9zpY7b9zet8I RE8PARKeHGDudchHpVMJHkizFs9OTnq++z2H8JdqZRZ8kAUF1ZZnUcn7KRLBYTxDtAlDJW8b7 KK+QtM2wq5F2bLf5oQAd1bRM2zLsjszqhktwpregaRS6XEqcvGPxzFg/Xa3DvzVQGyJCQbQSI vlRBFLePWaC8QPErHe9R0r2yMkNYrC+VQOpPAM0kjH2UsQ1Yhw6L3ZySIRV884a29wZ/UPMIC RgDHuYT0MCzSzu4jlNLrBhzu8BgEWS5w8OVDrM8aMkljUjFDvFOeW0vCyQTgTjAvDy4kCi+zt 7bMlI0AdQQxvZ7lrj04XSU5YlUNoWjqcM+q6ewmxXkLWWPDXarulYup4ZuNA6Qir0phX+xN+u WjD0M69IpS9CShPg5wwB2f1oL62/elcypkpm1Rgtgc/Ii7T28NlpGNt8u5VsVPyv+KQ0= Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org sparc32:allmodconfig fails to build in next-20160602 as follows. In file included from drivers/block/floppy.c:185:0: include/linux/mc146818rtc.h: In function 'mc146818_is_updating': include/linux/mc146818rtc.h:138:9: error: 'rtc_port' undeclared (first use in this function) include/linux/mc146818rtc.h:138:9: note: each undeclared identifier is reported only once for each function it appears in include/linux/mc146818rtc.h: In function 'mc146818_get_time': include/linux/mc146818rtc.h:172:17: error: 'rtc_port' undeclared (first use in this function) include/linux/mc146818rtc.h: In function 'mc146818_set_time': include/linux/mc146818rtc.h:278:8: error: 'rtc_port' undeclared (first use in this function) scripts/Makefile.build:295: recipe for target 'drivers/block/floppy.o' failed The reason is a duplicate definition of the RTC_PORT macro. The one in arch/sparc/include/asm/io_32.h was apparently used a long time ago for the drivers/char/rtc.c driver that is not available on SPARC any more, since we now select 'RTC_CLASS' unconditionally. Removing the macro fixes the build problem, and for consistency, this also removes the RTC_ALWAYS_BCD macro and the comment for both. Signed-off-by: Arnd Bergmann Reported-by: Guenter Roeck Fixes: fd09cc80165c ("rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h") --- I thought I'd sent this out yesterday, but cannot find an indication of that now, and Alexandre didn't seem to get it. This should probably go through the rtc tree that introduced the build failure after my earlier patches arch/sparc/include/asm/io_32.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/arch/sparc/include/asm/io_32.h b/arch/sparc/include/asm/io_32.h index 57f26c398dc9..4dd268a3a8b0 100644 --- a/arch/sparc/include/asm/io_32.h +++ b/arch/sparc/include/asm/io_32.h @@ -140,16 +140,6 @@ void ioport_unmap(void __iomem *); struct pci_dev; void pci_iounmap(struct pci_dev *dev, void __iomem *); - - -/* - * At the moment, we do not use CMOS_READ anywhere outside of rtc.c, - * so rtc_port is static in it. This should not change unless a new - * hardware pops up. - */ -#define RTC_PORT(x) (rtc_port + (x)) -#define RTC_ALWAYS_BCD 0 - static inline int sbus_can_dma_64bit(void) { return 0; /* actually, sparc_cpu_model==sun4d */