Commit 83d682bd authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_labpc_common: move comedi_alloc_devpriv() to common code 



The ni_labpc_common module is used by the ni_labpc, ni_labpc_pci, and ni_labpc_cs
drivers to provide the common code support. Those drivers currently all call
comedi_alloc_devpriv() to allocate the private data before calling the common
attach function.

For aesthetics, move the private data allocation into the common code.

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

drivers/staging/comedi/drivers/ni_labpc.c

+0 −5
Original line number Diff line number Diff line
@@ -84,15 +84,10 @@ static const struct labpc_boardinfo labpc_boards[] = { 


static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)

{

	struct labpc_private *devpriv;

	unsigned int irq = it->options[1];

	unsigned int dma_chan = it->options[2];

	int ret;



	devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));

	if (!devpriv)

		return -ENOMEM;



	ret = comedi_request_region(dev, it->options[0], 0x20);

	if (ret)

		return ret;

drivers/staging/comedi/drivers/ni_labpc_common.c

+5 −1
Original line number Diff line number Diff line
@@ -1215,11 +1215,15 @@ int labpc_common_attach(struct comedi_device *dev, 
			unsigned int irq, unsigned long isr_flags)

{

	const struct labpc_boardinfo *board = dev->board_ptr;

	struct labpc_private *devpriv = dev->private;

	struct labpc_private *devpriv;

	struct comedi_subdevice *s;

	int ret;

	int i;



	devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));

	if (!devpriv)

		return -ENOMEM;



	if (dev->mmio) {

		devpriv->read_byte = labpc_readb;

		devpriv->write_byte = labpc_writeb;

drivers/staging/comedi/drivers/ni_labpc_cs.c

+0 −5
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ static int labpc_auto_attach(struct comedi_device *dev, 
			     unsigned long context)

{

	struct pcmcia_device *link = comedi_to_pcmcia_dev(dev);

	struct labpc_private *devpriv;

	int ret;



	/* The ni_labpc driver needs the board_ptr */
@@ -96,10 +95,6 @@ static int labpc_auto_attach(struct comedi_device *dev, 
	if (!link->irq)

		return -EINVAL;



	devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));

	if (!devpriv)

		return -ENOMEM;



	return labpc_common_attach(dev, link->irq, IRQF_SHARED);

}

drivers/staging/comedi/drivers/ni_labpc_pci.c

+0 −5
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ static int labpc_pci_auto_attach(struct comedi_device *dev, 
{

	struct pci_dev *pcidev = comedi_to_pci_dev(dev);

	const struct labpc_boardinfo *board = NULL;

	struct labpc_private *devpriv;

	int ret;



	if (context < ARRAY_SIZE(labpc_pci_boards))
@@ -101,10 +100,6 @@ static int labpc_pci_auto_attach(struct comedi_device *dev, 
	if (!dev->mmio)

		return -ENOMEM;



	devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));

	if (!devpriv)

		return -ENOMEM;



	return labpc_common_attach(dev, pcidev->irq, IRQF_SHARED);

}