Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325129
b: refs/heads/master
c: 034f873
h: refs/heads/master
i:
  325127: 5b25b56
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent 4bd72b5 commit 987447e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 02baee8cd8a0465d33231c4ee01f0a572bd1e0ae
refs/heads/master: 034f8734599d87648b50195978f5f871301d2867
13 changes: 2 additions & 11 deletions trunk/drivers/staging/comedi/drivers/adl_pci9111.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 987447e

Please sign in to comment.