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

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

staging: comedi: remove unnecessary dev->board_name initialization 



The dev->board_name is now initialized by the comedi core before calling
the(*attach) or (*auto_attach) function in a driver. As long as the driver
does no additional probing, it's no longer necessary initialize the board_name.

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 46c58127

drivers/staging/comedi/drivers/8255.c

+0 −2
Original line number Diff line number Diff line
@@ -354,8 +354,6 @@ static int dev_8255_attach(struct comedi_device *dev, 
	unsigned long iobase;

	int i;



	dev->board_name = "8255";



	for (i = 0; i < COMEDI_NDEVCONFOPTS; i++) {

		iobase = it->options[i];

		if (!iobase)

drivers/staging/comedi/drivers/addi_apci_1032.c

+0 −2
Original line number Diff line number Diff line
@@ -296,8 +296,6 @@ static int apci1032_auto_attach(struct comedi_device *dev, 
	struct comedi_subdevice *s;

	int ret;



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



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

	if (!devpriv)

		return -ENOMEM;

drivers/staging/comedi/drivers/addi_apci_1710.c

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ static int apci1710_auto_attach(struct comedi_device *dev, 
	struct comedi_subdevice *s;

	int ret;



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



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

	if (!devpriv)

		return -ENOMEM;

drivers/staging/comedi/drivers/addi_apci_2032.c

+0 −2
Original line number Diff line number Diff line
@@ -287,8 +287,6 @@ static int apci2032_auto_attach(struct comedi_device *dev, 
	struct comedi_subdevice *s;

	int ret;



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



	ret = comedi_pci_enable(dev);

	if (ret)

		return ret;

drivers/staging/comedi/drivers/addi_apci_2200.c

+0 −2
Original line number Diff line number Diff line
@@ -88,8 +88,6 @@ static int apci2200_auto_attach(struct comedi_device *dev, 
	struct comedi_subdevice *s;

	int ret;



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



	ret = comedi_pci_enable(dev);

	if (ret)

		return ret;