Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[PATCH] Char: moxa, pci probing 



Alter the driver to use the pci probing.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9cde5bf0

drivers/char/moxa.c

+20 −20
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ static struct moxa_board_conf { 
	int numPorts;

	unsigned long baseAddr;

	int busType;

	struct pci_dev *pdev;



	int loadstat;
@@ -319,8 +318,7 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev, 
		break;

	}

	board->busType = MOXA_BUS_TYPE_PCI;

	/* don't lose the reference in the next pci_get_device iteration */

	board->pdev = pci_dev_get(pdev);



	pci_set_drvdata(pdev, board);



	return (0);
@@ -334,13 +332,19 @@ static void __devexit moxa_pci_remove(struct pci_dev *pdev) 


	pci_iounmap(pdev, brd->basemem);

	brd->basemem = NULL;

	pci_dev_put(pdev);

}



static struct pci_driver moxa_pci_driver = {

	.name = "moxa",

	.id_table = moxa_pcibrds,

	.probe = moxa_pci_probe,

	.remove = __devexit_p(moxa_pci_remove)

};

#endif /* CONFIG_PCI */



static int __init moxa_init(void)

{

	int i, numBoards;

	int i, numBoards, retval = 0;

	struct moxa_port *ch;



	printk(KERN_INFO "MOXA Intellio family driver version %s\n", MOXA_VERSION);
@@ -430,25 +434,22 @@ static int __init moxa_init(void) 
		}

	}

#endif

	/* Find PCI boards here */



#ifdef CONFIG_PCI

	{

		struct pci_dev *p = NULL;

		int n = ARRAY_SIZE(moxa_pcibrds) - 1;

		i = 0;

		while (i < n) {

			while ((p = pci_get_device(moxa_pcibrds[i].vendor, moxa_pcibrds[i].device, p))!=NULL)

				moxa_pci_probe(p, &moxa_pcibrds[i]);

			i++;

		}

	retval = pci_register_driver(&moxa_pci_driver);

	if (retval) {

		printk(KERN_ERR "Can't register moxa pci driver!\n");

		if (numBoards)

			retval = 0;

	}

#endif



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

		moxa_boards[i].basemem = ioremap(moxa_boards[i].baseAddr,

				0x4000);

	}



	return (0);

	return retval;

}



static void __exit moxa_exit(void)
@@ -467,14 +468,13 @@ static void __exit moxa_exit(void) 
		printk("Couldn't unregister MOXA Intellio family serial driver\n");

	put_tty_driver(moxaDriver);



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

#ifdef CONFIG_PCI

		if (moxa_boards[i].busType == MOXA_BUS_TYPE_PCI)

			moxa_pci_remove(moxa_boards[i].pdev);

	pci_unregister_driver(&moxa_pci_driver);

#endif



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

		if (moxa_boards[i].basemem)

			iounmap(moxa_boards[i].basemem);

	}



	if (verbose)

		printk("Done\n");