Skip to content

Commit

Permalink
Input: remove user counters from drivers/input/touchscreen since
Browse files Browse the repository at this point in the history
       input core takes care of calling open and close methods
       only when needed.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed May 29, 2005
1 parent 65cde54 commit af24604
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions drivers/input/touchscreen/mk712.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ MODULE_PARM_DESC(irq, "IRQ of MK712 touchscreen controller");
#define MK712_READ_ONE_POINT 0x20
#define MK712_POWERUP 0x40

static int mk712_used = 0;
static struct input_dev mk712_dev;
static DEFINE_SPINLOCK(mk712_lock);

Expand Down Expand Up @@ -130,17 +129,14 @@ static int mk712_open(struct input_dev *dev)

spin_lock_irqsave(&mk712_lock, flags);

if (!mk712_used++) {
outb(0, mk712_io + MK712_CONTROL); /* Reset */

outb(0, mk712_io + MK712_CONTROL); /* Reset */
outb(MK712_ENABLE_INT | MK712_INT_ON_CONVERSION_COMPLETE |
MK712_INT_ON_CHANGE_IN_TOUCH_STATUS |
MK712_ENABLE_PERIODIC_CONVERSIONS |
MK712_POWERUP, mk712_io + MK712_CONTROL);

outb(MK712_ENABLE_INT | MK712_INT_ON_CONVERSION_COMPLETE |
MK712_INT_ON_CHANGE_IN_TOUCH_STATUS |
MK712_ENABLE_PERIODIC_CONVERSIONS |
MK712_POWERUP, mk712_io + MK712_CONTROL);

outb(10, mk712_io + MK712_RATE); /* 187 points per second */
}
outb(10, mk712_io + MK712_RATE); /* 187 points per second */

spin_unlock_irqrestore(&mk712_lock, flags);

Expand All @@ -153,8 +149,7 @@ static void mk712_close(struct input_dev *dev)

spin_lock_irqsave(&mk712_lock, flags);

if (!--mk712_used)
outb(0, mk712_io + MK712_CONTROL);
outb(0, mk712_io + MK712_CONTROL);

spin_unlock_irqrestore(&mk712_lock, flags);
}
Expand Down

0 comments on commit af24604

Please sign in to comment.