Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next

Marc Kleine-Budde says:

====================
this pull request is for net-next/master. There is a patch by Alexander
Stein fixing a reference counter problem which can make driver
unloading impossible (stable Cc'ed). And several patches by me which
remove an obsolete mechanism from several drivers, which is already
handled at the infrastructure level.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 0 insertions, 6 deletions

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 c4643c400d46..d9290ea788e0 100644
--- 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 c8e5e91d7cb5..073b47ff8eee 100644
--- 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];