From 3cf05ddb0d7c5612ee70f250f22427462d820fe1 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 9 Aug 2012 14:51:51 -0700 Subject: [PATCH] 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/adl_pci6208.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c index 74695bb..3abff556 100644 --- a/drivers/staging/comedi/drivers/adl_pci6208.c +++ b/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); -- 2.7.4