浏览代码

staging: comedi: adl_pci6208: use the 'board_name' for the resource name

Use the 'dev->board_name' instead of the 'dev->driver->driver_name'
as the resource name used when requesing the pci regions in
comedi_pci_enable(). The board_name has a closer affinity to the
card.

Also, remove the dev_err() message when comedi_pci_enable() fails.
It's just noise and doesn't actually tell the real reason why the
call failed. It could have failed either the pci_enable_device()
or the pci_request_regions().

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>
H Hartley Sweeten 13 年之前
父节点
当前提交
3cf05ddb0d
共有 1 个文件被更改,包括 2 次插入5 次删除
  1. 2 5
      drivers/staging/comedi/drivers/adl_pci6208.c

+ 2 - 5
drivers/staging/comedi/drivers/adl_pci6208.c

@@ -196,12 +196,9 @@ static int pci6208_attach_pci(struct comedi_device *dev,
 		return ret;
 	devpriv = dev->private;
 
-	ret = comedi_pci_enable(pcidev, dev->driver->driver_name);
-	if (ret) {
-		dev_err(dev->class_dev,
-			"Failed to enable PCI device and request regions\n");
+	ret = comedi_pci_enable(pcidev, dev->board_name);
+	if (ret)
 		return ret;
-	}
 	dev->iobase = pci_resource_start(pcidev, 2);
 
 	ret = comedi_alloc_subdevices(dev, 3);