Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] Char: stallion, convert to pci probing

Browse source 
Convert stallion driver to pci probing instead of pci_dev_get iteration.

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>
This commit is contained in:
Jiri Slaby 2006-12-08 02:39:09 -08:00 • committed by Linus Torvalds
parent 30f4218ffc
commit b1b84fe0d7
1 changed files with 83 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

163
drivers/char/stallion.c
View file

@ -381,8 +381,6 @@ static spinlock_t stallion_lock; /* Guard the tty driver */
/*****************************************************************************/ /*****************************************************************************/
#ifdef CONFIG_PCI
/* /*
* Define the Stallion PCI vendor and device IDs. * Define the Stallion PCI vendor and device IDs.
*/ */
@ -402,22 +400,19 @@ static spinlock_t stallion_lock; /* Guard the tty driver */
/* /*
* Define structure to hold all Stallion PCI boards. * Define structure to hold all Stallion PCI boards.
*/ */
typedef struct stlpcibrd {
unsigned short vendid;
unsigned short devid;
int brdtype;
} stlpcibrd_t;
static stlpcibrd_t stl_pcibrds[] = { static struct pci_device_id stl_pcibrds[] = {
{ PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_ECHPCI864, BRD_ECH64PCI }, { PCI_DEVICE(PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_ECHPCI864),
{ PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_EIOPCI, BRD_EASYIOPCI }, .driver_data = BRD_ECH64PCI },
{ PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_ECHPCI832, BRD_ECHPCI }, { PCI_DEVICE(PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_EIOPCI),
{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87410, BRD_ECHPCI }, .driver_data = BRD_EASYIOPCI },
{ PCI_DEVICE(PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_ECHPCI832),
.driver_data = BRD_ECHPCI },
{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87410),
.driver_data = BRD_ECHPCI },
{ }
}; };
MODULE_DEVICE_TABLE(pci, stl_pcibrds);
static int stl_nrpcibrds = ARRAY_SIZE(stl_pcibrds);
#endif
/*****************************************************************************/ /*****************************************************************************/
@ -2390,24 +2385,52 @@ static int __init stl_getbrdnr(void)
return(-1); return(-1);
} }
static void stl_cleanup_panels(struct stlbrd *brdp)
{
struct stlpanel *panelp;
struct stlport *portp;
unsigned int j, k;
for (j = 0; j < STL_MAXPANELS; j++) {
panelp = brdp->panels[j];
if (panelp == NULL)
continue;
for (k = 0; k < STL_PORTSPERPANEL; k++) {
portp = panelp->ports[k];
if (portp == NULL)
continue;
if (portp->tty != NULL)
stl_hangup(portp->tty);
kfree(portp->tx.buf);
kfree(portp);
}
kfree(panelp);
}
}
/*****************************************************************************/ /*****************************************************************************/
#ifdef CONFIG_PCI
/* /*
* We have a Stallion board. Allocate a board structure and * We have a Stallion board. Allocate a board structure and
* initialize it. Read its IO and IRQ resources from PCI * initialize it. Read its IO and IRQ resources from PCI
* configuration space. * configuration space.
*/ */
static int __init stl_initpcibrd(int brdtype, struct pci_dev *devp) static int __devinit stl_pciprobe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{ {
struct stlbrd *brdp; struct stlbrd *brdp;
unsigned int brdtype = ent->driver_data;
pr_debug("stl_initpcibrd(brdtype=%d,busnr=%x,devnr=%x)\n", brdtype, pr_debug("stl_initpcibrd(brdtype=%d,busnr=%x,devnr=%x)\n", brdtype,
devp->bus->number, devp->devfn); pdev->bus->number, pdev->devfn);
if (pci_enable_device(devp)) if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE)
return -ENODEV;
dev_info(&pdev->dev, "please, report this to LKML: %x/%x/%x\n",
pdev->vendor, pdev->device, pdev->class);
if (pci_enable_device(pdev))
return(-EIO); return(-EIO);
if ((brdp = stl_allocbrd()) == NULL) if ((brdp = stl_allocbrd()) == NULL)
return(-ENOMEM); return(-ENOMEM);
@ -2423,8 +2446,8 @@ static int __init stl_initpcibrd(int brdtype, struct pci_dev *devp)
* so set up io addresses based on board type. * so set up io addresses based on board type.
*/ */
pr_debug("%s(%d): BAR[]=%Lx,%Lx,%Lx,%Lx IRQ=%x\n", __FILE__, __LINE__, pr_debug("%s(%d): BAR[]=%Lx,%Lx,%Lx,%Lx IRQ=%x\n", __FILE__, __LINE__,
pci_resource_start(devp, 0), pci_resource_start(devp, 1), pci_resource_start(pdev, 0), pci_resource_start(pdev, 1),
pci_resource_start(devp, 2), pci_resource_start(devp, 3), devp->irq); pci_resource_start(pdev, 2), pci_resource_start(pdev, 3), pdev->irq);
/* /*
* We have all resources from the board, so let's setup the actual * We have all resources from the board, so let's setup the actual
@ -2432,63 +2455,52 @@ static int __init stl_initpcibrd(int brdtype, struct pci_dev *devp)
*/ */
switch (brdtype) { switch (brdtype) {
case BRD_ECHPCI: case BRD_ECHPCI:
brdp->ioaddr2 = pci_resource_start(devp, 0); brdp->ioaddr2 = pci_resource_start(pdev, 0);
brdp->ioaddr1 = pci_resource_start(devp, 1); brdp->ioaddr1 = pci_resource_start(pdev, 1);
break; break;
case BRD_ECH64PCI: case BRD_ECH64PCI:
brdp->ioaddr2 = pci_resource_start(devp, 2); brdp->ioaddr2 = pci_resource_start(pdev, 2);
brdp->ioaddr1 = pci_resource_start(devp, 1); brdp->ioaddr1 = pci_resource_start(pdev, 1);
break; break;
case BRD_EASYIOPCI: case BRD_EASYIOPCI:
brdp->ioaddr1 = pci_resource_start(devp, 2); brdp->ioaddr1 = pci_resource_start(pdev, 2);
brdp->ioaddr2 = pci_resource_start(devp, 1); brdp->ioaddr2 = pci_resource_start(pdev, 1);
break; break;
default: default:
printk("STALLION: unknown PCI board type=%d\n", brdtype); printk("STALLION: unknown PCI board type=%d\n", brdtype);
break; break;
} }
brdp->irq = devp->irq; brdp->irq = pdev->irq;
stl_brdinit(brdp); stl_brdinit(brdp);
pci_set_drvdata(pdev, brdp);
return(0); return(0);
} }
/*****************************************************************************/ static void __devexit stl_pciremove(struct pci_dev *pdev)
/*
* Find all Stallion PCI boards that might be installed. Initialize each
* one as it is found.
*/
static int __init stl_findpcibrds(void)
{ {
struct pci_dev *dev = NULL; struct stlbrd *brdp = pci_get_drvdata(pdev);
int i, rc;
pr_debug("stl_findpcibrds()\n"); free_irq(brdp->irq, brdp);
for (i = 0; (i < stl_nrpcibrds); i++) stl_cleanup_panels(brdp);
while ((dev = pci_get_device(stl_pcibrds[i].vendid,
stl_pcibrds[i].devid, dev))) {
/* release_region(brdp->ioaddr1, brdp->iosize1);
* Found a device on the PCI bus that has our vendor and if (brdp->iosize2 > 0)
* device ID. Need to check now that it is really us. release_region(brdp->ioaddr2, brdp->iosize2);
*/
if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE)
continue;
rc = stl_initpcibrd(stl_pcibrds[i].brdtype, dev); stl_brds[brdp->brdnr] = NULL;
if (rc) kfree(brdp);
return(rc);
} }
return(0); static struct pci_driver stl_pcidriver = {
} .name = "stallion",
.id_table = stl_pcibrds,
#endif .probe = stl_pciprobe,
.remove = __devexit_p(stl_pciremove)
};
/*****************************************************************************/ /*****************************************************************************/
@ -2535,9 +2547,6 @@ static int __init stl_initbrds(void)
* line options or auto-detected on the PCI bus. * line options or auto-detected on the PCI bus.
*/ */
stl_argbrds(); stl_argbrds();
#ifdef CONFIG_PCI
stl_findpcibrds();
#endif
return(0); return(0);
} }
@ -4776,7 +4785,7 @@ static void stl_sc26198otherisr(struct stlport *portp, unsigned int iack)
*/ */
static int __init stallion_module_init(void) static int __init stallion_module_init(void)
{ {
unsigned int i; unsigned int i, retval;
printk(KERN_INFO "%s: version %s\n", stl_drvtitle, stl_drvversion); printk(KERN_INFO "%s: version %s\n", stl_drvtitle, stl_drvversion);
@ -4785,6 +4794,10 @@ static int __init stallion_module_init(void)
stl_initbrds(); stl_initbrds();
retval = pci_register_driver(&stl_pcidriver);
if (retval)
goto err;
stl_serial = alloc_tty_driver(STL_MAXBRDS * STL_MAXPORTS); stl_serial = alloc_tty_driver(STL_MAXBRDS * STL_MAXPORTS);
if (!stl_serial) if (!stl_serial)
return -1; return -1;
@ -4820,14 +4833,14 @@ static int __init stallion_module_init(void)
} }
return 0; return 0;
err:
return retval;
} }
static void __exit stallion_module_exit(void) static void __exit stallion_module_exit(void)
{ {
struct stlbrd *brdp; struct stlbrd *brdp;
struct stlpanel *panelp; int i;
struct stlport *portp;
int i, j, k;
pr_debug("cleanup_module()\n"); pr_debug("cleanup_module()\n");
@ -4854,27 +4867,15 @@ static void __exit stallion_module_exit(void)
"errno=%d\n", -i); "errno=%d\n", -i);
class_destroy(stallion_class); class_destroy(stallion_class);
pci_unregister_driver(&stl_pcidriver);
for (i = 0; (i < stl_nrbrds); i++) { for (i = 0; (i < stl_nrbrds); i++) {
if ((brdp = stl_brds[i]) == NULL) if ((brdp = stl_brds[i]) == NULL)
continue; continue;
free_irq(brdp->irq, brdp); free_irq(brdp->irq, brdp);
for (j = 0; (j < STL_MAXPANELS); j++) { stl_cleanup_panels(brdp);
panelp = brdp->panels[j];
if (panelp == NULL)
continue;
for (k = 0; (k < STL_PORTSPERPANEL); k++) {
portp = panelp->ports[k];
if (portp == NULL)
continue;
if (portp->tty != NULL)
stl_hangup(portp->tty);
kfree(portp->tx.buf);
kfree(portp);
}
kfree(panelp);
}
release_region(brdp->ioaddr1, brdp->iosize1); release_region(brdp->ioaddr1, brdp->iosize1);
if (brdp->iosize2 > 0) if (brdp->iosize2 > 0)