Skip to content

Commit

Permalink
staging: comedi: use comedi_alloc_devpriv()
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 23, 2013
1 parent 54db996 commit 0bdab50
Showing 97 changed files with 97 additions and 208 deletions.
1 change: 0 additions & 1 deletion drivers/staging/comedi/comedidev.h
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/8255_pci.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/addi-data/addi_common.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/addi_apci_1032.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/addi_apci_1516.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/addi_apci_1710.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/addi_apci_3120.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/addi_apci_3501.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/addi_apci_3xxx.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/adl_pci6208.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/adl_pci9111.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 4 deletions drivers/staging/comedi/drivers/adl_pci9118.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/adq12b.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/adv_pci1710.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/adv_pci1723.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/adv_pci1724.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/adv_pci_dio.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/aio_aio12_8.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 4 deletions drivers/staging/comedi/drivers/amplc_dio200.c
View file
Original file line number Diff line number Diff line change
@@ -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 change: 0 additions & 1 deletion drivers/staging/comedi/drivers/amplc_dio200_common.c
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@
*/

#include <linux/interrupt.h>
#include <linux/slab.h>

#include "../comedidev.h"

4 changes: 1 addition & 3 deletions drivers/staging/comedi/drivers/amplc_dio200_pci.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 4 deletions drivers/staging/comedi/drivers/amplc_pc236.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 5 deletions drivers/staging/comedi/drivers/amplc_pci224.c
View file
Original file line number Diff line number Diff line change
@@ -100,7 +100,6 @@ Passing a zero for an option is the same as leaving it unspecified.

#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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/amplc_pci230.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 3 deletions drivers/staging/comedi/drivers/cb_das16_cs.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/cb_pcidas.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/cb_pcidas64.c
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/cb_pcidda.c
View file
Original file line number Diff line number Diff line change
@@ -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)
Loading

0 comments on commit 0bdab50

Please sign in to comment.