From: H Hartley Sweeten <hartleys@visionengravers.com>
To: Linux Kernel <linux-kernel@vger.kernel.org>
Cc: <devel@driverdev.osuosl.org>, <abbotti@mev.co.uk>,
<fmhess@users.sourceforge.net>, <gregkh@linuxfoundation.org>
Subject: [PATCH 22/36] staging: comedi: cb_pcidas: move the "find pci" dev_printk messages
Date: Tue, 26 Jun 2012 18:01:51 -0700 [thread overview]
Message-ID: <201206261801.51354.hartleys@visionengravers.com> (raw)
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
reply other threads:[~2012-06-27 1:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201206261801.51354.hartleys@visionengravers.com \
--to=hartleys@visionengravers.com \
--cc=abbotti@mev.co.uk \
--cc=devel@driverdev.osuosl.org \
--cc=fmhess@users.sourceforge.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®