can: pcan_usb_core: remove obsolete variable open_time

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>

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
index c4643c400d462bfc63ce7b4df6c76558e4e92e50..d9290ea788e02665d169e34b4fd7704a116622b4 100644 (file)
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
@@ -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;
@@ -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 */
@@ -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);

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.h b/drivers/net/can/usb/peak_usb/pcan_usb_core.h
index c8e5e91d7cb571f350eef5ff2b0e26cf317d6460..073b47ff8eee3065b2bf9f1319fc7207c93c2aa8 100644 (file)
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.h
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.h
@@ -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];