Messages in this thread Patch in this message | | | From | Corentin Labbe <> | Subject | [PATCH v2 2/6] hpet: remove unused writeq/readq function definitions | Date | Mon, 3 Apr 2017 14:15:55 +0200 |
| |
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 <clabbe.montjoie@gmail.com> --- 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 <linux/ioport.h> #include <linux/fcntl.h> #include <linux/init.h> +#include <linux/io-64-nonatomic-lo-hi.h> #include <linux/poll.h> #include <linux/mm.h> #include <linux/proc_fs.h> @@ -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
| |