net: pch_gbe: remove mii_ethtool_gset() error handling

mii_ethtool_gset() does not return any errors, so error handling can be
omitted to make code more simple.

Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index bc35d57..ec3e558 100644 (file)
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -1031,13 +1031,7 @@ static void pch_gbe_watchdog(struct timer_list *t)
                struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET };
                netdev->tx_queue_len = adapter->tx_queue_len;
                /* mii library handles link maintenance tasks */
-               if (mii_ethtool_gset(&adapter->mii, &cmd)) {
-                       netdev_err(netdev, "ethtool get setting Error\n");
-                       mod_timer(&adapter->watchdog_timer,
-                                 round_jiffies(jiffies +
-                                               PCH_GBE_WATCHDOG_PERIOD));
-                       return;
-               }
+               mii_ethtool_gset(&adapter->mii, &cmd);
                hw->mac.link_speed = ethtool_cmd_speed(&cmd);
                hw->mac.link_duplex = cmd.duplex;
                /* Set the RGMII control. */

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c
index ed83204..3426f6f 100644 (file)
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c
@@ -301,9 +301,7 @@ void pch_gbe_phy_init_setting(struct pch_gbe_hw *hw)
        int ret;
        u16 mii_reg;
 
-       ret = mii_ethtool_gset(&adapter->mii, &cmd);
-       if (ret)
-               netdev_err(adapter->netdev, "Error: mii_ethtool_gset\n");
+       mii_ethtool_gset(&adapter->mii, &cmd);
 
        ethtool_cmd_speed_set(&cmd, hw->mac.link_speed);
        cmd.duplex = hw->mac.link_duplex;