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

staging: comedi: auto-config drivers do not need to set hw_dev 



The comedi core now sets the 'hw_dev' pointer in the function
comedi_auto_config_helper() before calling the auto attach
function in the driver.

Remove the now unnecessary call to comedi_set_hw_dev() in the
drivers that use the auto-config attach mechanism.

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 c34fa261

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

+0 −2
Original line number Diff line number Diff line
@@ -227,8 +227,6 @@ static int pci_8255_attach_pci(struct comedi_device *dev, 
	int ret;

	int i;



	comedi_set_hw_dev(dev, &pcidev->dev);



	board = pci_8255_find_boardinfo(dev, pcidev);

	if (!board)

		return -ENODEV;

drivers/staging/comedi/drivers/adl_pci6208.c

+0 −2
Original line number Diff line number Diff line
@@ -183,8 +183,6 @@ static int pci6208_attach_pci(struct comedi_device *dev, 
	unsigned int val;

	int ret;



	comedi_set_hw_dev(dev, &pcidev->dev);



	boardinfo = pci6208_find_boardinfo(dev, pcidev);

	if (!boardinfo)

		return -ENODEV;

drivers/staging/comedi/drivers/adl_pci7x3x.c

+0 −2
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ static int adl_pci7x3x_attach_pci(struct comedi_device *dev, 
	int nchan;

	int ret;



	comedi_set_hw_dev(dev, &pcidev->dev);



	board = adl_pci7x3x_find_boardinfo(dev, pcidev);

	if (!board)

		return -ENODEV;

drivers/staging/comedi/drivers/adl_pci8164.c

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

	int ret;



	comedi_set_hw_dev(dev, &pcidev->dev);



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



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

drivers/staging/comedi/drivers/adl_pci9111.c

+0 −1
Original line number Diff line number Diff line
@@ -886,7 +886,6 @@ static int pci9111_attach_pci(struct comedi_device *dev, 
	struct comedi_subdevice *s;

	int ret;



	comedi_set_hw_dev(dev, &pcidev->dev);

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



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE