git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
input
/
serio
/
hp_sdc.c
diff --git
a/drivers/input/serio/hp_sdc.c
b/drivers/input/serio/hp_sdc.c
index
a10348b
..
9907ad3
100644
(file)
--- a/
drivers/input/serio/hp_sdc.c
+++ b/
drivers/input/serio/hp_sdc.c
@@
-202,7
+202,7
@@
static void hp_sdc_take (int irq, void *dev_id, uint8_t status, uint8_t data) {
}
}
}
}
-static irqreturn_t hp_sdc_isr(int irq, void *dev_id
, struct pt_regs * regs
) {
+static irqreturn_t hp_sdc_isr(int irq, void *dev_id) {
uint8_t status, data;
status = hp_sdc_status_in8();
uint8_t status, data;
status = hp_sdc_status_in8();
@@
-253,7
+253,7
@@
static irqreturn_t hp_sdc_isr(int irq, void *dev_id, struct pt_regs * regs) {
}
}
-static irqreturn_t hp_sdc_nmisr(int irq, void *dev_id
, struct pt_regs * regs
) {
+static irqreturn_t hp_sdc_nmisr(int irq, void *dev_id) {
int status;
status = hp_sdc_status_in8();
int status;
status = hp_sdc_status_in8();
@@
-310,7
+310,7
@@
static void hp_sdc_tasklet(unsigned long foo) {
* in tasklet/bh context.
*/
if (curr->act.irqhook)
* in tasklet/bh context.
*/
if (curr->act.irqhook)
- curr->act.irqhook(0,
0
, 0, 0);
+ curr->act.irqhook(0,
NULL
, 0, 0);
}
curr->actidx = curr->idx;
curr->idx++;
}
curr->actidx = curr->idx;
curr->idx++;
@@
-525,7
+525,7
@@
actdone:
up(curr->act.semaphore);
}
else if (act & HP_SDC_ACT_CALLBACK) {
up(curr->act.semaphore);
}
else if (act & HP_SDC_ACT_CALLBACK) {
- curr->act.irqhook(0,
0
,0,0);
+ curr->act.irqhook(0,
NULL
,0,0);
}
if (curr->idx >= curr->endidx) { /* This transaction is over. */
if (act & HP_SDC_ACT_DEALLOC) kfree(curr);
}
if (curr->idx >= curr->endidx) { /* This transaction is over. */
if (act & HP_SDC_ACT_DEALLOC) kfree(curr);