From 90fea2627d38547c84dd0126c3ad0aa46da1bfe7 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 11 Sep 2012 13:50:06 -0700
Subject: [PATCH] --- yaml --- r: 325199 b: refs/heads/master c:
 798cdd05e00f2ffb2aa763f5bc2605cd9c08a265 h: refs/heads/master i:   325197:
 ca5b07e3d0c277412f6056ad08eeee7311dabc47   325195:
 6b1ec63a68f5762778836e3029eb6be44cf6c50b   325191:
 65392f3065cae95ee82db4705f71e564704105fa   325183:
 7d653ab3ed852ffa873a421b229d785b4a0e499c v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/icp_multi.c        | 36 ++++---------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index 962f3acbb017..0986f4e9c95a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12b4a097b6fd6d7c7e18dbb40d2ed62cdc26cd3b
+refs/heads/master: 798cdd05e00f2ffb2aa763f5bc2605cd9c08a265
diff --git a/trunk/drivers/staging/comedi/drivers/icp_multi.c b/trunk/drivers/staging/comedi/drivers/icp_multi.c
index 4d2952ec2a13..4673a896b505 100644
--- a/trunk/drivers/staging/comedi/drivers/icp_multi.c
+++ b/trunk/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;
 }