This driver uses the comedi auto attach mechanism so the comedi_device will always have an associated usb_interface and usb_device.
Remove the unnecessary checks if the comedi_device has a usb_interface attached. This also allows removing the usb_interface from the private data. Signed-off-by: H Hartley Sweeten <[email protected]> Cc Ian Abbott <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> --- drivers/staging/comedi/drivers/vmk80xx.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c index 2cf0e50..0ab04c0 100644 --- a/drivers/staging/comedi/drivers/vmk80xx.c +++ b/drivers/staging/comedi/drivers/vmk80xx.c @@ -154,7 +154,6 @@ static const struct vmk80xx_board vmk80xx_boardinfo[] = { }; struct vmk80xx_private { - struct usb_interface *intf; struct usb_endpoint_descriptor *ep_rx; struct usb_endpoint_descriptor *ep_tx; struct firmware_version fw; @@ -252,9 +251,6 @@ static int vmk80xx_read_packet(struct comedi_device *dev) struct usb_endpoint_descriptor *ep; unsigned int pipe; - if (!devpriv->intf) - return -ENODEV; - if (devpriv->model == VMK8061_MODEL) { vmk80xx_do_bulk_msg(dev); return 0; @@ -274,9 +270,6 @@ static int vmk80xx_write_packet(struct comedi_device *dev, int cmd) struct usb_endpoint_descriptor *ep; unsigned int pipe; - if (!devpriv->intf) - return -ENODEV; - devpriv->usb_tx_buf[0] = cmd; if (devpriv->model == VMK8061_MODEL) { @@ -729,7 +722,7 @@ static int vmk80xx_pwm_insn_write(struct comedi_device *dev, static int vmk80xx_find_usb_endpoints(struct comedi_device *dev) { struct vmk80xx_private *devpriv = dev->private; - struct usb_interface *intf = devpriv->intf; + struct usb_interface *intf = comedi_to_usb_interface(dev); struct usb_host_interface *iface_desc = intf->cur_altsetting; struct usb_endpoint_descriptor *ep_desc; int i; @@ -887,7 +880,6 @@ static int vmk80xx_auto_attach(struct comedi_device *dev, return -ENOMEM; dev->private = devpriv; - devpriv->intf = intf; devpriv->model = boardinfo->model; ret = vmk80xx_find_usb_endpoints(dev); @@ -920,6 +912,7 @@ static int vmk80xx_auto_attach(struct comedi_device *dev, static void vmk80xx_detach(struct comedi_device *dev) { + struct usb_interface *intf = comedi_to_usb_interface(dev); struct vmk80xx_private *devpriv = dev->private; if (!devpriv) @@ -927,7 +920,7 @@ static void vmk80xx_detach(struct comedi_device *dev) down(&devpriv->limit_sem); - usb_set_intfdata(devpriv->intf, NULL); + usb_set_intfdata(intf, NULL); kfree(devpriv->usb_rx_buf); kfree(devpriv->usb_tx_buf); -- 1.8.1.4 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
