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

staging: comedi: remove inline alloc_private() 



This inline function has a very generic name and it's only a
wrapper around a simple kzalloc(). Since the inline function
does not save any lines-of-code, instead of renaming it just
remove it and do the kzalloc() directly.

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

drivers/staging/comedi/comedidev.h

+0 −8
Original line number Diff line number Diff line
@@ -415,14 +415,6 @@ struct comedi_lrange { 


/* some silly little inline functions */



static inline int alloc_private(struct comedi_device *dev, int size)

{

	dev->private = kzalloc(size, GFP_KERNEL);

	if (!dev->private)

		return -ENOMEM;

	return 0;

}



static inline unsigned int bytes_per_sample(const struct comedi_subdevice *subd)

{

	if (subd->subdev_flags & SDF_LSAMPL)

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

+4 −4
Original line number Diff line number Diff line
@@ -235,10 +235,10 @@ static int pci_8255_attach_pci(struct comedi_device *dev, 
	dev->board_ptr = board;

	dev->board_name = board->name;



	ret = alloc_private(dev, sizeof(*devpriv));

	if (ret)

		return ret;

	devpriv = dev->private;

	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);

	if (!devpriv)

		return -ENOMEM;

	dev->private = devpriv;



	ret = comedi_pci_enable(pcidev, dev->board_name);

	if (ret)

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

+4 −4
Original line number Diff line number Diff line
@@ -1482,10 +1482,10 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	unsigned char pci_bus, pci_slot, pci_func;

	int i_Dma = 0;



	ret = alloc_private(dev, sizeof(*devpriv));

	if (ret)

		return ret;

	devpriv = dev->private;

	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);

	if (!devpriv)

		return -ENOMEM;

	dev->private = devpriv;



	if (!pci_list_builded) {

		v_pci_card_list_init(this_board->i_VendorId, 1);	/* 1 for displaying the list.. */

drivers/staging/comedi/drivers/adl_pci6208.c

+4 −4
Original line number Diff line number Diff line
@@ -191,10 +191,10 @@ static int pci6208_attach_pci(struct comedi_device *dev, 
	dev->board_ptr = boardinfo;

	dev->board_name = boardinfo->name;



	ret = alloc_private(dev, sizeof(*devpriv));

	if (ret)

		return ret;

	devpriv = dev->private;

	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);

	if (!devpriv)

		return -ENOMEM;

	dev->private = devpriv;



	ret = comedi_pci_enable(pcidev, dev->board_name);

	if (ret)

drivers/staging/comedi/drivers/adl_pci9111.c

+4 −4
Original line number Diff line number Diff line
@@ -889,10 +889,10 @@ static int pci9111_attach_pci(struct comedi_device *dev, 
	comedi_set_hw_dev(dev, &pcidev->dev);

	dev->board_name = dev->driver->driver_name;



	ret = alloc_private(dev, sizeof(*dev_private));

	if (ret)

		return ret;

	dev_private = dev->private;

	dev_private = kzalloc(sizeof(*dev_private), GFP_KERNEL);

	if (!dev_private)

		return -ENOMEM;

	dev->private = dev_private;



	ret = comedi_pci_enable(pcidev, dev->board_name);

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE