Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b2809ef authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: amplc_pci224: remove "legacy" attach mechanism 



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: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c7929e71

drivers/staging/comedi/drivers/amplc_pci224.c

+6 −76
Original line number Diff line number Diff line
@@ -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 {
@@ -1092,49 +1084,6 @@ static const struct pci224_board 
	return NULL;

}



/*

 * 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.

 */
@@ -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,