Skip to content

Commit

Permalink
can: pcan_usb_core: remove obsolete variable open_time
Browse files Browse the repository at this point in the history
The variable open_time in the struct peak_usb_device was used to protect
peak_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>
  • Loading branch information
Marc Kleine-Budde committed Nov 29, 2012
1 parent e428704 commit 823d7a1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
5 changes: 0 additions & 5 deletions drivers/net/can/usb/peak_usb/pcan_usb_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,6 @@ static int peak_usb_ndo_open(struct net_device *netdev)
return err;
}

dev->open_time = jiffies;
netif_start_queue(netdev);

return 0;
Expand Down Expand Up @@ -576,7 +575,6 @@ static int peak_usb_ndo_stop(struct net_device *netdev)

close_candev(netdev);

dev->open_time = 0;
dev->can.state = CAN_STATE_STOPPED;

/* can set bus off now */
Expand Down Expand Up @@ -661,9 +659,6 @@ static int peak_usb_set_mode(struct net_device *netdev, enum can_mode mode)
struct peak_usb_device *dev = netdev_priv(netdev);
int err = 0;

if (!dev->open_time)
return -EINVAL;

switch (mode) {
case CAN_MODE_START:
err = peak_usb_restart(dev);
Expand Down
1 change: 0 additions & 1 deletion drivers/net/can/usb/peak_usb/pcan_usb_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ struct peak_usb_device {
struct can_priv can;
struct peak_usb_adapter *adapter;
unsigned int ctrl_idx;
int open_time;
u32 state;

struct sk_buff *echo_skb[PCAN_USB_MAX_TX_URBS];
Expand Down

0 comments on commit 823d7a1

Please sign in to comment.