aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/hpet.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index bf2f5a51c687..e3c7c0096e17 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -367,7 +367,6 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
367 if (!devp->hd_ireqfreq) 367 if (!devp->hd_ireqfreq)
368 return -EIO; 368 return -EIO;
369 369
370 v = readq(&timer->hpet_config);
371 spin_lock_irq(&hpet_lock); 370 spin_lock_irq(&hpet_lock);
372 371
373 if (devp->hd_flags & HPET_IE) { 372 if (devp->hd_flags & HPET_IE) {
@@ -378,7 +377,6 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
378 devp->hd_flags |= HPET_IE; 377 devp->hd_flags |= HPET_IE;
379 spin_unlock_irq(&hpet_lock); 378 spin_unlock_irq(&hpet_lock);
380 379
381 t = readq(&timer->hpet_config);
382 irq = devp->hd_hdwirq; 380 irq = devp->hd_hdwirq;
383 381
384 if (irq) { 382 if (irq) {
@@ -855,11 +853,9 @@ int hpet_alloc(struct hpet_data *hdp)
855 } 853 }
856 854
857 for (i = 0, devp = hpetp->hp_dev; i < hpetp->hp_ntimer; i++, devp++) { 855 for (i = 0, devp = hpetp->hp_dev; i < hpetp->hp_ntimer; i++, devp++) {
858 unsigned long v;
859 struct hpet_timer __iomem *timer; 856 struct hpet_timer __iomem *timer;
860 857
861 timer = &hpet->hpet_timers[devp - hpetp->hp_dev]; 858 timer = &hpet->hpet_timers[devp - hpetp->hp_dev];
862 v = readq(&timer->hpet_config);
863 859
864 devp->hd_hpets = hpetp; 860 devp->hd_hpets = hpetp;
865 devp->hd_hpet = hpet; 861 devp->hd_hpet = hpet;