redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: comedi: use comedi_alloc_devpriv()

Browse source 
Use the helper function to allocate memory and set the comedi_device
private data pointer.

This removes the dependency on slab.h from most of the drivers so
remove the global #include in comedidev.h and the local #include
in some of the drivers.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-06-24 16:55:44 -07:00 committed by Greg Kroah-Hartman
parent 54db996e6d
commit 0bdab509bf
97 changed files with 97 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/comedi/comedidev.h
View file

@ -22,7 +22,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kdev_t.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/spinlock.h>

3
drivers/staging/comedi/drivers/8255_pci.c
View file

@ -186,10 +186,9 @@ static int pci_8255_auto_attach(struct comedi_device *dev,
dev->board_ptr = board;
dev->board_name = board->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/addi-data/addi_common.c
View file

@ -85,10 +85,9 @@ static int addi_auto_attach(struct comedi_device *dev,
dev->board_name = this_board->pc_DriverName;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/addi_apci_1032.c
View file

@ -289,10 +289,9 @@ static int apci1032_auto_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/addi_apci_1516.c
View file

@ -136,10 +136,9 @@ static int apci1516_auto_attach(struct comedi_device *dev,
dev->board_ptr = this_board;
dev->board_name = this_board->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/addi_apci_1710.c
View file

@ -35,10 +35,9 @@ static int apci1710_auto_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/addi_apci_3120.c
View file

@ -65,10 +65,9 @@ static int apci3120_auto_attach(struct comedi_device *dev,
dev->board_ptr = this_board;
dev->board_name = this_board->pc_DriverName;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/addi_apci_3501.c
View file

@ -332,10 +332,9 @@ static int apci3501_auto_attach(struct comedi_device *dev,
int ao_n_chan;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/addi_apci_3xxx.c
View file

@ -801,10 +801,9 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
dev->board_ptr = board;
dev->board_name = board->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/adl_pci6208.c
View file

@ -172,10 +172,9 @@ static int pci6208_auto_attach(struct comedi_device *dev,
dev->board_ptr = boardinfo;
dev->board_name = boardinfo->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/adl_pci9111.c
View file

@ -855,10 +855,9 @@ static int pci9111_auto_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret;
dev_private = kzalloc(sizeof(*dev_private), GFP_KERNEL);
dev_private = comedi_alloc_devpriv(dev, sizeof(*dev_private));
if (!dev_private)
return -ENOMEM;
dev->private = dev_private;
ret = comedi_pci_enable(dev);
if (ret)

6
drivers/staging/comedi/drivers/adl_pci9118.c
View file

@ -2140,10 +2140,9 @@ static int pci9118_attach(struct comedi_device *dev,
softsshdelay = it->options[4];
hw_err_mask = it->options[5];
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
pcidev = pci9118_find_pci(dev, it);
if (!pcidev)
@ -2160,10 +2159,9 @@ static int pci9118_auto_attach(struct comedi_device *dev,
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
struct pci9118_private *devpriv;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
dev->board_ptr = pci9118_find_boardinfo(pcidev);
if (dev->board_ptr == NULL) {

3
drivers/staging/comedi/drivers/adq12b.c
View file

@ -214,10 +214,9 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
devpriv->unipolar = it->options[1];
devpriv->differential = it->options[2];

3
drivers/staging/comedi/drivers/adv_pci1710.c
View file

@ -1233,10 +1233,9 @@ static int pci1710_auto_attach(struct comedi_device *dev,
dev->board_ptr = this_board;
dev->board_name = this_board->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/adv_pci1723.c
View file

@ -237,10 +237,9 @@ static int pci1723_auto_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/adv_pci1724.c
View file

@ -340,10 +340,9 @@ static int adv_pci1724_auto_attach(struct comedi_device *dev,
int retval;
unsigned int board_id;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
/* init software copies of output values to indicate we don't know
* what the output value is since it has never been written. */

3
drivers/staging/comedi/drivers/adv_pci_dio.c
View file

@ -1107,10 +1107,9 @@ static int pci_dio_auto_attach(struct comedi_device *dev,
dev->board_ptr = this_board;
dev->board_name = this_board->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/aio_aio12_8.c
View file

@ -202,10 +202,9 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_alloc_subdevices(dev, 4);
if (ret)

5
drivers/staging/comedi/drivers/amplc_dio200.c
View file

@ -192,8 +192,6 @@
* order they appear in the channel list.
*/
#include <linux/slab.h>
#include "../comedidev.h"
#include "amplc_dio200.h"
@ -272,10 +270,9 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
irq = it->options[1];
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_request_region(dev, it->options[0], thisboard->mainsize);
if (ret)

1
drivers/staging/comedi/drivers/amplc_dio200_common.c
View file

@ -20,7 +20,6 @@
*/
#include <linux/interrupt.h>
#include <linux/slab.h>
#include "../comedidev.h"

4
drivers/staging/comedi/drivers/amplc_dio200_pci.c
View file

@ -222,7 +222,6 @@
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include "../comedidev.h"
@ -380,10 +379,9 @@ static int dio200_pci_auto_attach(struct comedi_device *dev,
dev_info(dev->class_dev, "%s: attach pci %s (%s)\n",
dev->driver->driver_name, pci_name(pci_dev), dev->board_name);
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

6
drivers/staging/comedi/drivers/amplc_pc236.c
View file

@ -467,10 +467,9 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct pc236_private *devpriv;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
/* Process options according to bus type. */
if (is_isa_board(thisboard)) {
@ -510,10 +509,9 @@ static int pc236_auto_attach(struct comedi_device *dev,
dev_info(dev->class_dev, PC236_DRIVER_NAME ": attach pci %s\n",
pci_name(pci_dev));
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
dev->board_ptr = pc236_find_pci_board(pci_dev);
if (dev->board_ptr == NULL) {

7
drivers/staging/comedi/drivers/amplc_pci224.c
View file

@ -100,7 +100,6 @@ Caveats:
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include "../comedidev.h"
@ -1419,10 +1418,9 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
dev_info(dev->class_dev, DRIVER_NAME ": attach\n");
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
pci_dev = pci224_find_pci_dev(dev, it);
if (!pci_dev)
@ -1440,10 +1438,9 @@ pci224_auto_attach(struct comedi_device *dev, unsigned long context_unused)
dev_info(dev->class_dev, DRIVER_NAME ": attach pci %s\n",
pci_name(pci_dev));
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
dev->board_ptr = pci224_find_pci_board(pci_dev);
if (dev->board_ptr == NULL) {

3
drivers/staging/comedi/drivers/amplc_pci230.c
View file

@ -2615,10 +2615,9 @@ static int pci230_alloc_private(struct comedi_device *dev)
{
struct pci230_private *devpriv;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
spin_lock_init(&devpriv->isr_spinlock);
spin_lock_init(&devpriv->res_spinlock);

4
drivers/staging/comedi/drivers/cb_das16_cs.c
View file

@ -35,7 +35,6 @@ Status: experimental
*/
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include "../comedidev.h"
@ -420,10 +419,9 @@ static int das16cs_auto_attach(struct comedi_device *dev,
return ret;
dev->irq = link->irq;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_alloc_subdevices(dev, 3);
if (ret)

3
drivers/staging/comedi/drivers/cb_pcidas.c
View file

@ -1444,10 +1444,9 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev,
dev->board_ptr = thisboard;
dev->board_name = thisboard->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/cb_pcidas64.c
View file

@ -4034,10 +4034,9 @@ static int auto_attach(struct comedi_device *dev,
return -ENODEV;
dev->board_ptr = thisboard;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
retval = comedi_pci_enable(dev);
if (retval)

3
drivers/staging/comedi/drivers/cb_pcidda.c
View file

@ -348,10 +348,9 @@ static int cb_pcidda_auto_attach(struct comedi_device *dev,
dev->board_ptr = thisboard;
dev->board_name = thisboard->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/cb_pcimdas.c
View file

@ -210,10 +210,9 @@ static int cb_pcimdas_auto_attach(struct comedi_device *dev,
unsigned long iobase_8255;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/cb_pcimdda.c
View file

@ -156,10 +156,9 @@ static int cb_pcimdda_auto_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/comedi_bond.c
View file

@ -298,10 +298,9 @@ static int bonding_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
/*
* Setup our bonding from config params.. sets up our private struct..

3
drivers/staging/comedi/drivers/comedi_parport.c
View file

@ -279,10 +279,9 @@ static int parport_attach(struct comedi_device *dev,
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
s = &dev->subdevices[0];
s->type = COMEDI_SUBD_DIO;

3
drivers/staging/comedi/drivers/comedi_test.c
View file

@ -379,10 +379,9 @@ static int waveform_attach(struct comedi_device *dev,
int i;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
/* set default amplitude and period */
if (amplitude <= 0)

3
drivers/staging/comedi/drivers/daqboard2000.c
View file

@ -683,10 +683,9 @@ static int daqboard2000_auto_attach(struct comedi_device *dev,
dev->board_ptr = board;
dev->board_name = board->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
result = comedi_pci_enable(dev);
if (result)

4
drivers/staging/comedi/drivers/das08_cs.c
View file

@ -40,7 +40,6 @@ Command support does not exist, but could be added for this board.
*/
#include <linux/delay.h>
#include <linux/slab.h>
#include "../comedidev.h"
@ -78,10 +77,9 @@ static int das08_cs_auto_attach(struct comedi_device *dev,
return ret;
iobase = link->resource[0]->start;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
return das08_common_attach(dev, iobase);
}

3
drivers/staging/comedi/drivers/das08_isa.c
View file

@ -177,10 +177,9 @@ static int das08_isa_attach(struct comedi_device *dev,
struct das08_private_struct *devpriv;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_request_region(dev, it->options[0], thisboard->iosize);
if (ret)

3
drivers/staging/comedi/drivers/das08_pci.c
View file

@ -59,10 +59,9 @@ static int das08_pci_auto_attach(struct comedi_device *dev,
struct das08_private_struct *devpriv;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
/* The das08 driver needs the board_ptr */
dev->board_ptr = &das08_pci_boards[0];

4
drivers/staging/comedi/drivers/das16.c
View file

@ -74,7 +74,6 @@ www.measurementcomputing.com
*/
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <asm/dma.h>
@ -1102,10 +1101,9 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}
}
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
if (board->size < 0x400) {
ret = comedi_request_region(dev, it->options[0], board->size);

3
drivers/staging/comedi/drivers/das16m1.c
View file

@ -567,10 +567,9 @@ static int das16m1_attach(struct comedi_device *dev,
int ret;
unsigned int irq;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_request_region(dev, it->options[0], DAS16M1_SIZE);
if (ret)

3
drivers/staging/comedi/drivers/das1800.c
View file

@ -1511,10 +1511,9 @@ static int das1800_attach(struct comedi_device *dev,
int board;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_request_region(dev, it->options[0], DAS1800_SIZE);
if (ret)

3
drivers/staging/comedi/drivers/das6402.c
View file

@ -294,10 +294,9 @@ static int das6402_attach(struct comedi_device *dev,
dev->irq = irq;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_alloc_subdevices(dev, 1);
if (ret)

3
drivers/staging/comedi/drivers/das800.c
View file

@ -700,10 +700,9 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int board;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_request_region(dev, it->options[0], DAS800_SIZE);
if (ret)

3
drivers/staging/comedi/drivers/dmm32at.c
View file

@ -753,10 +753,9 @@ static int dmm32at_attach(struct comedi_device *dev,
dev->irq = irq;
}
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_alloc_subdevices(dev, 3);
if (ret)

3
drivers/staging/comedi/drivers/dt2801.c
View file

@ -627,10 +627,9 @@ havetype:
if (ret)
goto out;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
dev->board_name = board->name;

3
drivers/staging/comedi/drivers/dt2811.c
View file

@ -450,10 +450,9 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
switch (it->options[2]) {
case 0:

3
drivers/staging/comedi/drivers/dt2814.c
View file

@ -298,10 +298,9 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
s = &dev->subdevices[0];
dev->read_subdev = s;

3
drivers/staging/comedi/drivers/dt2815.c
View file

@ -165,10 +165,9 @@ static int dt2815_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
s = &dev->subdevices[0];
/* ao subdevice */

3
drivers/staging/comedi/drivers/dt282x.c
View file

@ -1188,10 +1188,9 @@ static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it)
#endif
}
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = dt282x_grab_dma(dev, it->options[opt_dma1],
it->options[opt_dma2]);

3
drivers/staging/comedi/drivers/dt3000.c
View file

@ -722,10 +722,9 @@ static int dt3000_auto_attach(struct comedi_device *dev,
dev->board_ptr = this_board;
dev->board_name = this_board->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret < 0)

4
drivers/staging/comedi/drivers/dt9812.c
View file

@ -41,7 +41,6 @@ for my needs.
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/uaccess.h>
#include <linux/usb.h>
@ -781,10 +780,9 @@ static int dt9812_auto_attach(struct comedi_device *dev,
bool is_unipolar;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
sema_init(&devpriv->sem, 1);
usb_set_intfdata(intf, devpriv);

3
drivers/staging/comedi/drivers/dyna_pci10xx.c
View file

@ -183,10 +183,9 @@ static int dyna_pci10xx_auto_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/fl512.c
View file

@ -118,10 +118,9 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_alloc_subdevices(dev, 2);
if (ret)

3
drivers/staging/comedi/drivers/gsc_hpdi.c
View file

@ -483,10 +483,9 @@ static int hpdi_auto_attach(struct comedi_device *dev,
dev->board_ptr = thisboard;
dev->board_name = thisboard->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
retval = comedi_pci_enable(dev);
if (retval)

3
drivers/staging/comedi/drivers/icp_multi.c
View file

@ -495,10 +495,9 @@ static int icp_multi_auto_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/ii_pci20kc.c
View file

@ -203,10 +203,9 @@ static int pci20xxx_attach(struct comedi_device *dev,
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
devpriv->ioaddr = (void __iomem *)(unsigned long)it->options[0];

3
drivers/staging/comedi/drivers/jr3_pci.c
View file

@ -638,10 +638,9 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
return -EINVAL;
}
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
init_timer(&devpriv->timer);
switch (pcidev->device) {

3
drivers/staging/comedi/drivers/me4000.c
View file

@ -1544,10 +1544,9 @@ static int me4000_auto_attach(struct comedi_device *dev,
dev->board_ptr = thisboard;
dev->board_name = thisboard->name;
info = kzalloc(sizeof(*info), GFP_KERNEL);
info = comedi_alloc_devpriv(dev, sizeof(*info));
if (!info)
return -ENOMEM;
dev->private = info;
result = comedi_pci_enable(dev);
if (result)

3
drivers/staging/comedi/drivers/me_daq.c
View file

@ -490,10 +490,9 @@ static int me_auto_attach(struct comedi_device *dev,
dev->board_ptr = board;
dev->board_name = board->name;
dev_private = kzalloc(sizeof(*dev_private), GFP_KERNEL);
dev_private = comedi_alloc_devpriv(dev, sizeof(*dev_private));
if (!dev_private)
return -ENOMEM;
dev->private = dev_private;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/mpc624.c
View file

@ -286,10 +286,9 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
switch (it->options[1]) {
case 0:

3
drivers/staging/comedi/drivers/multiq3.c
View file

@ -232,10 +232,9 @@ static int multiq3_attach(struct comedi_device *dev,
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
s = &dev->subdevices[0];
/* ai subdevice */

3
drivers/staging/comedi/drivers/ni_6527.c
View file

@ -335,10 +335,9 @@ static int ni6527_auto_attach(struct comedi_device *dev,
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
devpriv->mite = mite_alloc(pcidev);
if (!devpriv->mite)

4
drivers/staging/comedi/drivers/ni_65xx.c
View file

@ -48,7 +48,6 @@ except maybe the 6514.
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include "../comedidev.h"
@ -591,10 +590,9 @@ static int ni_65xx_auto_attach(struct comedi_device *dev,
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
devpriv->mite = mite_alloc(pcidev);
if (!devpriv->mite)

3
drivers/staging/comedi/drivers/ni_660x.c
View file

@ -929,10 +929,9 @@ static int ni_660x_allocate_private(struct comedi_device *dev)
struct ni_660x_private *devpriv;
unsigned i;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
spin_lock_init(&devpriv->mite_channel_lock);
spin_lock_init(&devpriv->interrupt_lock);

4
drivers/staging/comedi/drivers/ni_670x.c
View file

@ -38,7 +38,6 @@ Commands are not supported.
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include "../comedidev.h"
@ -205,10 +204,9 @@ static int ni_670x_auto_attach(struct comedi_device *dev,
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
devpriv->mite = mite_alloc(pcidev);
if (!devpriv->mite)

3
drivers/staging/comedi/drivers/ni_at_a2150.c
View file

@ -719,10 +719,9 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int i;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_request_region(dev, it->options[0], A2150_SIZE);
if (ret)

3
drivers/staging/comedi/drivers/ni_at_ao.c
View file

@ -341,10 +341,9 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_alloc_subdevices(dev, 4);
if (ret)

3
drivers/staging/comedi/drivers/ni_atmio16d.c
View file

@ -645,10 +645,9 @@ static int atmio16d_attach(struct comedi_device *dev,
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
/* reset the atmio16d hardware */
reset_atmio16d(dev);

1
drivers/staging/comedi/drivers/ni_daq_700.c
View file

@ -47,7 +47,6 @@ Manuals: Register level: http://www.ni.com/pdf/manuals/340698.pdf
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include "../comedidev.h"

3
drivers/staging/comedi/drivers/ni_labpc.c
View file

@ -1697,10 +1697,9 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned int dma_chan = it->options[2];
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_request_region(dev, it->options[0], LABPC_SIZE);
if (ret)

4
drivers/staging/comedi/drivers/ni_labpc_cs.c
View file

@ -56,7 +56,6 @@ NI manuals:
#include "../comedidev.h"
#include <linux/delay.h>
#include <linux/slab.h>
#include "8253.h"
#include "8255.h"
@ -96,10 +95,9 @@ static int labpc_auto_attach(struct comedi_device *dev,
if (!link->irq)
return -EINVAL;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
return labpc_common_attach(dev, link->irq, IRQF_SHARED);
}

4
drivers/staging/comedi/drivers/ni_labpc_pci.c
View file

@ -30,7 +30,6 @@
*/
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/pci.h>
#include "../comedidev.h"
@ -72,10 +71,9 @@ static int labpc_pci_auto_attach(struct comedi_device *dev,
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
devpriv->mite = mite_alloc(pcidev);
if (!devpriv->mite)

3
drivers/staging/comedi/drivers/ni_mio_common.c
View file

@ -4363,10 +4363,9 @@ static int ni_alloc_private(struct comedi_device *dev)
{
struct ni_private *devpriv;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
spin_lock_init(&devpriv->window_lock);
spin_lock_init(&devpriv->soft_reg_copy_lock);

3
drivers/staging/comedi/drivers/ni_pcidio.c
View file

@ -1108,10 +1108,9 @@ static int nidio_auto_attach(struct comedi_device *dev,
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
spin_lock_init(&devpriv->mite_channel_lock);

2
drivers/staging/comedi/drivers/ni_tio.c
View file

@ -44,6 +44,8 @@ TODO:
Support use of both banks X and Y
*/
#include <linux/slab.h>
#include "ni_tio_internal.h"
static uint64_t ni_tio_clock_period_ps(const struct ni_gpct *counter,

3
drivers/staging/comedi/drivers/pcl711.c
View file

@ -474,10 +474,9 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
s = &dev->subdevices[0];
/* AI subdevice */

3
drivers/staging/comedi/drivers/pcl726.c
View file

@ -229,10 +229,9 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
for (i = 0; i < 12; i++) {
devpriv->bipolar[i] = 0;

3
drivers/staging/comedi/drivers/pcl812.c
View file

@ -1110,10 +1110,9 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
irq = 0;
if (board->IRQbits != 0) { /* board support IRQ */

3
drivers/staging/comedi/drivers/pcl816.c
View file

@ -922,10 +922,9 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -EIO;
}
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
/* grab our IRQ */
irq = 0;

3
drivers/staging/comedi/drivers/pcl818.c
View file

@ -1227,10 +1227,9 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long pages;
struct comedi_subdevice *s;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
devpriv->io_range = board->io_range;
if ((board->fifo) && (it->options[2] == -1)) {

3
drivers/staging/comedi/drivers/pcm3724.c
View file

@ -228,10 +228,9 @@ static int pcm3724_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret, i;
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
priv = comedi_alloc_devpriv(dev, sizeof(*priv));
if (!priv)
return -ENOMEM;
dev->private = priv;
ret = comedi_request_region(dev, it->options[0], PCM3724_SIZE);
if (ret)

3
drivers/staging/comedi/drivers/pcmda12.c
View file

@ -138,10 +138,9 @@ static int pcmda12_attach(struct comedi_device *dev,
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
devpriv->simultaneous_xfer_mode = it->options[1];

3
drivers/staging/comedi/drivers/pcmmio.c
View file

@ -1039,10 +1039,9 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
for (asic = 0; asic < MAX_ASICS; ++asic) {
devpriv->asics[asic].num = asic;

3
drivers/staging/comedi/drivers/pcmuio.c
View file

@ -609,10 +609,9 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
for (asic = 0; asic < PCMUIO_MAX_ASICS; ++asic)
spin_lock_init(&devpriv->asics[asic].spinlock);

3
drivers/staging/comedi/drivers/poc.c
View file

@ -109,10 +109,9 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
/* analog output subdevice */
s = &dev->subdevices[0];

3
drivers/staging/comedi/drivers/quatech_daqp_cs.c
View file

@ -715,10 +715,9 @@ static int daqp_auto_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
link->config_flags |= CONF_AUTO_SET_IO | CONF_ENABLE_IRQ;
ret = comedi_pcmcia_enable(dev, NULL);

3
drivers/staging/comedi/drivers/rtd520.c
View file

@ -1338,10 +1338,9 @@ static int rtd_auto_attach(struct comedi_device *dev,
dev->board_ptr = board;
dev->board_name = board->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

3
drivers/staging/comedi/drivers/rti800.c
View file

@ -298,10 +298,9 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
inb(dev->iobase + RTI800_ADCHI);
outb(0, dev->iobase + RTI800_CLRFLAGS);
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
devpriv->adc_2comp = (it->options[4] == 0);
devpriv->dac_2comp[0] = (it->options[6] == 0);

3
drivers/staging/comedi/drivers/rti802.c
View file

@ -93,10 +93,9 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_alloc_subdevices(dev, 1);
if (ret)

3
drivers/staging/comedi/drivers/s526.c
View file

@ -553,10 +553,9 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_alloc_subdevices(dev, 4);
if (ret)

3
drivers/staging/comedi/drivers/s626.c
View file

@ -2585,10 +2585,9 @@ static int s626_auto_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
ret = comedi_pci_enable(dev);
if (ret)

2
drivers/staging/comedi/drivers/s626.h
View file

@ -65,8 +65,6 @@
#define FALSE (0)
#endif
#include <linux/slab.h>
#define S626_SIZE 0x0200
#define DMABUF_SIZE 4096 /* 4k pages */

3
drivers/staging/comedi/drivers/serial2002.c
View file

@ -719,10 +719,9 @@ static int serial2002_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
devpriv->port = it->options[0];
devpriv->speed = it->options[1];

6
drivers/staging/comedi/drivers/skel.c
View file

@ -484,10 +484,9 @@ static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* dev->board_name = thisboard->name; */
/* Allocate the private data */
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
/*
* Supported boards are usually either auto-attached via the
@ -558,10 +557,9 @@ static int skel_auto_attach(struct comedi_device *dev,
dev->board_name = thisboard->name;
/* Allocate the private data */
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
/* Enable the PCI device. */
ret = comedi_pci_enable(dev);

1
drivers/staging/comedi/drivers/unioxx5.c
View file

@ -42,7 +42,6 @@ Devices: [Fastwel] UNIOxx-5 (unioxx5),
#include "../comedidev.h"
#include <linux/ioport.h>
#include <linux/slab.h>
#define DRIVER_NAME "unioxx5"
#define UNIOXX5_SIZE 0x10

3
drivers/staging/comedi/drivers/usbduxfast.c
View file

@ -1061,10 +1061,9 @@ static int usbduxfast_auto_attach(struct comedi_device *dev,
return -ENODEV;
}
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
sema_init(&devpriv->sem, 1);
usb_set_intfdata(intf, devpriv);

3
drivers/staging/comedi/drivers/usbduxsigma.c
View file

@ -1677,10 +1677,9 @@ static int usbduxsigma_auto_attach(struct comedi_device *dev,
struct usbduxsigma_private *devpriv;
int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
sema_init(&devpriv->sem, 1);
usb_set_intfdata(intf, devpriv);

3
drivers/staging/comedi/drivers/vmk80xx.c
View file

@ -875,10 +875,9 @@ static int vmk80xx_auto_attach(struct comedi_device *dev,
dev->board_ptr = boardinfo;
dev->board_name = boardinfo->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
devpriv->model = boardinfo->model;