From: Corentin Labbe <clabbe.montjoie@gmail.com>
To: clemens@ladisch.de, arnd@arndb.de, gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, Corentin Labbe <clabbe.montjoie@gmail.com>
Subject: [PATCH v2 2/6] hpet: remove unused writeq/readq function definitions
Date: Mon, 3 Apr 2017 14:15:55 +0200 [thread overview]
Message-ID: <20170403121559.1397-3-clabbe.montjoie@gmail.com> (raw)
In-Reply-To: <20170403121559.1397-1-clabbe.montjoie@gmail.com>
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
next prev parent reply other threads:[~2017-04-03 12:19 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-03 12:15 [PATCH v2 0/6] hpet: fix build warnings and style Corentin Labbe
2017-04-03 12:15 ` [PATCH v2 1/6] hpet: remove unused variable hpet in hpet_ioctl_common Corentin Labbe
2017-04-03 12:15 ` Corentin Labbe [this message]
2017-04-03 12:15 ` [PATCH v2 3/6] hpet: fix checkpatch complains about spaces Corentin Labbe
2017-04-03 12:15 ` [PATCH v2 4/6] hpet: replace printk by their pr_xxx counterparts Corentin Labbe
2017-04-03 19:44 ` Joe Perches
2017-04-03 12:15 ` [PATCH v2 5/6] hpet: removing unused variable m in hpet_interrupt Corentin Labbe
2017-04-03 12:55 ` Clemens Ladisch
2017-04-03 12:15 ` [PATCH v2 6/6] hpet: fix style issue about braces and alignment Corentin Labbe
2017-04-04 3:43 ` Joe Perches
-- strict thread matches above, loose matches on Subject: below --
2017-03-30 2:53 [PATCH 0/2] Support new Alps HID I2C Touchpad device Masaki Ota
2017-03-30 2:53 ` [PATCH 1/2] Alps HID I2C T4 device support Masaki Ota
2017-04-04 3:08 ` Nikolaus Rath
2017-04-04 6:55 ` Masaki Ota
2017-04-04 17:08 ` Nikolaus Rath
2017-04-04 23:40 ` Masaki Ota
2017-04-04 23:42 ` Nikolaus Rath
2017-04-04 23:49 ` Masaki Ota
2017-04-05 0:01 ` Nikolaus Rath
2017-04-05 8:43 ` Masaki Ota
2017-04-05 18:35 ` Nikolaus Rath
2017-04-06 1:07 ` Masaki Ota
2017-04-06 22:59 ` Nikolaus Rath
2017-04-24 14:54 ` Benjamin Tissoires
2017-03-30 2:53 ` [PATCH 2/2] Add new U1 device ID Masaki Ota
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170403121559.1397-3-clabbe.montjoie@gmail.com \
--to=clabbe.montjoie@gmail.com \
--cc=arnd@arndb.de \
--cc=clemens@ladisch.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®