diff options
| author | Corentin Labbe <clabbe@baylibre.com> | 2022-01-25 14:03:52 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-04 16:45:39 +0100 |
| commit | b86f32951d173b43d1db8de883473fc53dc3c772 (patch) | |
| tree | b42232188e6c0b747191cf3f68305fb74377b40a /drivers/char/hpet.c | |
| parent | 7163ae1642aecbc90f06e4b646ca711f0ec4d552 (diff) | |
| download | linux-stable-b86f32951d173b43d1db8de883473fc53dc3c772.tar.gz linux-stable-b86f32951d173b43d1db8de883473fc53dc3c772.tar.bz2 linux-stable-b86f32951d173b43d1db8de883473fc53dc3c772.zip | |
hpet: remove unused writeq/readq function definitions
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@baylibre.com>
Link: https://lore.kernel.org/r/20220125140352.4085290-1-clabbe@baylibre.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/hpet.c')
| -rw-r--r-- | drivers/char/hpet.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index a8d11251f4b7..ee71376f174b 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -16,6 +16,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> @@ -120,22 +121,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; |