net: stmmac: dwmac-rk: Remove unneeded GRF and peripheral GRF checks

Now that GRF, and peripheral GRF where needed, is validated at probe
time there is no longer any need to check and log an error in each SoC
specific operation.

Remove unneeded IS_ERR() checks and early bail out from each SoC
specific operation.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250308213720.2517944-4-jonas@kwiboo.se
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 5615f01..3424635 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -102,13 +102,6 @@ struct rk_priv_data {
 
 static void px30_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        regmap_write(bsp_priv->grf, PX30_GRF_GMAC_CON1,
                     PX30_GMAC_PHY_INTF_SEL_RMII);
 }
@@ -182,13 +175,6 @@ static const struct rk_gmac_ops px30_ops = {
 static void rk3128_set_to_rgmii(struct rk_priv_data *bsp_priv,
                                int tx_delay, int rx_delay)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3128_GRF_MAC_CON1,
                     RK3128_GMAC_PHY_INTF_SEL_RGMII |
                     RK3128_GMAC_RMII_MODE_CLR);
@@ -200,13 +186,6 @@ static void rk3128_set_to_rgmii(struct rk_priv_data *bsp_priv,
 
 static void rk3128_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3128_GRF_MAC_CON1,
                     RK3128_GMAC_PHY_INTF_SEL_RMII | RK3128_GMAC_RMII_MODE);
 }
@@ -215,11 +194,6 @@ static void rk3128_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        if (speed == 10)
                regmap_write(bsp_priv->grf, RK3128_GRF_MAC_CON1,
                             RK3128_GMAC_CLK_2_5M);
@@ -237,11 +211,6 @@ static void rk3128_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        if (speed == 10) {
                regmap_write(bsp_priv->grf, RK3128_GRF_MAC_CON1,
                             RK3128_GMAC_RMII_CLK_2_5M |
@@ -298,13 +267,6 @@ static const struct rk_gmac_ops rk3128_ops = {
 static void rk3228_set_to_rgmii(struct rk_priv_data *bsp_priv,
                                int tx_delay, int rx_delay)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3228_GRF_MAC_CON1,
                     RK3228_GMAC_PHY_INTF_SEL_RGMII |
                     RK3228_GMAC_RMII_MODE_CLR |
@@ -317,13 +279,6 @@ static void rk3228_set_to_rgmii(struct rk_priv_data *bsp_priv,
 
 static void rk3228_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3228_GRF_MAC_CON1,
                     RK3228_GMAC_PHY_INTF_SEL_RMII |
                     RK3228_GMAC_RMII_MODE);
@@ -336,11 +291,6 @@ static void rk3228_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        if (speed == 10)
                regmap_write(bsp_priv->grf, RK3228_GRF_MAC_CON1,
                             RK3228_GMAC_CLK_2_5M);
@@ -358,11 +308,6 @@ static void rk3228_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        if (speed == 10)
                regmap_write(bsp_priv->grf, RK3228_GRF_MAC_CON1,
                             RK3228_GMAC_RMII_CLK_2_5M |
@@ -420,13 +365,6 @@ static const struct rk_gmac_ops rk3228_ops = {
 static void rk3288_set_to_rgmii(struct rk_priv_data *bsp_priv,
                                int tx_delay, int rx_delay)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1,
                     RK3288_GMAC_PHY_INTF_SEL_RGMII |
                     RK3288_GMAC_RMII_MODE_CLR);
@@ -438,13 +376,6 @@ static void rk3288_set_to_rgmii(struct rk_priv_data *bsp_priv,
 
 static void rk3288_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1,
                     RK3288_GMAC_PHY_INTF_SEL_RMII | RK3288_GMAC_RMII_MODE);
 }
@@ -453,11 +384,6 @@ static void rk3288_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        if (speed == 10)
                regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1,
                             RK3288_GMAC_CLK_2_5M);
@@ -475,11 +401,6 @@ static void rk3288_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        if (speed == 10) {
                regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1,
                             RK3288_GMAC_RMII_CLK_2_5M |
@@ -512,13 +433,6 @@ static const struct rk_gmac_ops rk3288_ops = {
 
 static void rk3308_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3308_GRF_MAC_CON0,
                     RK3308_GMAC_PHY_INTF_SEL_RMII);
 }
@@ -527,11 +441,6 @@ static void rk3308_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        if (speed == 10) {
                regmap_write(bsp_priv->grf, RK3308_GRF_MAC_CON0,
                             RK3308_GMAC_SPEED_10M);
@@ -584,13 +493,6 @@ static const struct rk_gmac_ops rk3308_ops = {
 static void rk3328_set_to_rgmii(struct rk_priv_data *bsp_priv,
                                int tx_delay, int rx_delay)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3328_GRF_MAC_CON1,
                     RK3328_GMAC_PHY_INTF_SEL_RGMII |
                     RK3328_GMAC_RMII_MODE_CLR |
@@ -604,14 +506,8 @@ static void rk3328_set_to_rgmii(struct rk_priv_data *bsp_priv,
 
 static void rk3328_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
        unsigned int reg;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        reg = bsp_priv->integrated_phy ? RK3328_GRF_MAC_CON2 :
                  RK3328_GRF_MAC_CON1;
 
@@ -624,11 +520,6 @@ static void rk3328_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        if (speed == 10)
                regmap_write(bsp_priv->grf, RK3328_GRF_MAC_CON1,
                             RK3328_GMAC_CLK_2_5M);
@@ -647,11 +538,6 @@ static void rk3328_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)
        struct device *dev = &bsp_priv->pdev->dev;
        unsigned int reg;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        reg = bsp_priv->integrated_phy ? RK3328_GRF_MAC_CON2 :
                  RK3328_GRF_MAC_CON1;
 
@@ -712,13 +598,6 @@ static const struct rk_gmac_ops rk3328_ops = {
 static void rk3366_set_to_rgmii(struct rk_priv_data *bsp_priv,
                                int tx_delay, int rx_delay)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3366_GRF_SOC_CON6,
                     RK3366_GMAC_PHY_INTF_SEL_RGMII |
                     RK3366_GMAC_RMII_MODE_CLR);
@@ -730,13 +609,6 @@ static void rk3366_set_to_rgmii(struct rk_priv_data *bsp_priv,
 
 static void rk3366_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3366_GRF_SOC_CON6,
                     RK3366_GMAC_PHY_INTF_SEL_RMII | RK3366_GMAC_RMII_MODE);
 }
@@ -745,11 +617,6 @@ static void rk3366_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        if (speed == 10)
                regmap_write(bsp_priv->grf, RK3366_GRF_SOC_CON6,
                             RK3366_GMAC_CLK_2_5M);
@@ -767,11 +634,6 @@ static void rk3366_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        if (speed == 10) {
                regmap_write(bsp_priv->grf, RK3366_GRF_SOC_CON6,
                             RK3366_GMAC_RMII_CLK_2_5M |
@@ -823,13 +685,6 @@ static const struct rk_gmac_ops rk3366_ops = {
 static void rk3368_set_to_rgmii(struct rk_priv_data *bsp_priv,
                                int tx_delay, int rx_delay)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3368_GRF_SOC_CON15,
                     RK3368_GMAC_PHY_INTF_SEL_RGMII |
                     RK3368_GMAC_RMII_MODE_CLR);
@@ -841,13 +696,6 @@ static void rk3368_set_to_rgmii(struct rk_priv_data *bsp_priv,
 
 static void rk3368_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3368_GRF_SOC_CON15,
                     RK3368_GMAC_PHY_INTF_SEL_RMII | RK3368_GMAC_RMII_MODE);
 }
@@ -856,11 +704,6 @@ static void rk3368_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        if (speed == 10)
                regmap_write(bsp_priv->grf, RK3368_GRF_SOC_CON15,
                             RK3368_GMAC_CLK_2_5M);
@@ -878,11 +721,6 @@ static void rk3368_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        if (speed == 10) {
                regmap_write(bsp_priv->grf, RK3368_GRF_SOC_CON15,
                             RK3368_GMAC_RMII_CLK_2_5M |
@@ -934,13 +772,6 @@ static const struct rk_gmac_ops rk3368_ops = {
 static void rk3399_set_to_rgmii(struct rk_priv_data *bsp_priv,
                                int tx_delay, int rx_delay)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3399_GRF_SOC_CON5,
                     RK3399_GMAC_PHY_INTF_SEL_RGMII |
                     RK3399_GMAC_RMII_MODE_CLR);
@@ -952,13 +783,6 @@ static void rk3399_set_to_rgmii(struct rk_priv_data *bsp_priv,
 
 static void rk3399_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RK3399_GRF_SOC_CON5,
                     RK3399_GMAC_PHY_INTF_SEL_RMII | RK3399_GMAC_RMII_MODE);
 }
@@ -967,11 +791,6 @@ static void rk3399_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        if (speed == 10)
                regmap_write(bsp_priv->grf, RK3399_GRF_SOC_CON5,
                             RK3399_GMAC_CLK_2_5M);
@@ -989,11 +808,6 @@ static void rk3399_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        if (speed == 10) {
                regmap_write(bsp_priv->grf, RK3399_GRF_SOC_CON5,
                             RK3399_GMAC_RMII_CLK_2_5M |
@@ -1038,14 +852,8 @@ static const struct rk_gmac_ops rk3399_ops = {
 static void rk3568_set_to_rgmii(struct rk_priv_data *bsp_priv,
                                int tx_delay, int rx_delay)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
        u32 con0, con1;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        con0 = (bsp_priv->id == 1) ? RK3568_GRF_GMAC1_CON0 :
                                     RK3568_GRF_GMAC0_CON0;
        con1 = (bsp_priv->id == 1) ? RK3568_GRF_GMAC1_CON1 :
@@ -1063,14 +871,8 @@ static void rk3568_set_to_rgmii(struct rk_priv_data *bsp_priv,
 
 static void rk3568_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
        u32 con1;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        con1 = (bsp_priv->id == 1) ? RK3568_GRF_GMAC1_CON1 :
                                     RK3568_GRF_GMAC0_CON1;
        regmap_write(bsp_priv->grf, con1, RK3568_GMAC_PHY_INTF_SEL_RMII);
@@ -1148,14 +950,8 @@ static const struct rk_gmac_ops rk3568_ops = {
 static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv,
                                int tx_delay, int rx_delay)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
        unsigned int offset_con;
 
-       if (IS_ERR(bsp_priv->grf) || IS_ERR(bsp_priv->php_grf)) {
-               dev_err(dev, "Missing rockchip,grf or rockchip,php-grf property\n");
-               return;
-       }
-
        offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 :
                                         RK3576_GRF_GMAC_CON0;
 
@@ -1181,14 +977,8 @@ static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv,
 
 static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
        unsigned int offset_con;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 :
                                         RK3576_GRF_GMAC_CON0;
 
@@ -1308,14 +1098,8 @@ static const struct rk_gmac_ops rk3576_ops = {
 static void rk3588_set_to_rgmii(struct rk_priv_data *bsp_priv,
                                int tx_delay, int rx_delay)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
        u32 offset_con, id = bsp_priv->id;
 
-       if (IS_ERR(bsp_priv->grf) || IS_ERR(bsp_priv->php_grf)) {
-               dev_err(dev, "Missing rockchip,grf or rockchip,php_grf property\n");
-               return;
-       }
-
        offset_con = bsp_priv->id == 1 ? RK3588_GRF_GMAC_CON9 :
                                         RK3588_GRF_GMAC_CON8;
 
@@ -1336,13 +1120,6 @@ static void rk3588_set_to_rgmii(struct rk_priv_data *bsp_priv,
 
 static void rk3588_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->php_grf)) {
-               dev_err(dev, "%s: Missing rockchip,php_grf property\n", __func__);
-               return;
-       }
-
        regmap_write(bsp_priv->php_grf, RK3588_GRF_GMAC_CON0,
                     RK3588_GMAC_PHY_INTF_SEL_RMII(bsp_priv->id));
 
@@ -1426,13 +1203,6 @@ static const struct rk_gmac_ops rk3588_ops = {
 
 static void rv1108_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RV1108_GRF_GMAC_CON0,
                     RV1108_GMAC_PHY_INTF_SEL_RMII);
 }
@@ -1441,11 +1211,6 @@ static void rv1108_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)
 {
        struct device *dev = &bsp_priv->pdev->dev;
 
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        if (speed == 10) {
                regmap_write(bsp_priv->grf, RV1108_GRF_GMAC_CON0,
                             RV1108_GMAC_RMII_CLK_2_5M |
@@ -1494,13 +1259,6 @@ static const struct rk_gmac_ops rv1108_ops = {
 static void rv1126_set_to_rgmii(struct rk_priv_data *bsp_priv,
                                int tx_delay, int rx_delay)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "Missing rockchip,grf property\n");
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RV1126_GRF_GMAC_CON0,
                     RV1126_GMAC_PHY_INTF_SEL_RGMII |
                     RV1126_GMAC_M0_RXCLK_DLY_ENABLE |
@@ -1519,13 +1277,6 @@ static void rv1126_set_to_rgmii(struct rk_priv_data *bsp_priv,
 
 static void rv1126_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
-       struct device *dev = &bsp_priv->pdev->dev;
-
-       if (IS_ERR(bsp_priv->grf)) {
-               dev_err(dev, "%s: Missing rockchip,grf property\n", __func__);
-               return;
-       }
-
        regmap_write(bsp_priv->grf, RV1126_GRF_GMAC_CON0,
                     RV1126_GMAC_PHY_INTF_SEL_RMII);
 }