Commit cb537b24 authored by Biju Das's avatar Biju Das Committed by David S. Miller
Browse files

ravb: Use unsigned int for num_tx_desc variable in struct ravb_private 



The number of TX descriptors per packet is an unsigned value and
the variable for holding this information should be unsigned.

This patch replaces the data type of num_tx_desc variable in struct
ravb_private from 'int' to 'unsigned int'.
This patch also updates the data type of local variables to unsigned int,
where the local variables are evaluated using num_tx_desc.

Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19b8ece4

drivers/net/ethernet/renesas/ravb.h

+1 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ struct ravb_private { 
	unsigned rxcidm:1;		/* RX Clock Internal Delay Mode */

	unsigned txcidm:1;		/* TX Clock Internal Delay Mode */

	unsigned rgmii_override:1;	/* Deprecated rgmii-*id behavior */

	int num_tx_desc;		/* TX descriptors per packet */

	unsigned int num_tx_desc;	/* TX descriptors per packet */

};



static inline u32 ravb_read(struct net_device *ndev, enum ravb_reg reg)

drivers/net/ethernet/renesas/ravb_main.c

+14 −14
Original line number Diff line number Diff line
@@ -177,10 +177,10 @@ static int ravb_tx_free(struct net_device *ndev, int q, bool free_txed_only) 
{

	struct ravb_private *priv = netdev_priv(ndev);

	struct net_device_stats *stats = &priv->stats[q];

	int num_tx_desc = priv->num_tx_desc;

	unsigned int num_tx_desc = priv->num_tx_desc;

	struct ravb_tx_desc *desc;

	unsigned int entry;

	int free_num = 0;

	int entry;

	u32 size;



	for (; priv->cur_tx[q] - priv->dirty_tx[q] > 0; priv->dirty_tx[q]++) {
@@ -220,9 +220,9 @@ static int ravb_tx_free(struct net_device *ndev, int q, bool free_txed_only) 
static void ravb_ring_free(struct net_device *ndev, int q)

{

	struct ravb_private *priv = netdev_priv(ndev);

	int num_tx_desc = priv->num_tx_desc;

	int ring_size;

	int i;

	unsigned int num_tx_desc = priv->num_tx_desc;

	unsigned int ring_size;

	unsigned int i;



	if (priv->rx_ring[q]) {

		for (i = 0; i < priv->num_rx_ring[q]; i++) {
@@ -275,15 +275,15 @@ static void ravb_ring_free(struct net_device *ndev, int q) 
static void ravb_ring_format(struct net_device *ndev, int q)

{

	struct ravb_private *priv = netdev_priv(ndev);

	int num_tx_desc = priv->num_tx_desc;

	unsigned int num_tx_desc = priv->num_tx_desc;

	struct ravb_ex_rx_desc *rx_desc;

	struct ravb_tx_desc *tx_desc;

	struct ravb_desc *desc;

	int rx_ring_size = sizeof(*rx_desc) * priv->num_rx_ring[q];

	int tx_ring_size = sizeof(*tx_desc) * priv->num_tx_ring[q] *

	unsigned int rx_ring_size = sizeof(*rx_desc) * priv->num_rx_ring[q];

	unsigned int tx_ring_size = sizeof(*tx_desc) * priv->num_tx_ring[q] *

				    num_tx_desc;

	dma_addr_t dma_addr;

	int i;

	unsigned int i;



	priv->cur_rx[q] = 0;

	priv->cur_tx[q] = 0;
@@ -339,10 +339,10 @@ static void ravb_ring_format(struct net_device *ndev, int q) 
static int ravb_ring_init(struct net_device *ndev, int q)

{

	struct ravb_private *priv = netdev_priv(ndev);

	int num_tx_desc = priv->num_tx_desc;

	unsigned int num_tx_desc = priv->num_tx_desc;

	unsigned int ring_size;

	struct sk_buff *skb;

	int ring_size;

	int i;

	unsigned int i;



	/* Allocate RX and TX skb rings */

	priv->rx_skb[q] = kcalloc(priv->num_rx_ring[q],
@@ -1488,7 +1488,7 @@ static void ravb_tx_timeout_work(struct work_struct *work) 
static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev)

{

	struct ravb_private *priv = netdev_priv(ndev);

	int num_tx_desc = priv->num_tx_desc;

	unsigned int num_tx_desc = priv->num_tx_desc;

	u16 q = skb_get_queue_mapping(skb);

	struct ravb_tstamp_skb *ts_skb;

	struct ravb_tx_desc *desc;