From 2e134a1162301f9d98b6c1ea60322026b2fbbb4f Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Sun, 30 Oct 2005 15:03:32 -0800
Subject: [PATCH] --- yaml --- r: 11901 b: refs/heads/master c:
 3f992e1bb7eab7b7af2b9ea46d2b80b1fed84845 h: refs/heads/master i:   11899:
 3f94642cee3015f3a6214499f6b1d37601010d77 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/char/hpet.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2d37d8f3d164..c8dcfb1865fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 642d30bbc73512269de1524251ccc378d7782b85
+refs/heads/master: 3f992e1bb7eab7b7af2b9ea46d2b80b1fed84845
diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c
index bf2f5a51c687..e3c7c0096e17 100644
--- a/trunk/drivers/char/hpet.c
+++ b/trunk/drivers/char/hpet.c
@@ -367,7 +367,6 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
 	if (!devp->hd_ireqfreq)
 		return -EIO;
 
-	v = readq(&timer->hpet_config);
 	spin_lock_irq(&hpet_lock);
 
 	if (devp->hd_flags & HPET_IE) {
@@ -378,7 +377,6 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
 	devp->hd_flags |= HPET_IE;
 	spin_unlock_irq(&hpet_lock);
 
-	t = readq(&timer->hpet_config);
 	irq = devp->hd_hdwirq;
 
 	if (irq) {
@@ -855,11 +853,9 @@ int hpet_alloc(struct hpet_data *hdp)
 	}
 
 	for (i = 0, devp = hpetp->hp_dev; i < hpetp->hp_ntimer; i++, devp++) {
-		unsigned long v;
 		struct hpet_timer __iomem *timer;
 
 		timer = &hpet->hpet_timers[devp - hpetp->hp_dev];
-		v = readq(&timer->hpet_config);
 
 		devp->hd_hpets = hpetp;
 		devp->hd_hpet = hpet;