From patchwork Tue Aug 28 14:26:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 145334 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1257148ljw; Tue, 28 Aug 2018 07:27:46 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaEPAwE+ihVOCioQK54NQUJxvZkfWfoBwVukqza2fhVuBw6CJ+nzEpHzpcQO3eKxJxGUDkM X-Received: by 2002:a62:411a:: with SMTP id o26-v6mr1887645pfa.111.1535466466657; Tue, 28 Aug 2018 07:27:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535466466; cv=none; d=google.com; s=arc-20160816; b=1Hyc4bxjCrIWVzPMRfrseTAF/CPdvPJS70mfciOdDXACkqBcX27AtfvxCljKIz3hPg clluh/xquxoQDC0mlnAkmsnPrBosxxByygZeXjBVm1YAHCOQjeaWCGzh9WcHAFH7AF56 gKdmM/3Kh5/S9nmeYIGQGVyirtzs1lVjk5SeRQlPSSNlqXihO/SDMNngi/QMJ+FPSu1R 4sbokqTKQBb6nVcb39Kgb+ERsKdTDu3Anrv1PlmOA46Wcqd203Qjj2ZJuSDY3mhXr8Gm 75aB4E0BED0h9D/XQBbWkBLaD0083tFFJQ9imV9973pTXDWtIBBUXyLOnht91y3A0QCE rS2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=T5ngOTA3vWknxD3rznw3E7fPINB8PcHeRHv6Xgbr0Hs=; b=nXphpRFRYwyPlbXVVPBnn13xfU6bIm9A5wWSFj2QB06w3pO2Fniip9s4QVFG5H+AM6 rDUvOyG9DAOwLV7vUWtlp0Z46XzF5xl3sY+nhXwNyRcE3uRe62ls7kdFQAuIk0ntvGDR NBnuQ2E/Px0OFTpoHLUmKsre5MR6AaDGeXjf9zoV5xs6L0zvgBqVjYNuHW96opIX+nCf eVkl6cp7yU7nREz7QplTMrTUQQXiaSCcy/HK9uUfyUNjrrX7A8kjIR7gxVAKGR/Tgue0 +wPp/K7F6B9NuAORr1Bt3uSg2kAP6Zs97bG1LQfntNk6SR6ZbrrpVd4hcQRMBx88ggUT XPtA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q129-v6si1158497pga.217.2018.08.28.07.27.46; Tue, 28 Aug 2018 07:27: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 S1728341AbeH1STj (ORCPT + 32 others); Tue, 28 Aug 2018 14:19:39 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:40079 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727460AbeH1STj (ORCPT ); Tue, 28 Aug 2018 14:19:39 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0LpiwE-1fPQwz3sBi-00fTIF; Tue, 28 Aug 2018 16:27:28 +0200 From: Arnd Bergmann To: linux-rtc@vger.kernel.org Cc: a.zummo@towertech.it, alexandre.belloni@bootlin.com, keguang.zhang@gmail.com, y2038@lists.linaro.org, Arnd Bergmann , Ralf Baechle , Paul Burton , James Hogan , Greg Kroah-Hartman , Matt Redfearn , Zubair Lutfullah Kakakhel , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] rtc: mips: default to rtc-cmos on mips Date: Tue, 28 Aug 2018 16:26:30 +0200 Message-Id: <20180828142724.4067857-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:DmjXOi4/gJR2KnJwod3hWwHoDox+Y29gAUi3IYfc8UHwkVPajxY B6crdUCfMGVsn5WsMRO9snGl5u+SWAv5fNi0Hb2Me2emXh8lofVX06RIu0k8SZXugAp+xOU yfFyomLDPGY6qi4WUKxomKX6KGDoPjS7+/WgMjsIl0HEytGgBmqZRGQHCY1WYCvyne//2FM CikQb1SKhD3tChAuQpZ8A== X-UI-Out-Filterresults: notjunk:1; V01:K0:iE5WrV4a8O0=:v+nti9amxgnZBwOPU9RL9C mzHOjgaX2Wzk0tGsmZVblac5fnMWdl9Xc/PlwHkuhw97oCLamrdLDyZkHK1pKZKP87yMXbwIi vFzrDtIZuM492miLk7AoDGPaRaMELfkGRlvKf3BT4j1gSS3UTirs115I4ceBb17glWxdcQCQ7 uH1DhkkoceNSrXP91RDdqNnSQiwmm20NADZaI/Srb0AE8hF4P4CLxQS19lajNUEkVCURq1X26 x7RZA2R1pL9D20BaUIMsz8s/h5gT9viwDhq1xNjhwBhi2E53UsEJ+hblzsVvKUL0HNxoLF6yA cS7mmcfbYU11Q8DGf0eyf+xDN7uJAKezpGfP1MDpLM/Q/N/fdi5mkuuuUMd0+QOJsM4ryx5yV fZOqerY4yUK7a4Gy+CN51+QlUBLTDLRFydatCdQ8ityufEOJV9x2qGl+qCufW917dlzDXmFke BMd9yaXhF346/HqYn7bGg5wALEM62R3XvY3QaesY2fkwE1iaa5XWGvRS5yWnGCAj7Qgf7EDAy 19QFB0ArsybuxLEh8Fs9NcO4mULf7p93OfQFtm2QTzUrxS2i72bDVxBIy7lkBfkPa1twP2+rb 5wkBj6rP6bXcx30mZcWskNIk03P55aJr25bQ7W/buue4cASIFlNOV3+LRb6AlAOyZByeb54ST RQ59FuMXIHwGJ2OUKLu3b5SyyA0is92klbTBUnoq7K5EwZnS5uqPPUwYMo9tCzvi1S0g= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The old rtc driver is getting in the way of some compat_ioctl simplification. Looking up the loongson64 git history, it seems that everyone uses the more modern but compatible RTC_CMOS driver anyway, so let's remove the special case for loongson64. Signed-off-by: Arnd Bergmann --- arch/mips/Kconfig | 2 +- drivers/char/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.18.0 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 35511999156a..c695825d9377 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -75,7 +75,7 @@ config MIPS select MODULES_USE_ELF_RELA if MODULES && 64BIT select MODULES_USE_ELF_REL if MODULES select PERF_USE_VMALLOC - select RTC_LIB if !MACH_LOONGSON64 + select RTC_LIB select SYSCTL_EXCEPTION_TRACE select VIRT_TO_BUS diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index ce277ee0a28a..131b4c300050 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -268,7 +268,7 @@ if RTC_LIB=n config RTC tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)" - depends on ALPHA || (MIPS && MACH_LOONGSON64) + depends on ALPHA ---help--- If you say Y here and create a character special file /dev/rtc with major number 10 and minor number 135 using mknod ("man mknod"), you From patchwork Tue Aug 28 14:26:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 145335 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1257490ljw; Tue, 28 Aug 2018 07:28:08 -0700 (PDT) X-Google-Smtp-Source: ANB0VdadEAEG1wzOj418GSotuUO8d/JHCZGEsCzqxbIKLc8MF/UEhqV8AJaU2483WuXEh0SVmKYR X-Received: by 2002:a62:9101:: with SMTP id l1-v6mr1882051pfe.226.1535466488180; Tue, 28 Aug 2018 07:28:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535466488; cv=none; d=google.com; s=arc-20160816; b=oVkdG6DQQKu85/q9l8Q9PBlHsYvLhyJztTOIF0/PlUmhNhvGgYsK6sOUeIjDG9PEIF QDN8k23mfHa6Cs1VqdxBdNx9SxgMXbm36RAPbZzueuR0BZN6EUrwXPyBvDdql91PaEhN +UO0dYGj3smpUegTSFj45MjPEWDhgv+gM+s6qT7ZbUgBEnNJrM5xD3sAhJ1qObZ+VP40 jbIHcEkWuGWvC7FGPcc0MxTd+bFu+S4tWm2XrR7z/MspixXwpoyUEIiNU1WMynhnlNqM wp3CGFatDJ0kE6g6jdKQMPneIAZYOYXTLN5fhs9ZUaNgEuFE+5XjaMPptbm9iokMuefJ ziIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=PUyz3Q4Bcl6lY/NdBnPTZE233Xd0eyVKQOK2ySFQqR8=; b=NocKtFz8kuy7Cljyv1saXATqMZFwFLb4Zu9AGONm792MdtVSr6QnNx48J0mM9VTxKq bKu3R5QDmBNoNaxkaqY4SzVucnMoj9UXkqHLa7xRmsk6TNuAucMnrgjqm4kTdMrmN2NA XJbJce90S0qQXBanICOoFVpgI3hlOk5XgGNbnrfIQ8MDvd6ToKUs6lluRqX1DstVL4ub hKWesGe74ES3JcsgyY9Dk7cL16zb2tcKH5CQUlb0GImY7yjqkQ3fpwLkQ9j/28DhR/7w krMdKhs2V6tTZMuJOo9qYHH5kQ3hnpCt1gx5M1h18U5oGWAo29wRZPYNRtJkvIocw0Ia USPw== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l18-v6si1140676pfk.78.2018.08.28.07.28.07; Tue, 28 Aug 2018 07:28:08 -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 S1728364AbeH1SUA (ORCPT + 32 others); Tue, 28 Aug 2018 14:20:00 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:41800 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727101AbeH1ST7 (ORCPT ); Tue, 28 Aug 2018 14:19:59 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MdZRA-1gHfTG3XOW-00PKJx; Tue, 28 Aug 2018 16:27:58 +0200 From: Arnd Bergmann To: linux-rtc@vger.kernel.org Cc: a.zummo@towertech.it, alexandre.belloni@bootlin.com, keguang.zhang@gmail.com, y2038@lists.linaro.org, Arnd Bergmann , Alexander Viro , Kees Cook , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v2 2/2] rtc: move compat_ioctl handling into rtc-dev.c Date: Tue, 28 Aug 2018 16:26:31 +0200 Message-Id: <20180828142724.4067857-2-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180828142724.4067857-1-arnd@arndb.de> References: <20180828142724.4067857-1-arnd@arndb.de> X-Provags-ID: V03:K1:YxOIoY5I40raqORrJ7bulExvmTCEu4FFJ/HVLIlHiHrP0i+eu7u DYdDNLIaQmnUg0BtXUwe6PxCjTe2bUgZipT1/aKDTwhu0gQZM+tsrYRQqJry18HCReqTInO 9doX5cehZdDUe+NC+WCZBuJAhK2UxhgJSQJ881aNRKYmZLYoE+meBBeLJb+0mVkc8EXxvC4 IAabVZdz2HCFIYXoAYg+A== X-UI-Out-Filterresults: notjunk:1; V01:K0:jn6DQ1rWOpg=:l1awOaLvFXTDA4E0ei6TJm pCU8bNg2BNiR+bYgf0Cp5/QSvBr8/mly9j997i5HYRSDfncRMVuUPbvfV0zUl3OhLcYbonHLK fumnKm+pxTBRcDgyczEsCJ/ERgPLjkXhsIWGTv8FVewAJCMRSX+Ge4Mh5AosetbKDxqGNkc46 mF1QQITXiT2GYhVd+QDW5AELkhD/1z2x5efm2gs041Ec4jTrqDi3S04sJiQr87nFRHid+aAlY nbxgWnEvpM+++ZRF8al23qACzRqN27xusacTqpDY4oylXrZm2/f3LTOtB5RJFmy4uRkQKTnJI KHQS97R95Zqs327ka/hHocFLTTTRUEH6g/VhUHLGMB7/em7H9W0b+SMTZvUGQLusrnqxMrDHm zHJmyqDSSXGFvZ/8BxqiK3fCKHAkSfOpANZNH7Y4tqdQUrMYeZ6+rmkqI/7NxmsZcdF28NN2z lLtiENkXxfDuI6vxXHF2N/Mo+0y+2DnKlpiGUPbJ8wJZCL/AnByl2lt6Oc/O16xponbCwlaLl KhOwmwJKWCkeM9v/Jp2oNYM0j25s3K5qWsxk3KwqNIWVQMZG5ShE243G4mXSfnBR5tXqVbxHa HNXeHca1fezmVH4eYRei3QgcJJVdhI+JA2ZaG/dAA2QMhl2eH3Z1VBaaQjLobybbyG9GG9Rl4 FiER8mFpVnfNRS15/GA9GGVCcQ49C3wSgiphf2pzyKVCwrult/ovKr1yVu7e/aUVkSEU= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We no longer need the rtc compat handling to be in common code, now that all drivers are either moved to the rtc-class framework, or (rarely) exist in drivers/char for architectures without compat mode (m68k, alpha and ia64, respectively). I checked the list of ioctl commands in drivers, and the ones that are not already handled are all compatible, again with the one exception of m68k driver, which implements RTC_PLL_GET and RTC_PLL_SET, but has no compat mode. Since the ioctl commands are either compatible or differ in both structure and command code between 32-bit and 64-bit, we can merge the compat handler into the native one and just implement the two common compat commands (RTC_IRQP_READ, RTC_IRQP_SET) there. The old conversion handler also deals with RTC_EPOCH_READ and RTC_EPOCH_SET, which are not handled in rtc-dev.c but only in a single device driver (rtc-vr41xx), so I'm adding the compat version in the same place. I don't expect other drivers to need those commands in the future. Signed-off-by: Arnd Bergmann --- v2: merge compat handler into ioctl function to avoid the compat_alloc_user_space() roundtrip, based on feedback from Al Viro. --- drivers/rtc/rtc-dev.c | 13 +++++++++- drivers/rtc/rtc-vr41xx.c | 10 ++++++++ fs/compat_ioctl.c | 53 ---------------------------------------- 3 files changed, 22 insertions(+), 54 deletions(-) -- 2.18.0 diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c index 43d962a9c210..7c93dc6ec629 100644 --- a/drivers/rtc/rtc-dev.c +++ b/drivers/rtc/rtc-dev.c @@ -13,6 +13,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include #include #include #include @@ -364,10 +365,19 @@ static long rtc_dev_ioctl(struct file *file, mutex_unlock(&rtc->ops_lock); return rtc_update_irq_enable(rtc, 0); +#ifdef CONFIG_COMPAT +#define RTC_IRQP_SET32 _IOW('p', 0x0c, compat_ulong_t) +#define RTC_IRQP_READ32 _IOR('p', 0x0b, compat_ulong_t) + case RTC_IRQP_SET32: + err = rtc_irq_set_freq(rtc, arg); + break; + case RTC_IRQP_READ32: + err = put_user(rtc->irq_freq, (unsigned int __user *)uarg); + break; +#endif case RTC_IRQP_SET: err = rtc_irq_set_freq(rtc, arg); break; - case RTC_IRQP_READ: err = put_user(rtc->irq_freq, (unsigned long __user *)uarg); break; @@ -439,6 +449,7 @@ static const struct file_operations rtc_dev_fops = { .read = rtc_dev_read, .poll = rtc_dev_poll, .unlocked_ioctl = rtc_dev_ioctl, + .compat_ioctl = rtc_dev_ioctl, .open = rtc_dev_open, .release = rtc_dev_release, .fasync = rtc_dev_fasync, diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c index 70f013e692b0..1d90bde59d21 100644 --- a/drivers/rtc/rtc-vr41xx.c +++ b/drivers/rtc/rtc-vr41xx.c @@ -17,6 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include @@ -79,6 +80,10 @@ static void __iomem *rtc2_base; #define rtc2_read(offset) readw(rtc2_base + (offset)) #define rtc2_write(offset, value) writew((value), rtc2_base + (offset)) +/* 32-bit compat for ioctls that nobody else uses */ +#define RTC_EPOCH_READ32 _IOR('p', 0x0d, compat_ulong_t) +#define RTC_EPOCH_SET32 _IOW('p', 0x0e, compat_ulong_t) + static unsigned long epoch = 1970; /* Jan 1 1970 00:00:00 */ static DEFINE_SPINLOCK(rtc_lock); @@ -195,6 +200,11 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long switch (cmd) { case RTC_EPOCH_READ: return put_user(epoch, (unsigned long __user *)arg); +#ifdef CONFIG_COMPAT + case RTC_EPOCH_READ32: + return put_user(epoch, (unsigned int __user *)arg); + case RTC_EPOCH_SET32: +#endif case RTC_EPOCH_SET: /* Doesn't support before 1900 */ if (arg < 1900) diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 5c37104b8805..9237076bdcf5 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include @@ -426,37 +425,6 @@ static int serial_struct_ioctl(struct file *file, return err; } -#define RTC_IRQP_READ32 _IOR('p', 0x0b, compat_ulong_t) -#define RTC_IRQP_SET32 _IOW('p', 0x0c, compat_ulong_t) -#define RTC_EPOCH_READ32 _IOR('p', 0x0d, compat_ulong_t) -#define RTC_EPOCH_SET32 _IOW('p', 0x0e, compat_ulong_t) - -static int rtc_ioctl(struct file *file, - unsigned cmd, void __user *argp) -{ - unsigned long __user *valp = compat_alloc_user_space(sizeof(*valp)); - int ret; - - if (valp == NULL) - return -EFAULT; - switch (cmd) { - case RTC_IRQP_READ32: - case RTC_EPOCH_READ32: - ret = do_ioctl(file, (cmd == RTC_IRQP_READ32) ? - RTC_IRQP_READ : RTC_EPOCH_READ, - (unsigned long)valp); - if (ret) - return ret; - return convert_in_user(valp, (unsigned int __user *)argp); - case RTC_IRQP_SET32: - return do_ioctl(file, RTC_IRQP_SET, (unsigned long)argp); - case RTC_EPOCH_SET32: - return do_ioctl(file, RTC_EPOCH_SET, (unsigned long)argp); - } - - return -ENOIOCTLCMD; -} - /* on ia32 l_start is on a 32-bit boundary */ #if defined(CONFIG_IA64) || defined(CONFIG_X86_64) struct space_resv_32 { @@ -609,21 +577,6 @@ COMPATIBLE_IOCTL(SCSI_IOCTL_GET_PCI) /* Big V (don't complain on serial console) */ IGNORE_IOCTL(VT_OPENQRY) IGNORE_IOCTL(VT_GETMODE) -/* Little p (/dev/rtc, /dev/envctrl, etc.) */ -COMPATIBLE_IOCTL(RTC_AIE_ON) -COMPATIBLE_IOCTL(RTC_AIE_OFF) -COMPATIBLE_IOCTL(RTC_UIE_ON) -COMPATIBLE_IOCTL(RTC_UIE_OFF) -COMPATIBLE_IOCTL(RTC_PIE_ON) -COMPATIBLE_IOCTL(RTC_PIE_OFF) -COMPATIBLE_IOCTL(RTC_WIE_ON) -COMPATIBLE_IOCTL(RTC_WIE_OFF) -COMPATIBLE_IOCTL(RTC_ALM_SET) -COMPATIBLE_IOCTL(RTC_ALM_READ) -COMPATIBLE_IOCTL(RTC_RD_TIME) -COMPATIBLE_IOCTL(RTC_SET_TIME) -COMPATIBLE_IOCTL(RTC_WKALM_SET) -COMPATIBLE_IOCTL(RTC_WKALM_RD) /* * These two are only for the sbus rtc driver, but * hwclock tries them on every rtc device first when @@ -1005,12 +958,6 @@ static long do_ioctl_trans(unsigned int cmd, case TIOCGSERIAL: case TIOCSSERIAL: return serial_struct_ioctl(file, cmd, argp); - /* Not implemented in the native kernel */ - case RTC_IRQP_READ32: - case RTC_IRQP_SET32: - case RTC_EPOCH_READ32: - case RTC_EPOCH_SET32: - return rtc_ioctl(file, cmd, argp); } /*