From: Ian Abbott Date: Mon, 1 Sep 2014 11:03:41 +0000 (+0100) Subject: staging: comedi: amplc_pci230: no need to comedi_set_hw_dev() here X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=77ffced7af82c13243a642e731b52fc1714fd48a;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: amplc_pci230: no need to comedi_set_hw_dev() here The comedi core module calls `comedi_set_hw_dev()` to associate the hardware `struct device` with the `struct comedi_device` before it calls the comedi driver's "auto_attach" hook `pci230_auto_attach()`. There is no need for `pci230_auto_attach()` to call `comedi_set_hw_dev()` itself, so remove the call. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index 46977e53a16d..bd2e6483ac55 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c @@ -2582,8 +2582,6 @@ static int pci230_auto_attach(struct comedi_device *dev, thisboard = comedi_board(dev); devpriv = dev->private; - comedi_set_hw_dev(dev, &pci_dev->dev); - dev->board_name = thisboard->name; rc = comedi_pci_enable(dev);