Commit 5a49edec authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: dsa: qca8k: Fix inconsistent use of jiffies vs milliseconds 



wait_for_complete_timeout() expects a timeout in jiffies. With the
driver, some call sites converted QCA8K_ETHERNET_TIMEOUT to jiffies,
others did not. Make the code consistent by changes the #define to
include a call to msecs_to_jiffies, and remove all other calls to
msecs_to_jiffies.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: from Christian would be very welcome.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b9da35f

drivers/net/dsa/qca/qca8k-8xxx.c

+2 −2
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static int qca8k_read_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len) 
	dev_queue_xmit(skb);



	ret = wait_for_completion_timeout(&mgmt_eth_data->rw_done,

					  msecs_to_jiffies(QCA8K_ETHERNET_TIMEOUT));

					  QCA8K_ETHERNET_TIMEOUT);



	*val = mgmt_eth_data->data[0];

	if (len > QCA_HDR_MGMT_DATA1_LEN)
@@ -394,7 +394,7 @@ static int qca8k_write_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len) 
	dev_queue_xmit(skb);



	ret = wait_for_completion_timeout(&mgmt_eth_data->rw_done,

					  msecs_to_jiffies(QCA8K_ETHERNET_TIMEOUT));

					  QCA8K_ETHERNET_TIMEOUT);



	ack = mgmt_eth_data->ack;

drivers/net/dsa/qca/qca8k.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#define QCA8K_ETHERNET_MDIO_PRIORITY			7

#define QCA8K_ETHERNET_PHY_PRIORITY			6

#define QCA8K_ETHERNET_TIMEOUT				5

#define QCA8K_ETHERNET_TIMEOUT				msecs_to_jiffies(5)



#define QCA8K_NUM_PORTS					7

#define QCA8K_NUM_CPU_PORTS				2