net: stmmac: more mode -> descriptor_mode renames

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1w2vbL-0000000DbWW-0PON@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
index d5c003f3fbbc7f764c2c87290e2a4af20bec3121..2994df41ec2c4e195ef8a8e8220985cb1dae2200 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
@@ -289,12 +289,13 @@ exit:
 }
 
 static void dwmac4_rd_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
-                                  int mode, int end, int bfsize)
+                                  u8 descriptor_mode, int end, int bfsize)
 {
        dwmac4_set_rx_owner(p, disable_rx_ic);
 }
 
-static void dwmac4_rd_init_tx_desc(struct dma_desc *p, int mode, int end)
+static void dwmac4_rd_init_tx_desc(struct dma_desc *p, u8 descriptor_mode,
+                                  int end)
 {
        p->des0 = 0;
        p->des1 = 0;
@@ -303,8 +304,9 @@ static void dwmac4_rd_init_tx_desc(struct dma_desc *p, int mode, int end)
 }
 
 static void dwmac4_rd_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
-                                     bool csum_flag, int mode, bool tx_own,
-                                     bool ls, unsigned int tot_pkt_len)
+                                     bool csum_flag, u8 descriptor_mode,
+                                     bool tx_own, bool ls,
+                                     unsigned int tot_pkt_len)
 {
        u32 tdes3 = le32_to_cpu(p->des3);
 
@@ -381,7 +383,7 @@ static void dwmac4_rd_prepare_tso_tx_desc(struct dma_desc *p, int is_fs,
        p->des3 = cpu_to_le32(tdes3);
 }
 
-static void dwmac4_release_tx_desc(struct dma_desc *p, int mode)
+static void dwmac4_release_tx_desc(struct dma_desc *p, u8 descriptor_mode)
 {
        p->des0 = 0;
        p->des1 = 0;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
index 1009ef436a1e689c26b111c034bf2056bbe1238c..b5f200a8748406a585d6d5a955bf301fccac858a 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
@@ -130,12 +130,13 @@ static int dwxgmac2_get_rx_timestamp_status(void *desc, void *next_desc,
 }
 
 static void dwxgmac2_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
-                                 int mode, int end, int bfsize)
+                                 u8 descriptor_mode, int end, int bfsize)
 {
        dwxgmac2_set_rx_owner(p, disable_rx_ic);
 }
 
-static void dwxgmac2_init_tx_desc(struct dma_desc *p, int mode, int end)
+static void dwxgmac2_init_tx_desc(struct dma_desc *p, u8 descriptor_mode,
+                                 int end)
 {
        p->des0 = 0;
        p->des1 = 0;
@@ -144,8 +145,9 @@ static void dwxgmac2_init_tx_desc(struct dma_desc *p, int mode, int end)
 }
 
 static void dwxgmac2_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
-                                    bool csum_flag, int mode, bool tx_own,
-                                    bool ls, unsigned int tot_pkt_len)
+                                    bool csum_flag, u8 descriptor_mode,
+                                    bool tx_own, bool ls,
+                                    unsigned int tot_pkt_len)
 {
        u32 tdes3 = le32_to_cpu(p->des3);
 
@@ -219,7 +221,7 @@ static void dwxgmac2_prepare_tso_tx_desc(struct dma_desc *p, int is_fs,
        p->des3 = cpu_to_le32(tdes3);
 }
 
-static void dwxgmac2_release_tx_desc(struct dma_desc *p, int mode)
+static void dwxgmac2_release_tx_desc(struct dma_desc *p, u8 descriptor_mode)
 {
        p->des0 = 0;
        p->des1 = 0;

diff --git a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
index ead468f4b6453bd01ace1e3f3f751652f0bc31ad..051253601225123dc3fd64b97dba5103a483daa3 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
@@ -245,7 +245,7 @@ static int enh_desc_get_rx_status(struct stmmac_extra_stats *x,
 }
 
 static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
-                                 int mode, int end, int bfsize)
+                                 u8 descriptor_mode, int end, int bfsize)
 {
        int bfsize1;
 
@@ -254,7 +254,7 @@ static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
        bfsize1 = min(bfsize, BUF_SIZE_8KiB);
        p->des1 |= cpu_to_le32(bfsize1 & ERDES1_BUFFER1_SIZE_MASK);
 
-       if (mode == STMMAC_CHAIN_MODE)
+       if (descriptor_mode == STMMAC_CHAIN_MODE)
                ehn_desc_rx_set_on_chain(p);
        else
                ehn_desc_rx_set_on_ring(p, end, bfsize);
@@ -263,10 +263,11 @@ static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
                p->des1 |= cpu_to_le32(ERDES1_DISABLE_IC);
 }
 
-static void enh_desc_init_tx_desc(struct dma_desc *p, int mode, int end)
+static void enh_desc_init_tx_desc(struct dma_desc *p, u8 descriptor_mode,
+                                 int end)
 {
        p->des0 &= cpu_to_le32(~ETDES0_OWN);
-       if (mode == STMMAC_CHAIN_MODE)
+       if (descriptor_mode == STMMAC_CHAIN_MODE)
                enh_desc_end_tx_desc_on_chain(p);
        else
                enh_desc_end_tx_desc_on_ring(p, end);
@@ -282,24 +283,25 @@ static void enh_desc_set_rx_owner(struct dma_desc *p, int disable_rx_ic)
        p->des0 |= cpu_to_le32(RDES0_OWN);
 }
 
-static void enh_desc_release_tx_desc(struct dma_desc *p, int mode)
+static void enh_desc_release_tx_desc(struct dma_desc *p, u8 descriptor_mode)
 {
        int ter = (le32_to_cpu(p->des0) & ETDES0_END_RING) >> 21;
 
        memset(p, 0, offsetof(struct dma_desc, des2));
-       if (mode == STMMAC_CHAIN_MODE)
+       if (descriptor_mode == STMMAC_CHAIN_MODE)
                enh_desc_end_tx_desc_on_chain(p);
        else
                enh_desc_end_tx_desc_on_ring(p, ter);
 }
 
 static void enh_desc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
-                                    bool csum_flag, int mode, bool tx_own,
-                                    bool ls, unsigned int tot_pkt_len)
+                                    bool csum_flag, u8 descriptor_mode,
+                                    bool tx_own,  bool ls,
+                                    unsigned int tot_pkt_len)
 {
        u32 tdes0 = le32_to_cpu(p->des0);
 
-       if (mode == STMMAC_CHAIN_MODE)
+       if (descriptor_mode == STMMAC_CHAIN_MODE)
                enh_set_tx_desc_len_on_chain(p, len);
        else
                enh_set_tx_desc_len_on_ring(p, len);

diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index 010b4d32484ad34222338717bd210f8579f12248..e6317b94fff7d43dd9de15927ac5ec1dd1d4ade0 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -38,21 +38,21 @@ struct dma_edesc;
 /* Descriptors helpers */
 struct stmmac_desc_ops {
        /* DMA RX descriptor ring initialization */
-       void (*init_rx_desc)(struct dma_desc *p, int disable_rx_ic, int mode,
-                       int end, int bfsize);
+       void (*init_rx_desc)(struct dma_desc *p, int disable_rx_ic,
+                            u8 descriptor_mode, int end, int bfsize);
        /* DMA TX descriptor ring initialization */
-       void (*init_tx_desc)(struct dma_desc *p, int mode, int end);
+       void (*init_tx_desc)(struct dma_desc *p, u8 descriptor_mode, int end);
        /* Invoked by the xmit function to prepare the tx descriptor */
        void (*prepare_tx_desc)(struct dma_desc *p, int is_fs, int len,
-                       bool csum_flag, int mode, bool tx_own, bool ls,
-                       unsigned int tot_pkt_len);
+                       bool csum_flag, u8 descriptor_mode, bool tx_own,
+                       bool ls, unsigned int tot_pkt_len);
        void (*prepare_tso_tx_desc)(struct dma_desc *p, int is_fs, int len1,
                        int len2, bool tx_own, bool ls, unsigned int tcphdrlen,
                        unsigned int tcppayloadlen);
        /* Set/get the owner of the descriptor */
        void (*set_tx_owner)(struct dma_desc *p);
        /* Clean the tx descriptor as soon as the tx irq is received */
-       void (*release_tx_desc)(struct dma_desc *p, int mode);
+       void (*release_tx_desc)(struct dma_desc *p, u8 descriptor_mode);
        /* Clear interrupt on tx frame completion. When this bit is
         * set an interrupt happens as soon as the frame is transmitted */
        void (*set_tx_ic)(struct dma_desc *p);

diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
index 7c3a818c33c16bd4ef8a8e12ea9e1c7b8d885a89..c4b613564f87ce0bcd49a1a94520c8d5e788618b 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
@@ -108,8 +108,8 @@ static int ndesc_get_rx_status(struct stmmac_extra_stats *x,
        return ret;
 }
 
-static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode,
-                              int end, int bfsize)
+static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
+                              u8 descriptor_mode, int end, int bfsize)
 {
        int bfsize1;
 
@@ -118,7 +118,7 @@ static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode,
        bfsize1 = min(bfsize, BUF_SIZE_2KiB - 1);
        p->des1 |= cpu_to_le32(bfsize1 & RDES1_BUFFER1_SIZE_MASK);
 
-       if (mode == STMMAC_CHAIN_MODE)
+       if (descriptor_mode == STMMAC_CHAIN_MODE)
                ndesc_rx_set_on_chain(p, end);
        else
                ndesc_rx_set_on_ring(p, end, bfsize);
@@ -127,10 +127,10 @@ static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode,
                p->des1 |= cpu_to_le32(RDES1_DISABLE_IC);
 }
 
-static void ndesc_init_tx_desc(struct dma_desc *p, int mode, int end)
+static void ndesc_init_tx_desc(struct dma_desc *p, u8 descriptor_mode, int end)
 {
        p->des0 &= cpu_to_le32(~TDES0_OWN);
-       if (mode == STMMAC_CHAIN_MODE)
+       if (descriptor_mode == STMMAC_CHAIN_MODE)
                ndesc_tx_set_on_chain(p);
        else
                ndesc_end_tx_desc_on_ring(p, end);
@@ -146,20 +146,21 @@ static void ndesc_set_rx_owner(struct dma_desc *p, int disable_rx_ic)
        p->des0 |= cpu_to_le32(RDES0_OWN);
 }
 
-static void ndesc_release_tx_desc(struct dma_desc *p, int mode)
+static void ndesc_release_tx_desc(struct dma_desc *p, u8 descriptor_mode)
 {
        int ter = (le32_to_cpu(p->des1) & TDES1_END_RING) >> 25;
 
        memset(p, 0, offsetof(struct dma_desc, des2));
-       if (mode == STMMAC_CHAIN_MODE)
+       if (descriptor_mode == STMMAC_CHAIN_MODE)
                ndesc_tx_set_on_chain(p);
        else
                ndesc_end_tx_desc_on_ring(p, ter);
 }
 
 static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
-                                 bool csum_flag, int mode, bool tx_own,
-                                 bool ls, unsigned int tot_pkt_len)
+                                 bool csum_flag, u8 descriptor_mode,
+                                 bool tx_own, bool ls,
+                                 unsigned int tot_pkt_len)
 {
        u32 tdes1 = le32_to_cpu(p->des1);
 
@@ -176,7 +177,7 @@ static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
 
        p->des1 = cpu_to_le32(tdes1);
 
-       if (mode == STMMAC_CHAIN_MODE)
+       if (descriptor_mode == STMMAC_CHAIN_MODE)
                norm_set_tx_desc_len_on_chain(p, len);
        else
                norm_set_tx_desc_len_on_ring(p, len);