diff options
| author | David S. Miller <davem@davemloft.net> | 2018-11-19 21:55:00 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-19 21:55:00 +0300 |
| commit | f2be6d710d25be7d8d13f49f713d69dea9c71d57 (patch) | |
| tree | 1b3dde663a53e7f4f7a8cc17674405dc9d29554a /drivers/net/can/usb/ucan.c | |
| parent | bae4e109837b419b93fbddcb414c86673b1c90a5 (diff) | |
| parent | f2ce1065e767fc7da106a5f5381d1e8f842dc6f4 (diff) | |
| download | linux-f2be6d710d25be7d8d13f49f713d69dea9c71d57.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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) { |