summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2006-12-08 02:39:26 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 08:29:00 -0800
commitec3dde578a969ea4b0a8c3d45e02d73abab1b2d3 (patch)
tree738d8d5d20b960f0e58713887e285fc0c6462f53
parentf2362c9411e914642ffe216e10987bb9aae2a480 (diff)
[PATCH] Char: istallion, dynamic tty device
register tty device dynamically according to the count of board ports. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/char/istallion.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index a1755186f7b4..f1752c81993b 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -3846,6 +3846,10 @@ static int stli_findeisabrds(void)
stli_brds[brdp->brdnr] = brdp;
found++;
+
+ for (i = 0; i < brdp->nrports; i++)
+ tty_register_device(stli_serial,
+ brdp->brdnr * STL_MAXPORTS + i, NULL);
}
return found;
@@ -3872,6 +3876,7 @@ static int __devinit stli_pciprobe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct stlibrd *brdp;
+ unsigned int i;
int brdnr, retval = -EIO;
retval = pci_enable_device(pdev);
@@ -3912,6 +3917,10 @@ static int __devinit stli_pciprobe(struct pci_dev *pdev,
brdp->enable = NULL;
brdp->disable = NULL;
+ for (i = 0; i < brdp->nrports; i++)
+ tty_register_device(stli_serial, brdp->brdnr * STL_MAXPORTS + i,
+ &pdev->dev);
+
return 0;
err_null:
stli_brds[brdp->brdnr] = NULL;
@@ -3992,6 +4001,10 @@ static int stli_initbrds(void)
}
stli_brds[brdp->brdnr] = brdp;
found++;
+
+ for (i = 0; i < brdp->nrports; i++)
+ tty_register_device(stli_serial,
+ brdp->brdnr * STL_MAXPORTS + i, NULL);
}
retval = stli_findeisabrds();
@@ -4596,7 +4609,7 @@ static int __init istallion_module_init(void)
stli_serial->type = TTY_DRIVER_TYPE_SERIAL;
stli_serial->subtype = SERIAL_TYPE_NORMAL;
stli_serial->init_termios = stli_deftermios;
- stli_serial->flags = TTY_DRIVER_REAL_RAW;
+ stli_serial->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
tty_set_operations(stli_serial, &stli_ops);
retval = tty_register_driver(stli_serial);