Skip to content

Commit

Permalink
can: sja1000: remove obsolete variable open_time
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marc Kleine-Budde committed Nov 29, 2012
1 parent 49ed59b commit b2d0bf7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
8 changes: 0 additions & 8 deletions drivers/net/can/sja1000/sja1000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
struct sja1000_priv *priv = netdev_priv(dev);

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

switch (mode) {
case CAN_MODE_START:
sja1000_start(dev);
Expand Down Expand Up @@ -579,7 +574,6 @@ static int sja1000_open(struct net_device *dev)

/* init and start chi */
sja1000_start(dev);
priv->open_time = jiffies;

netif_start_queue(dev);

Expand All @@ -598,8 +592,6 @@ static int sja1000_close(struct net_device *dev)

close_candev(dev);

priv->open_time = 0;

return 0;
}

Expand Down
1 change: 0 additions & 1 deletion drivers/net/can/sja1000/sja1000.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@
*/
struct sja1000_priv {
struct can_priv can; /* must be the first member */
int open_time;
struct sk_buff *echo_skb;

/* the lower-layer is responsible for appropriate locking */
Expand Down

0 comments on commit b2d0bf7

Please sign in to comment.