Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2d0bf71 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

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: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 49ed59b7

drivers/net/can/sja1000/sja1000.c

+0 −8
Original line number Diff line number Diff line
@@ -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);
@@ -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);
@@ -598,8 +592,6 @@ static int sja1000_close(struct net_device *dev) 


	close_candev(dev);



	priv->open_time = 0;



	return 0;

}

drivers/net/can/sja1000/sja1000.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */