From: Ian Abbott Date: Fri, 25 Jul 2014 09:04:51 +0000 (+0100) Subject: staging: comedi: amplc_pc236: no need to set hw_dev X-Git-Tag: firefly_0821_release~176^2~3491^2~203 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a06021433074f8b5d197b552c297efd8f2155d5a;p=firefly-linux-kernel-4.4.55.git staging: comedi: amplc_pc236: no need to set hw_dev The call to `comedi_set_hw_dev()` from `pc236_pci_common_attach()` is now unnecessary since `pc236_pci_common_attach()` is now only called from this driver's `auto_attach` hook `pc236_auto_attach()` and the comedi core now calls `comedi_set_hw_dev()` before calling that. Remove the unnecessary 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_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index cf45c58a1c46..f99c7f1ab943 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c @@ -358,8 +358,6 @@ static int pc236_pci_common_attach(struct comedi_device *dev, unsigned long iobase; int ret; - comedi_set_hw_dev(dev, &pci_dev->dev); - ret = comedi_pci_enable(dev); if (ret) return ret;