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

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

can: mscan: remove obsolete variable open_time 



The variable open_time in the struct mscan_priv was used to protect
mscan_do_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 ab48b03e

drivers/net/can/mscan/mscan.c

+0 −8
Original line number Diff line number Diff line
@@ -517,12 +517,8 @@ static irqreturn_t mscan_isr(int irq, void *dev_id) 


static int mscan_do_set_mode(struct net_device *dev, enum can_mode mode)

{

	struct mscan_priv *priv = netdev_priv(dev);

	int ret = 0;



	if (!priv->open_time)

		return -EINVAL;



	switch (mode) {

	case CAN_MODE_START:

		ret = mscan_restart(dev);
@@ -590,8 +586,6 @@ static int mscan_open(struct net_device *dev) 
		goto exit_napi_disable;

	}



	priv->open_time = jiffies;



	if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)

		setbits8(&regs->canctl1, MSCAN_LISTEN);

	else
@@ -606,7 +600,6 @@ static int mscan_open(struct net_device *dev) 
	return 0;



exit_free_irq:

	priv->open_time = 0;

	free_irq(dev->irq, dev);

exit_napi_disable:

	napi_disable(&priv->napi);
@@ -627,7 +620,6 @@ static int mscan_close(struct net_device *dev) 
	mscan_set_mode(dev, MSCAN_INIT_MODE);

	close_candev(dev);

	free_irq(dev->irq, dev);

	priv->open_time = 0;



	return 0;

}

drivers/net/can/mscan/mscan.h

+0 −1
Original line number Diff line number Diff line
@@ -281,7 +281,6 @@ struct tx_queue_entry { 
struct mscan_priv {

	struct can_priv can;	/* must be the first member */

	unsigned int type; 	/* MSCAN type variants */

	long open_time;

	unsigned long flags;

	void __iomem *reg_base;	/* ioremap'ed address to registers */

	u8 shadow_statflg;