revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / char / hpet.c

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index f8e7d89ceb2c35b081509651b5796920114e9165..a0a1829d3198fc19ccab2748718dbee2f814db86 100644 (file)
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -479,21 +479,6 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
        if (irq) {
                unsigned long irq_flags;
 
-               if (devp->hd_flags & HPET_SHARED_IRQ) {
-                       /*
-                        * To prevent the interrupt handler from seeing an
-                        * unwanted interrupt status bit, program the timer
-                        * so that it will not fire in the near future ...
-                        */
-                       writel(readl(&timer->hpet_config) & ~Tn_TYPE_CNF_MASK,
-                              &timer->hpet_config);
-                       write_counter(read_counter(&hpet->hpet_mc),
-                                     &timer->hpet_compare);
-                       /* ... and clear any left-over status. */
-                       isr = 1 << (devp - devp->hd_hpets->hp_dev);
-                       writel(isr, &hpet->hpet_isr);
-               }
-
                sprintf(devp->hd_name, "hpet%d", (int)(devp - hpetp->hp_dev));
                irq_flags = devp->hd_flags & HPET_SHARED_IRQ
                                                ? IRQF_SHARED : IRQF_DISABLED;
@@ -985,8 +970,6 @@ static int hpet_acpi_add(struct acpi_device *device)
                return -ENODEV;
 
        if (!data.hd_address || !data.hd_nirqs) {
-               if (data.hd_address)
-                       iounmap(data.hd_address);
                printk("%s: no address or irqs in _CRS\n", __func__);
                return -ENODEV;
        }