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

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

staging: comedi: amplc_pci224: absorb pci224_attach_common() 



`pci224_attach_common()` is now only called from `pci225_auto_attach()`,
so absorb it into that function.

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 dce75412

drivers/staging/comedi/drivers/amplc_pci224.c

+22 −34
Original line number Diff line number Diff line
@@ -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;