From: Ian Abbott <abbotti@mev.co.uk>
To: driverdev-devel@linuxdriverproject.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Ian Abbott <abbotti@mev.co.uk>,
H Hartley Sweeten <hartleys@visionengravers.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 17/18] staging: comedi: amplc_pci224: absorb pci224_attach_common()
Date: Thu, 31 Jul 2014 14:47:54 +0100 [thread overview]
Message-ID: <1406814475-5923-18-git-send-email-abbotti@mev.co.uk> (raw)
In-Reply-To: <1406814475-5923-1-git-send-email-abbotti@mev.co.uk>
`pci224_attach_common()` is now only called from `pci225_auto_attach()`,
so absorb it into that function.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/amplc_pci224.c | 56 +++++++++++----------------
1 file changed, 22 insertions(+), 34 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index 4fceb7c..4b45319 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -1057,18 +1057,33 @@ static irqreturn_t pci224_interrupt(int irq, void *d)
return IRQ_RETVAL(retval);
}
-/*
- * Common part of attach and auto_attach.
- */
-static int pci224_attach_common(struct comedi_device *dev,
- struct pci_dev *pci_dev)
+static int
+pci224_auto_attach(struct comedi_device *dev, unsigned long context_model)
{
- const struct pci224_board *thisboard = comedi_board(dev);
- struct pci224_private *devpriv = dev->private;
+ struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
+ const struct pci224_board *thisboard = NULL;
+ struct pci224_private *devpriv;
struct comedi_subdevice *s;
unsigned int irq;
int ret;
+ if (context_model < ARRAY_SIZE(pci224_boards))
+ thisboard = &pci224_boards[context_model];
+ if (!thisboard || !thisboard->name) {
+ dev_err(dev->class_dev,
+ "amplc_pci224: BUG! cannot determine board type!\n");
+ return -EINVAL;
+ }
+ dev->board_ptr = thisboard;
+ dev->board_name = thisboard->name;
+
+ dev_info(dev->class_dev, "amplc_pci224: attach pci %s - %s\n",
+ pci_name(pci_dev), dev->board_name);
+
+ devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
+ if (!devpriv)
+ return -ENOMEM;
+
comedi_set_hw_dev(dev, &pci_dev->dev);
ret = comedi_pci_enable(dev);
@@ -1149,33 +1164,6 @@ static int pci224_attach_common(struct comedi_device *dev,
return 0;
}
-static int
-pci224_auto_attach(struct comedi_device *dev, unsigned long context_model)
-{
- struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
- const struct pci224_board *thisboard = NULL;
- struct pci224_private *devpriv;
-
- if (context_model < ARRAY_SIZE(pci224_boards))
- thisboard = &pci224_boards[context_model];
- if (!thisboard || !thisboard->name) {
- dev_err(dev->class_dev,
- "amplc_pci224: BUG! cannot determine board type!\n");
- return -EINVAL;
- }
- dev->board_ptr = thisboard;
- dev->board_name = thisboard->name;
-
- dev_info(dev->class_dev, "amplc_pci224: attach pci %s - %s\n",
- pci_name(pci_dev), dev->board_name);
-
- devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
- if (!devpriv)
- return -ENOMEM;
-
- return pci224_attach_common(dev, pci_dev);
-}
-
static void pci224_detach(struct comedi_device *dev)
{
struct pci224_private *devpriv = dev->private;
--
2.0.0
next prev parent reply other threads:[~2014-07-31 13:48 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-31 13:47 [PATCH 00/18] staging: comedi: amplc_pci224: remove legacy stuff Ian Abbott
2014-07-31 13:47 ` [PATCH 01/18] staging: comedi: amplc_pci224: reformat some comments Ian Abbott
2014-07-31 13:47 ` [PATCH 02/18] staging: comedi: amplc_pci224: fix checkpatch line over 80 characters Ian Abbott
2014-07-31 13:47 ` [PATCH 03/18] staging: comedi: amplc_pci224: blank lines aren't necessary before a close brace '}' Ian Abbott
2014-07-31 13:47 ` [PATCH 04/18] staging: comedi: amplc_pci224: multiple assignments should be avoided Ian Abbott
2014-07-31 13:47 ` [PATCH 05/18] staging: comedi: amplc_pci224: fix spinlock_t definition without comment Ian Abbott
2014-07-31 13:47 ` [PATCH 06/18] staging: comedi: amplc_pci224: add whitespace to pci224_boards[] Ian Abbott
2014-07-31 13:47 ` [PATCH 07/18] staging: comedi: amplc_pci224: set a more descriptive MODULE_DESCRIPTION() Ian Abbott
2014-07-31 13:47 ` [PATCH 08/18] staging: comedi: amplc_pci224: omit '!= 0' from logical expressions Ian Abbott
2014-07-31 13:47 ` [PATCH 09/18] staging: comedi: amplc_pci224: remove some unnecessary parentheses Ian Abbott
2014-07-31 13:47 ` [PATCH 10/18] staging: comedi: amplc_pci224: reduce leading whitespace in a few places Ian Abbott
2014-07-31 13:47 ` [PATCH 11/18] staging: comedi: amplc_pci224: no need for '&function' Ian Abbott
2014-07-31 13:47 ` [PATCH 12/18] staging: comedi: amplc_pci224: remove options to select output ranges Ian Abbott
2014-07-31 13:47 ` [PATCH 13/18] staging: comedi: amplc_pci224: remove "legacy" attach mechanism Ian Abbott
2014-07-31 13:47 ` [PATCH 14/18] staging: comedi: amplc_pci224: no need to manipulate PCI ref count Ian Abbott
2014-07-31 13:47 ` [PATCH 15/18] staging: comedi: amplc_pci224: put board indices in PCI driver_data Ian Abbott
2014-07-31 13:47 ` [PATCH 16/18] staging: comedi: amplc_pci224: remove PCI_DEVICE_ID_... macros Ian Abbott
2014-07-31 13:47 ` Ian Abbott [this message]
2014-07-31 13:47 ` [PATCH 18/18] staging: comedi: amplc_pci224: no need to comedi_set_hw_dev() here Ian Abbott
2014-07-31 20:28 ` [PATCH 00/18] staging: comedi: amplc_pci224: remove legacy stuff Hartley Sweeten
2014-07-31 20:44 ` Hartley Sweeten
2014-08-04 10:57 ` Ian Abbott
2014-08-04 11:14 ` [PATCH 15/18 v2] staging: comedi: amplc_pci224: put board indices in PCI driver_data Ian Abbott
2014-08-04 16:38 ` Hartley Sweeten
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=1406814475-5923-18-git-send-email-abbotti@mev.co.uk \
--to=abbotti@mev.co.uk \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=hartleys@visionengravers.com \
--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®