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

Commit 6b48ff8d authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Marc Kleine-Budde
Browse files

can: c_can: Simplify buffer reenabling 



Instead of writing to the message object we can simply clear the
NewDat bit with the get method.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarAlexander Stein <alexander.stein@systec-electronic.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 1da394d8

drivers/net/can/c_can/c_can.c

+6 −10
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
#define IF_COMM_CONTROL		BIT(4)

#define IF_COMM_CLR_INT_PND	BIT(3)

#define IF_COMM_TXRQST		BIT(2)

#define IF_COMM_CLR_NEWDAT	IF_COMM_TXRQST

#define IF_COMM_DATAA		BIT(1)

#define IF_COMM_DATAB		BIT(0)

#define IF_COMM_ALL		(IF_COMM_MASK | IF_COMM_ARB | \
@@ -120,7 +121,7 @@ 
				 IF_COMM_DATAA | IF_COMM_DATAB)



/* For the high buffers we clear the interrupt bit and newdat */

#define IF_COMM_RCV_HIGH	(IF_COMM_RCV_LOW | IF_COMM_TXRQST)

#define IF_COMM_RCV_HIGH	(IF_COMM_RCV_LOW | IF_COMM_CLR_NEWDAT)



/* IFx arbitration */

#define IF_ARB_MSGVAL		BIT(15)
@@ -353,17 +354,12 @@ static void c_can_write_msg_object(struct net_device *dev, 
}



static inline void c_can_activate_all_lower_rx_msg_obj(struct net_device *dev,

						int iface,

						int ctrl_mask)

						       int iface)

{

	int i;

	struct c_can_priv *priv = netdev_priv(dev);



	for (i = C_CAN_MSG_OBJ_RX_FIRST; i <= C_CAN_MSG_RX_LOW_LAST; i++) {

		priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface),

				ctrl_mask & ~IF_MCONT_NEWDAT);

		c_can_object_put(dev, iface, i, IF_COMM_CONTROL);

	}

	for (i = C_CAN_MSG_OBJ_RX_FIRST; i <= C_CAN_MSG_RX_LOW_LAST; i++)

		c_can_object_get(dev, iface, i, IF_COMM_CLR_NEWDAT);

}



static int c_can_handle_lost_msg_obj(struct net_device *dev,
@@ -829,7 +825,7 @@ static int c_can_read_objects(struct net_device *dev, struct c_can_priv *priv, 


		if (obj == C_CAN_MSG_RX_LOW_LAST)

			/* activate all lower message objects */

			c_can_activate_all_lower_rx_msg_obj(dev, IF_RX, ctrl);

			c_can_activate_all_lower_rx_msg_obj(dev, IF_RX);



		pkts++;

		quota--;