lkml.org 
[lkml]   [2012]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 22/36] staging: comedi: cb_pcidas: move the "find pci" dev_printk messages
Date
Move the dev_printk messages associated with the "find pci device"
from the *attach function into the *find_pci_device function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/comedi/drivers/cb_pcidas.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index a2901bb..9f883dd 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -1537,10 +1537,15 @@ static struct pci_dev *cb_pcidas_find_pci_device(struct comedi_device *dev,
continue;
}
}
+ dev_dbg(dev->class_dev,
+ "Found %s on bus %i, slot %i\n",
+ thisboard->name,
+ pcidev->bus->number, PCI_SLOT(pcidev->devfn));
dev->board_ptr = thisboard;
return pcidev;
}
}
+ dev_err(dev->class_dev, "No supported card found\n");
return NULL;
}

@@ -1558,15 +1563,9 @@ static int cb_pcidas_attach(struct comedi_device *dev,
devpriv = dev->private;

devpriv->pci_dev = cb_pcidas_find_pci_device(dev, it);
- if (!devpriv->pci_dev) {
- dev_err(dev->class_dev, "No supported card found\n");
+ if (!devpriv->pci_dev)
return -EIO;
- }
-
thisboard = comedi_board(dev);
- dev_dbg(dev->class_dev, "Found %s on bus %i, slot %i\n",
- thisboard->name, devpriv->pci_dev->bus->number,
- PCI_SLOT(devpriv->pci_dev->devfn));

if (comedi_pci_enable(devpriv->pci_dev, "cb_pcidas")) {
dev_err(dev->class_dev,
--
1.7.11


\
 
 \ /
  Last update: 2012-06-27 03:41    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site