Commit aeaccfe4 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

[PATCH] Char: stallion, use dynamic dev 



Use dynamic tty device registering depending on board's port count.  (i ->
retval change is relevant, since gcc complains about signedness of i)

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6b2c9457

drivers/char/stallion.c

+27 −6
Original line number Diff line number Diff line
@@ -2348,7 +2348,7 @@ static int __devinit stl_pciprobe(struct pci_dev *pdev, 
		const struct pci_device_id *ent)

{

	struct stlbrd *brdp;

	unsigned int brdtype = ent->driver_data;

	unsigned int i, brdtype = ent->driver_data;

	int brdnr, retval = -ENODEV;



	if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE)
@@ -2409,6 +2409,10 @@ static int __devinit stl_pciprobe(struct pci_dev *pdev, 


	pci_set_drvdata(pdev, brdp);



	for (i = 0; i < brdp->nrports; i++)

		tty_register_device(stl_serial,

				brdp->brdnr * STL_MAXPORTS + i, &pdev->dev);



	return 0;

err_null:

	stl_brds[brdp->brdnr] = NULL;
@@ -2421,6 +2425,7 @@ static int __devinit stl_pciprobe(struct pci_dev *pdev, 
static void __devexit stl_pciremove(struct pci_dev *pdev)

{

	struct stlbrd *brdp = pci_get_drvdata(pdev);

	unsigned int i;



	free_irq(brdp->irq, brdp);
@@ -2430,6 +2435,10 @@ static void __devexit stl_pciremove(struct pci_dev *pdev) 
	if (brdp->iosize2 > 0)

		release_region(brdp->ioaddr2, brdp->iosize2);



	for (i = 0; i < brdp->nrports; i++)

		tty_unregister_device(stl_serial,

				brdp->brdnr * STL_MAXPORTS + i);



	stl_brds[brdp->brdnr] = NULL;

	kfree(brdp);

}
@@ -4693,7 +4702,7 @@ static int __init stallion_module_init(void) 
{

	struct stlbrd	*brdp;

	struct stlconf	conf;

	unsigned int i;

	unsigned int i, j;

	int retval;



	printk(KERN_INFO "%s: version %s\n", stl_drvtitle, stl_drvversion);
@@ -4720,6 +4729,9 @@ static int __init stallion_module_init(void) 
		if (stl_brdinit(brdp))

			kfree(brdp);

		else {

			for (j = 0; j < brdp->nrports; j++)

				tty_register_device(stl_serial,

					brdp->brdnr * STL_MAXPORTS + j, NULL);

			stl_brds[brdp->brdnr] = brdp;

			stl_nrbrds = i + 1;

		}
@@ -4761,7 +4773,7 @@ static int __init stallion_module_init(void) 
	stl_serial->type = TTY_DRIVER_TYPE_SERIAL;

	stl_serial->subtype = SERIAL_TYPE_NORMAL;

	stl_serial->init_termios = stl_deftermios;

	stl_serial->flags = TTY_DRIVER_REAL_RAW;

	stl_serial->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;

	tty_set_operations(stl_serial, &stl_ops);



	retval = tty_register_driver(stl_serial);
@@ -4787,7 +4799,9 @@ static int __init stallion_module_init(void) 


static void __exit stallion_module_exit(void)

{

	int		i;

	struct stlbrd *brdp;

	unsigned int i, j;

	int retval;



	pr_debug("cleanup_module()\n");
@@ -4800,14 +4814,21 @@ static void __exit stallion_module_exit(void) 
 *	a hangup on every open port - to try to flush out any processes

 *	hanging onto ports.

 */

	for (i = 0; i < stl_nrbrds; i++) {

		if ((brdp = stl_brds[i]) == NULL || (brdp->state & STL_PROBED))

			continue;

		for (j = 0; j < brdp->nrports; j++)

			tty_unregister_device(stl_serial,

				brdp->brdnr * STL_MAXPORTS + j);

	}

	tty_unregister_driver(stl_serial);

	put_tty_driver(stl_serial);



	for (i = 0; i < 4; i++)

		class_device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i));

	if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))

	if ((retval = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))

		printk("STALLION: failed to un-register serial memory device, "

			"errno=%d\n", -i);

			"errno=%d\n", -retval);

	class_destroy(stallion_class);



	pci_unregister_driver(&stl_pcidriver);