net: stmmac: remove axi_kbbe, axi_mb and axi_rb members

axi_kbbe, axi_mb and axi_rb are all written, but nothing ever reads
their values. Remove the code that sets these and the struct members.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1w4ydo-0000000Dlpb-34jd@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
index d245546b90db62021f68b7c4046093c857ddb30a..02c786ce5dd4328532d916eeac54b00cf9bee73f 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
@@ -231,7 +231,6 @@ motorcomm_default_plat_data(struct pci_dev *pdev)
 
        plat->axi->axi_wr_osr_lmt       = 1;
        plat->axi->axi_rd_osr_lmt       = 1;
-       plat->axi->axi_mb               = true;
        plat->axi->axi_blen_regval      = DMA_AXI_BLEN4 | DMA_AXI_BLEN8 |
                                          DMA_AXI_BLEN16 | DMA_AXI_BLEN32;
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 545b8a3425eb4a85cfdfded3f7c12efab614ec83..5cae2aa7290668aa6ebc8b029a99fc3abebac5d1 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -109,10 +109,7 @@ static struct stmmac_axi *stmmac_axi_setup(struct platform_device *pdev)
 
        axi->axi_lpi_en = of_property_read_bool(np, "snps,lpi_en");
        axi->axi_xit_frm = of_property_read_bool(np, "snps,xit_frm");
-       axi->axi_kbbe = of_property_read_bool(np, "snps,kbbe");
        axi->axi_fb = of_property_read_bool(np, "snps,fb");
-       axi->axi_mb = of_property_read_bool(np, "snps,mb");
-       axi->axi_rb =  of_property_read_bool(np, "snps,rb");
 
        if (of_property_read_u32(np, "snps,wr_osr_lmt", &axi->axi_wr_osr_lmt))
                axi->axi_wr_osr_lmt = 1;

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 5b2bece81448dc4ca1a365171788bb3576cea284..eaaee329ef9d7c0d903d3799ab5005960296d695 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -133,10 +133,7 @@ struct stmmac_axi {
        u32 axi_blen_regval;
        bool axi_lpi_en;
        bool axi_xit_frm;
-       bool axi_kbbe;
        bool axi_fb;
-       bool axi_mb;
-       bool axi_rb;
 };
 
 struct stmmac_rxq_cfg {