[ARM] Fix Zaurii keyboard/touchscreen drivers
The Zaurii drivers were partially fixed up for the IRQ register changes, but unfortunately missed some bits, resulting in build errors. Fix these. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
2326eb985b
commit
36bd262b3f
|
@ -207,7 +207,7 @@ static irqreturn_t corgikbd_interrupt(int irq, void *dev_id)
|
|||
static void corgikbd_timer_callback(unsigned long data)
|
||||
{
|
||||
struct corgikbd *corgikbd_data = (struct corgikbd *) data;
|
||||
corgikbd_scankeyboard(corgikbd_data, NULL);
|
||||
corgikbd_scankeyboard(corgikbd_data);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -186,7 +186,7 @@ static irqreturn_t locomokbd_interrupt(int irq, void *dev_id)
|
|||
static void locomokbd_timer_callback(unsigned long data)
|
||||
{
|
||||
struct locomokbd *locomokbd = (struct locomokbd *) data;
|
||||
locomokbd_scankeyboard(locomokbd, NULL);
|
||||
locomokbd_scankeyboard(locomokbd);
|
||||
}
|
||||
|
||||
static int locomokbd_probe(struct locomo_dev *dev)
|
||||
|
|
|
@ -257,7 +257,7 @@ static void spitzkbd_timer_callback(unsigned long data)
|
|||
{
|
||||
struct spitzkbd *spitzkbd_data = (struct spitzkbd *) data;
|
||||
|
||||
spitzkbd_scankeyboard(spitzkbd_data, NULL);
|
||||
spitzkbd_scankeyboard(spitzkbd_data);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -219,7 +219,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer)
|
|||
static void corgi_ts_timer(unsigned long data)
|
||||
{
|
||||
struct corgi_ts *corgits_data = (struct corgi_ts *) data;
|
||||
ts_interrupt_main(corgits_data, 1, NULL);
|
||||
ts_interrupt_main(corgits_data, 1);
|
||||
}
|
||||
|
||||
static irqreturn_t ts_interrupt(int irq, void *dev_id)
|
||||
|
@ -237,7 +237,7 @@ static int corgits_suspend(struct platform_device *dev, pm_message_t state)
|
|||
if (corgi_ts->pendown) {
|
||||
del_timer_sync(&corgi_ts->timer);
|
||||
corgi_ts->tc.pressure = 0;
|
||||
new_data(corgi_ts, NULL);
|
||||
new_data(corgi_ts);
|
||||
corgi_ts->pendown = 0;
|
||||
}
|
||||
corgi_ts->power_mode = PWR_MODE_SUSPEND;
|
||||
|
|
Loading…
Reference in New Issue