Build fixes for struct pt_regs removal
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
This commit is contained in:
committed by
Matthew Wilcox
parent
e317c8ccaa
commit
be577a5220
@@ -328,7 +328,7 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
|
||||
kbd->dev->id.vendor = PCI_VENDOR_ID_HP;
|
||||
kbd->dev->id.product = 0x0001; /* TODO: get from kbd->rsc */
|
||||
kbd->dev->id.version = 0x0100; /* TODO: get from kbd->rsc */
|
||||
kbd->dev->dev = &serio->dev;
|
||||
kbd->dev->cdev.dev = &serio->dev;
|
||||
|
||||
for (i = 0; i < 128; i++) {
|
||||
set_bit(hil_kbd_set1[i], kbd->dev->keybit);
|
||||
|
||||
@@ -375,7 +375,7 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
|
||||
ptr->dev->id.vendor = PCI_VENDOR_ID_HP;
|
||||
ptr->dev->id.product = 0x0001; /* TODO: get from ptr->rsc */
|
||||
ptr->dev->id.version = 0x0100; /* TODO: get from ptr->rsc */
|
||||
ptr->dev->dev = &serio->dev;
|
||||
ptr->dev->cdev.dev = &serio->dev;
|
||||
|
||||
input_register_device(ptr->dev);
|
||||
printk(KERN_INFO "input: %s (%s), ID: %d\n",
|
||||
|
||||
@@ -166,7 +166,7 @@ static inline int gscps2_writeb_output(struct gscps2port *ps2port, u8 data)
|
||||
|
||||
/* make sure any received data is returned as fast as possible */
|
||||
/* this is important e.g. when we set the LEDs on the keyboard */
|
||||
gscps2_interrupt(0, NULL, NULL);
|
||||
gscps2_interrupt(0, NULL);
|
||||
|
||||
return 1;
|
||||
}
|
||||
@@ -306,7 +306,7 @@ static int gscps2_open(struct serio *port)
|
||||
/* enable it */
|
||||
gscps2_enable(ps2port, ENABLE);
|
||||
|
||||
gscps2_interrupt(0, NULL, NULL);
|
||||
gscps2_interrupt(0, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -162,10 +162,10 @@ static void hil_mlc_send_polls(hil_mlc *mlc) {
|
||||
if (did != (p & HIL_PKT_ADDR_MASK) >> 8) {
|
||||
if (drv == NULL || drv->interrupt == NULL) goto skip;
|
||||
|
||||
drv->interrupt(serio, 0, 0, NULL);
|
||||
drv->interrupt(serio, HIL_ERR_INT >> 16, 0, NULL);
|
||||
drv->interrupt(serio, HIL_PKT_CMD >> 8, 0, NULL);
|
||||
drv->interrupt(serio, HIL_CMD_POL + cnt, 0, NULL);
|
||||
drv->interrupt(serio, 0, 0);
|
||||
drv->interrupt(serio, HIL_ERR_INT >> 16, 0);
|
||||
drv->interrupt(serio, HIL_PKT_CMD >> 8, 0);
|
||||
drv->interrupt(serio, HIL_CMD_POL + cnt, 0);
|
||||
skip:
|
||||
did = (p & HIL_PKT_ADDR_MASK) >> 8;
|
||||
serio = did ? mlc->serio[mlc->di_map[did-1]] : NULL;
|
||||
@@ -174,10 +174,10 @@ static void hil_mlc_send_polls(hil_mlc *mlc) {
|
||||
}
|
||||
cnt++; i++;
|
||||
if (drv == NULL || drv->interrupt == NULL) continue;
|
||||
drv->interrupt(serio, (p >> 24), 0, NULL);
|
||||
drv->interrupt(serio, (p >> 16) & 0xff, 0, NULL);
|
||||
drv->interrupt(serio, (p >> 8) & ~HIL_PKT_ADDR_MASK, 0, NULL);
|
||||
drv->interrupt(serio, p & 0xff, 0, NULL);
|
||||
drv->interrupt(serio, (p >> 24), 0);
|
||||
drv->interrupt(serio, (p >> 16) & 0xff, 0);
|
||||
drv->interrupt(serio, (p >> 8) & ~HIL_PKT_ADDR_MASK, 0);
|
||||
drv->interrupt(serio, p & 0xff, 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -780,16 +780,16 @@ static int hil_mlc_serio_write(struct serio *serio, unsigned char c) {
|
||||
while ((last != idx) && (*last == 0)) last--;
|
||||
|
||||
while (idx != last) {
|
||||
drv->interrupt(serio, 0, 0, NULL);
|
||||
drv->interrupt(serio, HIL_ERR_INT >> 16, 0, NULL);
|
||||
drv->interrupt(serio, 0, 0, NULL);
|
||||
drv->interrupt(serio, *idx, 0, NULL);
|
||||
drv->interrupt(serio, 0, 0);
|
||||
drv->interrupt(serio, HIL_ERR_INT >> 16, 0);
|
||||
drv->interrupt(serio, 0, 0);
|
||||
drv->interrupt(serio, *idx, 0);
|
||||
idx++;
|
||||
}
|
||||
drv->interrupt(serio, 0, 0, NULL);
|
||||
drv->interrupt(serio, HIL_ERR_INT >> 16, 0, NULL);
|
||||
drv->interrupt(serio, HIL_PKT_CMD >> 8, 0, NULL);
|
||||
drv->interrupt(serio, *idx, 0, NULL);
|
||||
drv->interrupt(serio, 0, 0);
|
||||
drv->interrupt(serio, HIL_ERR_INT >> 16, 0);
|
||||
drv->interrupt(serio, HIL_PKT_CMD >> 8, 0);
|
||||
drv->interrupt(serio, *idx, 0);
|
||||
|
||||
mlc->serio_oidx[map->didx] = 0;
|
||||
mlc->serio_opacket[map->didx] = 0;
|
||||
|
||||
Reference in New Issue
Block a user