lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

can: sja1000: remove obsolete variable open_time

Browse Source 
The variable open_time in the struct sja1000_priv was used to protect
sja1000_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>
This commit is contained in:
Marc Kleine-Budde
2012-07-20 22:30:40 +02:00
parent 49ed59b72c
commit b2d0bf711f
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/can/sja1000/sja1000.c
View File

@@ -188,11 +188,6 @@ static void sja1000_start(struct net_device *dev)
static int sja1000_set_mode(struct net_device *dev, enum can_mode mode) static int sja1000_set_mode(struct net_device *dev, enum can_mode mode)
{ {
struct sja1000_priv *priv = netdev_priv(dev);
if (!priv->open_time)
return -EINVAL;
switch (mode) { switch (mode) {
case CAN_MODE_START: case CAN_MODE_START:
sja1000_start(dev); sja1000_start(dev);
@@ -579,7 +574,6 @@ static int sja1000_open(struct net_device *dev)
/* init and start chi */ /* init and start chi */
sja1000_start(dev); sja1000_start(dev);
priv->open_time = jiffies;
netif_start_queue(dev); netif_start_queue(dev);
@@ -598,8 +592,6 @@ static int sja1000_close(struct net_device *dev)
close_candev(dev); close_candev(dev);
priv->open_time = 0;
return 0; return 0;
} }

1
drivers/net/can/sja1000/sja1000.h
View File

@@ -152,7 +152,6 @@
*/ */
struct sja1000_priv { struct sja1000_priv {
struct can_priv can; /* must be the first member */ struct can_priv can; /* must be the first member */
int open_time;
struct sk_buff *echo_skb; struct sk_buff *echo_skb;
/* the lower-layer is responsible for appropriate locking */ /* the lower-layer is responsible for appropriate locking */