diff options
| author | Tejun Heo | 2018-12-28 03:05:30 +0100 |
|---|---|---|
| committer | Tejun Heo | 2018-12-28 03:05:30 +0100 |
| commit | 4d71c6f8771a6bccb844244f09831fa4624b22c1 (patch) | |
| tree | 9c6fdf753d64c839a4b0deb7d35d7e990c8e9971 /drivers/net/can/usb/ucan.c | |
| parent | cpuset: Remove set but not used variable 'cs' (diff) | |
| parent | cgroup: fix CSS_TASK_ITER_PROCS (diff) | |
| download | kernel-qcow2-linux-4d71c6f8771a6bccb844244f09831fa4624b22c1.tar.gz kernel-qcow2-linux-4d71c6f8771a6bccb844244f09831fa4624b22c1.tar.xz kernel-qcow2-linux-4d71c6f8771a6bccb844244f09831fa4624b22c1.zip | |
Merge branch 'for-4.20-fixes' into for-4.21
Diffstat (limited to 'drivers/net/can/usb/ucan.c')
| -rw-r--r-- | drivers/net/can/usb/ucan.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/can/usb/ucan.c b/drivers/net/can/usb/ucan.c index 0678a38b1af4..f3d5bda012a1 100644 --- a/drivers/net/can/usb/ucan.c +++ b/drivers/net/can/usb/ucan.c @@ -35,10 +35,6 @@ #include <linux/slab.h> #include <linux/usb.h> -#include <linux/can.h> -#include <linux/can/dev.h> -#include <linux/can/error.h> - #define UCAN_DRIVER_NAME "ucan" #define UCAN_MAX_RX_URBS 8 /* the CAN controller needs a while to enable/disable the bus */ @@ -1575,11 +1571,8 @@ err_firmware_needs_update: /* disconnect the device */ static void ucan_disconnect(struct usb_interface *intf) { - struct usb_device *udev; struct ucan_priv *up = usb_get_intfdata(intf); - udev = interface_to_usbdev(intf); - usb_set_intfdata(intf, NULL); if (up) { |