net: stmmac: replace the has_sun8i field with a flag

Drop the boolean field of the plat_stmmacenet_data structure in favor of a
simple bitfield flag.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20230710090001.303225-5-brgl@bgdev.pl
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index 1e714380d1250be410b1e17a7fad40ae0b6c4b09..2b5ebb15bfda88f8ddba1b1db64c255e6b1b830d 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -1227,7 +1227,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)
        plat_dat->interface = interface;
        plat_dat->rx_coe = STMMAC_RX_COE_TYPE2;
        plat_dat->tx_coe = 1;
-       plat_dat->has_sun8i = true;
+       plat_dat->flags |= STMMAC_FLAG_HAS_SUN8I;
        plat_dat->bsp_priv = gmac;
        plat_dat->init = sun8i_dwmac_init;
        plat_dat->exit = sun8i_dwmac_exit;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a1a59af3961dc74d1db7416d0ede793193793c99..3df32658b5bb4ba7d145ab0b83c28e4d98d7b320 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -325,7 +325,7 @@ static void stmmac_clk_csr_set(struct stmmac_priv *priv)
                        priv->clk_csr = STMMAC_CSR_250_300M;
        }
 
-       if (priv->plat->has_sun8i) {
+       if (priv->plat->flags & STMMAC_FLAG_HAS_SUN8I) {
                if (clk_rate > 160000000)
                        priv->clk_csr = 0x03;
                else if (clk_rate > 80000000)
@@ -6856,7 +6856,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
        int ret;
 
        /* dwmac-sun8i only work in chain mode */
-       if (priv->plat->has_sun8i)
+       if (priv->plat->flags & STMMAC_FLAG_HAS_SUN8I)
                chain_mode = 1;
        priv->chain_mode = chain_mode;
 

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 15fb07cc89c838e2ab4bea308165ddad32033ba9..66dcf84d024aa5c38d9aeecc8cf1174a33361272 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -207,6 +207,7 @@ struct dwmac4_addrs {
 #define STMMAC_FLAG_HAS_INTEGRATED_PCS         BIT(0)
 #define STMMAC_FLAG_SPH_DISABLE                        BIT(1)
 #define STMMAC_FLAG_USE_PHY_WOL                        BIT(2)
+#define STMMAC_FLAG_HAS_SUN8I                  BIT(3)
 
 struct plat_stmmacenet_data {
        int bus_id;
@@ -270,7 +271,6 @@ struct plat_stmmacenet_data {
        struct reset_control *stmmac_ahb_rst;
        struct stmmac_axi *axi;
        int has_gmac4;
-       bool has_sun8i;
        bool tso_en;
        int rss_en;
        int mac_port_sel_speed;