diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-07-20 16:30:40 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-11-29 08:30:35 -0500 |
commit | b2d0bf711f94969394a9c4a2f8923c286803cd34 (patch) | |
tree | 82cbdee3bf3f4e0c5c23fe2ea0bba56d2bd37fed /drivers/net/can/sja1000 | |
parent | 49ed59b72cb03116682dd6ab5c04117cc710bff3 (diff) |
can: sja1000: remove obsolete variable open_time
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>
Diffstat (limited to 'drivers/net/can/sja1000')
-rw-r--r-- | drivers/net/can/sja1000/sja1000.c | 8 | ||||
-rw-r--r-- | drivers/net/can/sja1000/sja1000.h | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index 25011dbe1b96..83ee11eca0e2 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c | |||
@@ -188,11 +188,6 @@ static void sja1000_start(struct net_device *dev) | |||
188 | 188 | ||
189 | static int sja1000_set_mode(struct net_device *dev, enum can_mode mode) | 189 | static int sja1000_set_mode(struct net_device *dev, enum can_mode mode) |
190 | { | 190 | { |
191 | struct sja1000_priv *priv = netdev_priv(dev); | ||
192 | |||
193 | if (!priv->open_time) | ||
194 | return -EINVAL; | ||
195 | |||
196 | switch (mode) { | 191 | switch (mode) { |
197 | case CAN_MODE_START: | 192 | case CAN_MODE_START: |
198 | sja1000_start(dev); | 193 | sja1000_start(dev); |
@@ -579,7 +574,6 @@ static int sja1000_open(struct net_device *dev) | |||
579 | 574 | ||
580 | /* init and start chi */ | 575 | /* init and start chi */ |
581 | sja1000_start(dev); | 576 | sja1000_start(dev); |
582 | priv->open_time = jiffies; | ||
583 | 577 | ||
584 | netif_start_queue(dev); | 578 | netif_start_queue(dev); |
585 | 579 | ||
@@ -598,8 +592,6 @@ static int sja1000_close(struct net_device *dev) | |||
598 | 592 | ||
599 | close_candev(dev); | 593 | close_candev(dev); |
600 | 594 | ||
601 | priv->open_time = 0; | ||
602 | |||
603 | return 0; | 595 | return 0; |
604 | } | 596 | } |
605 | 597 | ||
diff --git a/drivers/net/can/sja1000/sja1000.h b/drivers/net/can/sja1000/sja1000.h index 23fff06875f5..afa99847a510 100644 --- a/drivers/net/can/sja1000/sja1000.h +++ b/drivers/net/can/sja1000/sja1000.h | |||
@@ -152,7 +152,6 @@ | |||
152 | */ | 152 | */ |
153 | struct sja1000_priv { | 153 | struct sja1000_priv { |
154 | struct can_priv can; /* must be the first member */ | 154 | struct can_priv can; /* must be the first member */ |
155 | int open_time; | ||
156 | struct sk_buff *echo_skb; | 155 | struct sk_buff *echo_skb; |
157 | 156 | ||
158 | /* the lower-layer is responsible for appropriate locking */ | 157 | /* the lower-layer is responsible for appropriate locking */ |