Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[android-x86/kernel.git] / drivers / net / ethernet / renesas / ravb_main.c

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 78849dd..779bb58 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -223,9 +223,9 @@ 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);
-       struct ravb_ex_rx_desc *rx_desc = NULL;
-       struct ravb_tx_desc *tx_desc = NULL;
-       struct ravb_desc *desc = NULL;
+       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];
        dma_addr_t dma_addr;
@@ -439,7 +439,7 @@ static int ravb_tx_free(struct net_device *ndev, int q)
        struct net_device_stats *stats = &priv->stats[q];
        struct ravb_tx_desc *desc;
        int free_num = 0;
-       int entry = 0;
+       int entry;
        u32 size;
 
        for (; priv->cur_tx[q] - priv->dirty_tx[q] > 0; priv->dirty_tx[q]++) {
@@ -512,8 +512,8 @@ static bool ravb_rx(struct net_device *ndev, int *quota, int q)
        struct sk_buff *skb;
        dma_addr_t dma_addr;
        struct timespec64 ts;
-       u16 pkt_len = 0;
        u8  desc_status;
+       u16 pkt_len;
        int limit;
 
        boguscnt = min(boguscnt, *quota);
@@ -1277,8 +1277,8 @@ 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);
-       struct ravb_tstamp_skb *ts_skb = NULL;
        u16 q = skb_get_queue_mapping(skb);
+       struct ravb_tstamp_skb *ts_skb;
        struct ravb_tx_desc *desc;
        unsigned long flags;
        u32 dma_addr;