From 987447e366291b9c6d19e6095330cfb1eacb8d7b Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 10 Sep 2012 18:59:21 -0700 Subject: [PATCH] --- yaml --- r: 325129 b: refs/heads/master c: 034f8734599d87648b50195978f5f871301d2867 h: refs/heads/master i: 325127: 5b25b568c57722ce6bd69e10793d8589fd564bf7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/adl_pci9111.c | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index e6e13854f8ad..5fdf23c7f9b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02baee8cd8a0465d33231c4ee01f0a572bd1e0ae +refs/heads/master: 034f8734599d87648b50195978f5f871301d2867 diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c index 38faa466be91..f30bcb7161a6 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c @@ -1098,10 +1098,6 @@ static int pci9111_attach(struct comedi_device *dev, dev_private = dev->private; /* Probe the device to determine what device in the series it is. */ - - printk(KERN_ERR "comedi%d: " PCI9111_DRIVER_NAME " driver\n", - dev->minor); - pcidev = pci9111_find_pci(dev, it); if (!pcidev) return -EIO; @@ -1116,10 +1112,6 @@ static int pci9111_attach(struct comedi_device *dev, lcr_io_base = pci_resource_start(pcidev, 1); lcr_io_range = pci_resource_len(pcidev, 1); - printk - ("comedi%d: local configuration registers at address 0x%4lx [0x%4lx]\n", - dev->minor, lcr_io_base, lcr_io_range); - /* Enable PCI device and request regions */ if (comedi_pci_enable(pcidev, PCI9111_DRIVER_NAME) < 0) { printk @@ -1132,9 +1124,6 @@ static int pci9111_attach(struct comedi_device *dev, io_base = pci_resource_start(pcidev, 2); io_range = pci_resource_len(pcidev, 2); - printk(KERN_ERR "comedi%d: 6503 registers at address 0x%4lx [0x%4lx]\n", - dev->minor, io_base, io_range); - dev->iobase = io_base; dev->board_name = board->name; dev_private->io_range = io_range; @@ -1207,6 +1196,8 @@ static int pci9111_attach(struct comedi_device *dev, dev_private->is_valid = 1; + dev_info(dev->class_dev, "%s attached\n", dev->board_name); + return 0; }