linux: rtl836x: rename rtl836*_hw_init to rtl836*_setup

[openwrt.git] / target / linux / generic / files / drivers / net / phy / rtl8367.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8367.c b/target/linux/generic/files/drivers/net/phy/rtl8367.c
index 917976e..9959ee3 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8367.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8367.c
@@ -1071,7 +1071,7 @@ static int rtl8367_led_blinkrate_set(struct rtl8366_smi *smi, unsigned int rate)
        return 0;
 }
 
-static int rtl8367_hw_init(struct rtl8366_smi *smi)
+static int rtl8367_setup(struct rtl8366_smi *smi)
 {
        struct rtl8367_platform_data *pdata;
        int err;
@@ -1485,7 +1485,7 @@ static int rtl8367_sw_reset_switch(struct switch_dev *dev)
                return err;
 
 
-       err = rtl8367_hw_init(smi);
+       err = rtl8367_setup(smi);
        if (err)
                return err;
 
@@ -1635,18 +1635,6 @@ static int rtl8367_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
        return err;
 }
 
-static int rtl8367_setup(struct rtl8366_smi *smi)
-{
-       int ret;
-
-       ret = rtl8367_reset_chip(smi);
-       if (ret)
-               return ret;
-
-       ret = rtl8367_hw_init(smi);
-       return ret;
-}
-
 static int rtl8367_detect(struct rtl8366_smi *smi)
 {
        u32 rtl_no = 0;
@@ -1686,6 +1674,7 @@ static int rtl8367_detect(struct rtl8366_smi *smi)
 
 static struct rtl8366_smi_ops rtl8367_smi_ops = {
        .detect         = rtl8367_detect,
+       .reset_chip     = rtl8367_reset_chip,
        .setup          = rtl8367_setup,
 
        .mii_read       = rtl8367_mii_read,