diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-07-20 16:30:40 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-11-29 08:33:42 -0500 |
commit | 4480c008047d72a7d40e1e7fdc1d3b420ebcb955 (patch) | |
tree | b61a8c9a177973092143c19468e77c715b8f4d8d /drivers/net/can/usb | |
parent | b2d0bf711f94969394a9c4a2f8923c286803cd34 (diff) |
can: ems_usb: remove obsolete variable open_time
The variable open_time in the struct ems_usb was used to protect
ems_usb_set_mode() only to be called, if the interface is up. Now the CAN
device infrastructure takes care of this.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/usb')
-rw-r--r-- | drivers/net/can/usb/ems_usb.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c index 086fa321677a..c69f0b72b352 100644 --- a/drivers/net/can/usb/ems_usb.c +++ b/drivers/net/can/usb/ems_usb.c | |||
@@ -245,7 +245,6 @@ struct ems_tx_urb_context { | |||
245 | 245 | ||
246 | struct ems_usb { | 246 | struct ems_usb { |
247 | struct can_priv can; /* must be the first member */ | 247 | struct can_priv can; /* must be the first member */ |
248 | int open_time; | ||
249 | 248 | ||
250 | struct sk_buff *echo_skb[MAX_TX_URBS]; | 249 | struct sk_buff *echo_skb[MAX_TX_URBS]; |
251 | 250 | ||
@@ -728,7 +727,6 @@ static int ems_usb_open(struct net_device *netdev) | |||
728 | return err; | 727 | return err; |
729 | } | 728 | } |
730 | 729 | ||
731 | dev->open_time = jiffies; | ||
732 | 730 | ||
733 | netif_start_queue(netdev); | 731 | netif_start_queue(netdev); |
734 | 732 | ||
@@ -878,8 +876,6 @@ static int ems_usb_close(struct net_device *netdev) | |||
878 | 876 | ||
879 | close_candev(netdev); | 877 | close_candev(netdev); |
880 | 878 | ||
881 | dev->open_time = 0; | ||
882 | |||
883 | return 0; | 879 | return 0; |
884 | } | 880 | } |
885 | 881 | ||
@@ -905,9 +901,6 @@ static int ems_usb_set_mode(struct net_device *netdev, enum can_mode mode) | |||
905 | { | 901 | { |
906 | struct ems_usb *dev = netdev_priv(netdev); | 902 | struct ems_usb *dev = netdev_priv(netdev); |
907 | 903 | ||
908 | if (!dev->open_time) | ||
909 | return -EINVAL; | ||
910 | |||
911 | switch (mode) { | 904 | switch (mode) { |
912 | case CAN_MODE_START: | 905 | case CAN_MODE_START: |
913 | if (ems_usb_write_mode(dev, SJA1000_MOD_NORMAL)) | 906 | if (ems_usb_write_mode(dev, SJA1000_MOD_NORMAL)) |