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 13/18] staging: comedi: amplc_pci224: remove "legacy" attach mechanism
Date: Thu, 31 Jul 2014 14:47:50 +0100 [thread overview]
Message-ID: <1406814475-5923-14-git-send-email-abbotti@mev.co.uk> (raw)
In-Reply-To: <1406814475-5923-1-git-send-email-abbotti@mev.co.uk>
Since the driver no longer supports options in its "legacy" attach
mechanism to describe the jumper settings (or any options beyond
restricting a PCI search to a particular bus and/or slot), there is no
need to retain this mechanism in the driver. Remove the comedi driver
"attach" handler `pci224_attach()`, and the now unused
`pci224_find_pci_dev()`. Also, remove the "wildcard" entry from the
board table `pci224_boards[]` as it is no longer needed.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/amplc_pci224.c | 82 ++-------------------------
1 file changed, 6 insertions(+), 76 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index fba0198..0bf5e68 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -22,9 +22,8 @@
* Driver: amplc_pci224
* Description: Amplicon PCI224, PCI234
* Author: Ian Abbott <abbotti@mev.co.uk>
- * Devices: [Amplicon] PCI224 (amplc_pci224 or pci224),
- * PCI234 (amplc_pci224 or pci234)
- * Updated: Wed, 30 Jul 2014 18:08:43 +0000
+ * Devices: [Amplicon] PCI224 (amplc_pci224), PCI234
+ * Updated: Thu, 31 Jul 2014 11:08:03 +0000
* Status: works, but see caveats
*
* Supports:
@@ -46,12 +45,10 @@
* scan_begin_src or stop_src may use TRIG_EXT.
*
* Configuration options:
- * [0] - PCI bus of device (optional).
- * [1] - PCI slot of device (optional).
- * If bus/slot is not specified, the first available PCI device
- * will be used.
+ * none
*
- * Passing a zero for an option is the same as leaving it unspecified.
+ * Manual configuration of PCI cards is not supported; they are configured
+ * automatically.
*
* Output range selection - PCI224:
*
@@ -350,7 +347,7 @@ static const unsigned char range_check_pci234[4] = {
* Board descriptions.
*/
-enum pci224_model { any_model, pci224_model, pci234_model };
+enum pci224_model { pci224_model, pci234_model };
struct pci224_board {
const char *name;
@@ -384,11 +381,6 @@ static const struct pci224_board pci224_boards[] = {
.ao_hwrange = &hwrange_pci234[0],
.ao_range_check = &range_check_pci234[0],
},
- {
- .name = "amplc_pci224",
- .devid = PCI_DEVICE_ID_INVALID,
- .model = any_model, /* wildcard */
- },
};
struct pci224_private {
@@ -1093,49 +1085,6 @@ static const struct pci224_board
}
/*
- * This function looks for a PCI device matching the requested board name,
- * bus and slot.
- */
-static struct pci_dev *pci224_find_pci_dev(struct comedi_device *dev,
- struct comedi_devconfig *it)
-{
- const struct pci224_board *thisboard = comedi_board(dev);
- struct pci_dev *pci_dev = NULL;
- int bus = it->options[0];
- int slot = it->options[1];
-
- for_each_pci_dev(pci_dev) {
- if (bus || slot) {
- if (bus != pci_dev->bus->number ||
- slot != PCI_SLOT(pci_dev->devfn))
- continue;
- }
- if (pci_dev->vendor != PCI_VENDOR_ID_AMPLICON)
- continue;
-
- if (thisboard->model == any_model) {
- /* Match any supported model. */
- const struct pci224_board *board_ptr;
-
- board_ptr = pci224_find_pci_board(pci_dev);
- if (board_ptr == NULL)
- continue;
- /* Change board_ptr to matched board. */
- dev->board_ptr = board_ptr;
- } else {
- /* Match specific model name. */
- if (thisboard->devid != pci_dev->device)
- continue;
- }
- return pci_dev;
- }
- dev_err(dev->class_dev,
- "No supported board found! (req. bus %d, slot %d)\n",
- bus, slot);
- return NULL;
-}
-
-/*
* Common part of attach and auto_attach.
*/
static int pci224_attach_common(struct comedi_device *dev,
@@ -1229,24 +1178,6 @@ static int pci224_attach_common(struct comedi_device *dev,
return 0;
}
-static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
-{
- struct pci224_private *devpriv;
- struct pci_dev *pci_dev;
-
- dev_info(dev->class_dev, "attach\n");
-
- devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
- if (!devpriv)
- return -ENOMEM;
-
- pci_dev = pci224_find_pci_dev(dev, it);
- if (!pci_dev)
- return -EIO;
-
- return pci224_attach_common(dev, pci_dev);
-}
-
static int
pci224_auto_attach(struct comedi_device *dev, unsigned long context_unused)
{
@@ -1295,7 +1226,6 @@ static void pci224_detach(struct comedi_device *dev)
static struct comedi_driver amplc_pci224_driver = {
.driver_name = "amplc_pci224",
.module = THIS_MODULE,
- .attach = pci224_attach,
.detach = pci224_detach,
.auto_attach = pci224_auto_attach,
.board_name = &pci224_boards[0].name,
--
2.0.0
next prev parent reply other threads:[~2014-07-31 13:49 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 ` Ian Abbott [this message]
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 ` [PATCH 17/18] staging: comedi: amplc_pci224: absorb pci224_attach_common() Ian Abbott
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-14-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®