Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753108AbdDCMTj (ORCPT ); Mon, 3 Apr 2017 08:19:39 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33316 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752673AbdDCMSL (ORCPT ); Mon, 3 Apr 2017 08:18:11 -0400 From: Corentin Labbe To: clemens@ladisch.de, arnd@arndb.de, gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH v2 2/6] hpet: remove unused writeq/readq function definitions Date: Mon, 3 Apr 2017 14:15:55 +0200 Message-Id: <20170403121559.1397-3-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170403121559.1397-1-clabbe.montjoie@gmail.com> References: <20170403121559.1397-1-clabbe.montjoie@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1184 Lines: 46 On all arch using hpet, only i386 miss writeq/readq. Instead of rewriting them, use linux/io-64-nonatomic-lo-hi.h which already have them. Signed-off-by: Corentin Labbe --- drivers/char/hpet.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index f0e6427..206d3a6 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -123,22 +124,6 @@ static struct hpets *hpets; #define HPET_PERIODIC 0x0004 #define HPET_SHARED_IRQ 0x0008 - -#ifndef readq -static inline unsigned long long readq(void __iomem *addr) -{ - return readl(addr) | (((unsigned long long)readl(addr + 4)) << 32LL); -} -#endif - -#ifndef writeq -static inline void writeq(unsigned long long v, void __iomem *addr) -{ - writel(v & 0xffffffff, addr); - writel(v >> 32, addr + 4); -} -#endif - static irqreturn_t hpet_interrupt(int irq, void *data) { struct hpet_dev *devp; -- 2.10.2