staging: comedi: icp_multi: remove board attach noise

Remove the kernel message noise during the attach of the board.
Use a simple/clean dev_info at the end of the attach.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index 4d2952ec2a1389c253289988fe565ecea3926929..4673a896b5055aad49e64782cc3f179d5814de88 100644 (file)
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -706,10 +706,6 @@ static int icp_multi_attach(struct comedi_device *dev,
        resource_size_t io_addr[5], iobase;
        unsigned char pci_bus, pci_slot, pci_func;
 
-       printk(KERN_WARNING
-              "icp_multi EDBG: BGN: icp_multi_attach(...)\n");
-
-       /*  Allocate private data storage space */
        ret = alloc_private(dev, sizeof(struct icp_multi_private));
        if (ret < 0)
                return ret;
@@ -718,10 +714,6 @@ static int icp_multi_attach(struct comedi_device *dev,
        if (pci_list_builded++ == 0)
                pci_card_list_init(PCI_VENDOR_ID_ICP, 0);
 
-       printk(KERN_WARNING
-              "Anne's comedi%d: icp_multi: board=%s", dev->minor,
-              this_board->name);
-
        card = select_and_alloc_pci_card(PCI_VENDOR_ID_ICP,
                                         this_board->device_id, it->options[0],
                                         it->options[1]);
@@ -732,24 +724,14 @@ static int icp_multi_attach(struct comedi_device *dev,
        devpriv->card = card;
 
        if ((pci_card_data(card, &pci_bus, &pci_slot, &pci_func, &io_addr[0],
-                          &irq)) < 0) {
-               printk(KERN_WARNING " - Can't get configuration data!\n");
+                          &irq)) < 0)
                return -EIO;
-       }
 
        iobase = io_addr[2];
        devpriv->phys_iobase = iobase;
-
-       printk(KERN_WARNING
-              ", b:s:f=%d:%d:%d, io=0x%8llx \n", pci_bus, pci_slot, pci_func,
-              (unsigned long long)iobase);
-
        devpriv->io_addr = ioremap(iobase, ICP_MULTI_SIZE);
-
-       if (devpriv->io_addr == NULL) {
-               printk(KERN_WARNING "ioremap failed.\n");
+       if (devpriv->io_addr == NULL)
                return -ENOMEM;
-       }
 
        dev->board_name = this_board->name;
 
@@ -762,19 +744,12 @@ static int icp_multi_attach(struct comedi_device *dev,
        if (irq) {
                if (request_irq(irq, interrupt_service_icp_multi,
                                IRQF_SHARED, "Inova Icp Multi", dev)) {
-                       printk(KERN_WARNING
-                               "unable to allocate IRQ %u, DISABLING IT",
-                               irq);
                        irq = 0;        /* Can't use IRQ */
-               } else
-                       printk(KERN_WARNING ", irq=%u", irq);
-       } else
-               printk(KERN_WARNING ", IRQ disabled");
+               }
+       }
 
        dev->irq = irq;
 
-       printk(KERN_WARNING ".\n");
-
        s = &dev->subdevices[0];
        dev->read_subdev = s;
        s->type = COMEDI_SUBD_AI;
@@ -828,6 +803,9 @@ static int icp_multi_attach(struct comedi_device *dev,
 
        devpriv->valid = 1;
 
+       dev_info(dev->class_dev, "%s attached, irq %sabled\n",
+               dev->board_name, dev->irq ? "en" : "dis");
+
        return 0;
 }