diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-07-20 22:30:40 +0200 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-11-29 14:34:05 +0100 |
commit | e42870465025ac6c9f3dc45f45a69d3da2d85308 (patch) | |
tree | 736fafa9c34ef1e349858116cd0f1791c4068cf5 /drivers/net/can | |
parent | 4480c008047d72a7d40e1e7fdc1d3b420ebcb955 (diff) | |
download | linux-3.10-e42870465025ac6c9f3dc45f45a69d3da2d85308.tar.gz linux-3.10-e42870465025ac6c9f3dc45f45a69d3da2d85308.tar.bz2 linux-3.10-e42870465025ac6c9f3dc45f45a69d3da2d85308.zip |
can: esd_usb2: remove obsolete variable open_time
The variable open_time in the struct esd_usb2_net_priv was used to protect
esd_usb2_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')
-rw-r--r-- | drivers/net/can/usb/esd_usb2.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c index 124e0dd3490..9b74d1e3ad4 100644 --- a/drivers/net/can/usb/esd_usb2.c +++ b/drivers/net/can/usb/esd_usb2.c @@ -217,7 +217,6 @@ struct esd_usb2_net_priv { struct usb_anchor tx_submitted; struct esd_tx_urb_context tx_contexts[MAX_TX_URBS]; - int open_time; struct esd_usb2 *usb2; struct net_device *netdev; int index; @@ -695,8 +694,6 @@ static int esd_usb2_open(struct net_device *netdev) return err; } - priv->open_time = jiffies; - netif_start_queue(netdev); return 0; @@ -864,8 +861,6 @@ static int esd_usb2_close(struct net_device *netdev) close_candev(netdev); - priv->open_time = 0; - return 0; } @@ -941,11 +936,6 @@ static int esd_usb2_get_berr_counter(const struct net_device *netdev, static int esd_usb2_set_mode(struct net_device *netdev, enum can_mode mode) { - struct esd_usb2_net_priv *priv = netdev_priv(netdev); - - if (!priv->open_time) - return -EINVAL; - switch (mode) { case CAN_MODE_START: netif_wake_queue(netdev); |