aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2006-12-08 02:39:09 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 08:28:59 -0800
commitfefaf9a789607d3a997d3d05bd2a72586ae0c901 (patch)
tree40fc48fee1def6d03ba4877e8bbefa4c0fcbe1e2
parent[PATCH] Char: stallion, convert to pci probing (diff)
downloadlinux-dev-fefaf9a789607d3a997d3d05bd2a72586ae0c901.tar.xz
linux-dev-fefaf9a789607d3a997d3d05bd2a72586ae0c901.zip
[PATCH] Char: stallion, prints cleanup
Too many information is printed out (they may be easily obtained through sysfs), wipe them out in probe function. Convert rest of them to dev_ variants. 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/stallion.c15
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,
struct stlbrd *brdp;
unsigned int brdtype = ent->driver_data;
- pr_debug("stl_initpcibrd(brdtype=%d,busnr=%x,devnr=%x)\n", brdtype,
- pdev->bus->number, pdev->devfn);
-
if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE)
return -ENODEV;
@@ -2435,21 +2432,13 @@ static int __devinit stl_pciprobe(struct pci_dev *pdev,
if ((brdp = stl_allocbrd()) == NULL)
return(-ENOMEM);
if ((brdp->brdnr = stl_getbrdnr()) < 0) {
- printk("STALLION: too many boards found, "
+ dev_err(&pdev->dev, "too many boards found, "
"maximum supported %d\n", STL_MAXBRDS);
return(0);
}
brdp->brdtype = brdtype;
/*
- * Different Stallion boards use the BAR registers in different ways,
- * so set up io addresses based on board type.
- */
- pr_debug("%s(%d): BAR[]=%Lx,%Lx,%Lx,%Lx IRQ=%x\n", __FILE__, __LINE__,
- pci_resource_start(pdev, 0), pci_resource_start(pdev, 1),
- 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
* board structure now.
*/
@@ -2467,7 +2456,7 @@ static int __devinit stl_pciprobe(struct pci_dev *pdev,
brdp->ioaddr2 = pci_resource_start(pdev, 1);
break;
default:
- printk("STALLION: unknown PCI board type=%d\n", brdtype);
+ dev_err(&pdev->dev, "unknown PCI board type=%u\n", brdtype);
break;
}