diff options
-rw-r--r-- | drivers/char/stallion.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c index 6a9feb69632d..bc2911396b7e 100644 --- a/drivers/char/stallion.c +++ b/drivers/char/stallion.c | |||
@@ -2421,9 +2421,6 @@ static int __devinit stl_pciprobe(struct pci_dev *pdev, | |||
2421 | struct stlbrd *brdp; | 2421 | struct stlbrd *brdp; |
2422 | unsigned int brdtype = ent->driver_data; | 2422 | unsigned int brdtype = ent->driver_data; |
2423 | 2423 | ||
2424 | pr_debug("stl_initpcibrd(brdtype=%d,busnr=%x,devnr=%x)\n", brdtype, | ||
2425 | pdev->bus->number, pdev->devfn); | ||
2426 | |||
2427 | if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) | 2424 | if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) |
2428 | return -ENODEV; | 2425 | return -ENODEV; |
2429 | 2426 | ||
@@ -2435,21 +2432,13 @@ static int __devinit stl_pciprobe(struct pci_dev *pdev, | |||
2435 | if ((brdp = stl_allocbrd()) == NULL) | 2432 | if ((brdp = stl_allocbrd()) == NULL) |
2436 | return(-ENOMEM); | 2433 | return(-ENOMEM); |
2437 | if ((brdp->brdnr = stl_getbrdnr()) < 0) { | 2434 | if ((brdp->brdnr = stl_getbrdnr()) < 0) { |
2438 | printk("STALLION: too many boards found, " | 2435 | dev_err(&pdev->dev, "too many boards found, " |
2439 | "maximum supported %d\n", STL_MAXBRDS); | 2436 | "maximum supported %d\n", STL_MAXBRDS); |
2440 | return(0); | 2437 | return(0); |
2441 | } | 2438 | } |
2442 | brdp->brdtype = brdtype; | 2439 | brdp->brdtype = brdtype; |
2443 | 2440 | ||
2444 | /* | 2441 | /* |
2445 | * Different Stallion boards use the BAR registers in different ways, | ||
2446 | * so set up io addresses based on board type. | ||
2447 | */ | ||
2448 | pr_debug("%s(%d): BAR[]=%Lx,%Lx,%Lx,%Lx IRQ=%x\n", __FILE__, __LINE__, | ||
2449 | pci_resource_start(pdev, 0), pci_resource_start(pdev, 1), | ||
2450 | pci_resource_start(pdev, 2), pci_resource_start(pdev, 3), pdev->irq); | ||
2451 | |||
2452 | /* | ||
2453 | * We have all resources from the board, so let's setup the actual | 2442 | * We have all resources from the board, so let's setup the actual |
2454 | * board structure now. | 2443 | * board structure now. |
2455 | */ | 2444 | */ |
@@ -2467,7 +2456,7 @@ static int __devinit stl_pciprobe(struct pci_dev *pdev, | |||
2467 | brdp->ioaddr2 = pci_resource_start(pdev, 1); | 2456 | brdp->ioaddr2 = pci_resource_start(pdev, 1); |
2468 | break; | 2457 | break; |
2469 | default: | 2458 | default: |
2470 | printk("STALLION: unknown PCI board type=%d\n", brdtype); | 2459 | dev_err(&pdev->dev, "unknown PCI board type=%u\n", brdtype); |
2471 | break; | 2460 | break; |
2472 | } | 2461 | } |
2473 | 2462 | ||