Commit c2c6f3ac authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

TTY: changes based on tty_register_device() paramater change.

parent cc6670c2
...@@ -2681,8 +2681,8 @@ static int __init rs_init(void) ...@@ -2681,8 +2681,8 @@ static int __init rs_init(void)
(state->flags & ASYNC_FOURPORT) ? " FourPort" : "", (state->flags & ASYNC_FOURPORT) ? " FourPort" : "",
state->port, state->irq, state->port, state->irq,
uart_config[state->type].name); uart_config[state->type].name);
tty_register_device(&serial_driver, state->line); tty_register_device(&serial_driver, state->line, NULL);
tty_register_device(&callout_driver, state->line); tty_register_device(&callout_driver, state->line, NULL);
} }
return 0; return 0;
} }
...@@ -2769,8 +2769,8 @@ int register_serial(struct serial_struct *req) ...@@ -2769,8 +2769,8 @@ int register_serial(struct serial_struct *req)
state->iomem_base ? "iomem" : "port", state->iomem_base ? "iomem" : "port",
state->iomem_base ? (unsigned long)state->iomem_base : state->iomem_base ? (unsigned long)state->iomem_base :
state->port, state->irq, uart_config[state->type].name); state->port, state->irq, uart_config[state->type].name);
tty_register_device(&serial_driver, state->line); tty_register_device(&serial_driver, state->line, NULL);
tty_register_device(&callout_driver, state->line); tty_register_device(&callout_driver, state->line, NULL);
return state->line + SERIAL_DEV_OFFSET; return state->line + SERIAL_DEV_OFFSET;
} }
......
...@@ -1426,8 +1426,8 @@ int __init dz_init(void) ...@@ -1426,8 +1426,8 @@ int __init dz_init(void)
printk("ttyS%02d at 0x%08x (irq = %d)\n", info->line, printk("ttyS%02d at 0x%08x (irq = %d)\n", info->line,
info->port, SERIAL); info->port, SERIAL);
tty_register_device(&serial_driver, info->line); tty_register_device(&serial_driver, info->line, NULL);
tty_register_device(&callout_driver, info->line); tty_register_device(&callout_driver, info->line, NULL);
} }
/* Reset the chip */ /* Reset the chip */
......
...@@ -283,7 +283,7 @@ int __init hvc_init(void) ...@@ -283,7 +283,7 @@ int __init hvc_init(void)
for (i = 0; i < hvc_driver.num; i++) { for (i = 0; i < hvc_driver.num; i++) {
hvc_struct[i].lock = SPIN_LOCK_UNLOCKED; hvc_struct[i].lock = SPIN_LOCK_UNLOCKED;
hvc_struct[i].index = i; hvc_struct[i].index = i;
tty_register_device(&hvc_driver, i); tty_register_device(&hvc_driver, i, NULL);
} }
if (tty_register_driver(&hvc_driver)) if (tty_register_driver(&hvc_driver))
......
...@@ -902,10 +902,10 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize) ...@@ -902,10 +902,10 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
{ {
tty_register_device(&ip2_tty_driver, tty_register_device(&ip2_tty_driver,
j + ABS_BIGGEST_BOX * j + ABS_BIGGEST_BOX *
(box+i*ABS_MAX_BOXES)); (box+i*ABS_MAX_BOXES), NULL);
tty_register_device(&ip2_callout_driver, tty_register_device(&ip2_callout_driver,
j + ABS_BIGGEST_BOX * j + ABS_BIGGEST_BOX *
(box+i*ABS_MAX_BOXES)); (box+i*ABS_MAX_BOXES), NULL);
} }
} }
} }
......
...@@ -2666,7 +2666,7 @@ static void __init con_init_devfs (void) ...@@ -2666,7 +2666,7 @@ static void __init con_init_devfs (void)
int i; int i;
for (i = 0; i < console_driver.num; i++) for (i = 0; i < console_driver.num; i++)
tty_register_device (&console_driver, i); tty_register_device (&console_driver, i, NULL);
} }
/* /*
......
...@@ -2242,7 +2242,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port) ...@@ -2242,7 +2242,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
* Register the port whether it's detected or not. This allows * Register the port whether it's detected or not. This allows
* setserial to be used to alter this ports parameters. * setserial to be used to alter this ports parameters.
*/ */
tty_register_device(drv->tty_driver, port->line); tty_register_device(drv->tty_driver, port->line, NULL);
out: out:
up(&port_sem); up(&port_sem);
......
...@@ -1971,8 +1971,8 @@ int __init zs_init(void) ...@@ -1971,8 +1971,8 @@ int __init zs_init(void)
printk("ttyS%02d at 0x%08x (irq = %d)", info->line, printk("ttyS%02d at 0x%08x (irq = %d)", info->line,
info->port, info->irq); info->port, info->irq);
printk(" is a Z85C30 SCC\n"); printk(" is a Z85C30 SCC\n");
tty_register_device(&serial_driver, info->line); tty_register_device(&serial_driver, info->line, NULL);
tty_register_device(&callout_driver, info->line); tty_register_device(&callout_driver, info->line, NULL);
} }
......
...@@ -1198,7 +1198,7 @@ static int usb_bluetooth_probe (struct usb_interface *intf, ...@@ -1198,7 +1198,7 @@ static int usb_bluetooth_probe (struct usb_interface *intf,
bluetooth, endpoint->bInterval); bluetooth, endpoint->bInterval);
/* initialize the devfs nodes for this device and let the user know what bluetooths we are bound to */ /* initialize the devfs nodes for this device and let the user know what bluetooths we are bound to */
tty_register_device (&bluetooth_tty_driver, minor); tty_register_device (&bluetooth_tty_driver, minor, &intf->dev);
info("Bluetooth converter now attached to ttyUB%d (or usb/ttub/%d for devfs)", minor, minor); info("Bluetooth converter now attached to ttyUB%d (or usb/ttub/%d for devfs)", minor, minor);
bluetooth_table[minor] = bluetooth; bluetooth_table[minor] = bluetooth;
......
...@@ -653,7 +653,7 @@ static int acm_probe (struct usb_interface *intf, ...@@ -653,7 +653,7 @@ static int acm_probe (struct usb_interface *intf,
usb_driver_claim_interface(&acm_driver, acm->iface + 0, acm); usb_driver_claim_interface(&acm_driver, acm->iface + 0, acm);
usb_driver_claim_interface(&acm_driver, acm->iface + 1, acm); usb_driver_claim_interface(&acm_driver, acm->iface + 1, acm);
tty_register_device(&acm_tty_driver, minor); tty_register_device(&acm_tty_driver, minor, &intf->dev);
acm_table[minor] = acm; acm_table[minor] = acm;
usb_set_intfdata (intf, acm); usb_set_intfdata (intf, acm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment