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

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

staging: comedi: use comedi_alloc_devpriv() 



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: 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 54db996e

drivers/staging/comedi/comedidev.h

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/staging/comedi/drivers/8255_pci.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/staging/comedi/drivers/addi-data/addi_common.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/staging/comedi/drivers/addi_apci_1032.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/staging/comedi/drivers/addi_apci_1516.c

+1 −2
Original line number Diff line number Diff line
@@ -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)