Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / input / touchscreen / hp680_ts_input.c

diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index a89700e7ace42138e10a6a47e085a4b90a6f9c15..dd4e8f020b9947b69071e25c30c58adb5276217e 100644 (file)
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -28,29 +28,29 @@ static void do_softint(struct work_struct *work)
        u8 scpdr;
        int touched = 0;
 
-       if (ctrl_inb(PHDR) & PHDR_TS_PEN_DOWN) {
-               scpdr = ctrl_inb(SCPDR);
+       if (__raw_readb(PHDR) & PHDR_TS_PEN_DOWN) {
+               scpdr = __raw_readb(SCPDR);
                scpdr |= SCPDR_TS_SCAN_ENABLE;
                scpdr &= ~SCPDR_TS_SCAN_Y;
-               ctrl_outb(scpdr, SCPDR);
+               __raw_writeb(scpdr, SCPDR);
                udelay(30);
 
                absy = adc_single(ADC_CHANNEL_TS_Y);
 
-               scpdr = ctrl_inb(SCPDR);
+               scpdr = __raw_readb(SCPDR);
                scpdr |= SCPDR_TS_SCAN_Y;
                scpdr &= ~SCPDR_TS_SCAN_X;
-               ctrl_outb(scpdr, SCPDR);
+               __raw_writeb(scpdr, SCPDR);
                udelay(30);
 
                absx = adc_single(ADC_CHANNEL_TS_X);
 
-               scpdr = ctrl_inb(SCPDR);
+               scpdr = __raw_readb(SCPDR);
                scpdr |= SCPDR_TS_SCAN_X;
                scpdr &= ~SCPDR_TS_SCAN_ENABLE;
-               ctrl_outb(scpdr, SCPDR);
+               __raw_writeb(scpdr, SCPDR);
                udelay(100);
-               touched = ctrl_inb(PHDR) & PHDR_TS_PEN_DOWN;
+               touched = __raw_readb(PHDR) & PHDR_TS_PEN_DOWN;
        }
 
        if (touched) {
@@ -107,8 +107,7 @@ static int __init hp680_ts_init(void)
        return 0;
 
  fail2:        free_irq(HP680_TS_IRQ, NULL);
-       cancel_delayed_work(&work);
-       flush_scheduled_work();
+       cancel_delayed_work_sync(&work);
  fail1:        input_free_device(hp680_ts_dev);
        return err;
 }
@@ -116,8 +115,7 @@ static int __init hp680_ts_init(void)
 static void __exit hp680_ts_exit(void)
 {
        free_irq(HP680_TS_IRQ, NULL);
-       cancel_delayed_work(&work);
-       flush_scheduled_work();
+       cancel_delayed_work_sync(&work);
        input_unregister_device(hp680_ts_dev);
 }