From: Jiri Slaby Date: Fri, 8 Dec 2006 10:38:52 +0000 (-0800) Subject: [PATCH] Char: isicom, move to tty_register_device X-Git-Tag: v2.6.20-rc1~34^2~193 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=938a7023bbbc626b0ab7ece13fe8cb26cfcc486b;p=linux-2.6 [PATCH] Char: isicom, move to tty_register_device Instead of registering all devices in register_tty_driver, register devices in probe function and register only port_count devices. Signed-off-by: Jiri Slaby Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index c5cb2a9e68..604882dac2 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -195,6 +195,7 @@ struct isi_board { signed char count; spinlock_t card_lock; /* Card wide lock 11/5/00 -sameer */ unsigned long flags; + unsigned int index; }; struct isi_port { @@ -1781,6 +1782,7 @@ static int __devinit isicom_probe(struct pci_dev *pdev, break; } + board->index = index; board->base = ioaddr; board->irq = pciirq; card++; @@ -1811,6 +1813,10 @@ static int __devinit isicom_probe(struct pci_dev *pdev, if (retval < 0) goto errunri; + for (index = 0; index < board->port_count; index++) + tty_register_device(isicom_normal, board->index * 16 + index, + &pdev->dev); + return 0; errunri: @@ -1825,6 +1831,10 @@ err: static void __devexit isicom_remove(struct pci_dev *pdev) { struct isi_board *board = pci_get_drvdata(pdev); + unsigned int i; + + for (i = 0; i < board->port_count; i++) + tty_unregister_device(isicom_normal, board->index * 16 + i); free_irq(board->irq, board); release_region(board->base, 16); @@ -1874,7 +1884,8 @@ static int __init isicom_init(void) isicom_normal->init_termios = tty_std_termios; isicom_normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; - isicom_normal->flags = TTY_DRIVER_REAL_RAW; + isicom_normal->flags = TTY_DRIVER_REAL_RAW | + TTY_DRIVER_DYNAMIC_DEV; tty_set_operations(isicom_normal, &isicom_ops); retval = tty_register_driver(isicom_normal);