rtl8366_smi: separate gpio initialization

[openwrt.git] / target / linux / ar71xx / files / drivers / net / phy / rtl8366_smi.c

diff --git a/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c b/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c
index 7e27e42..abd1af0 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c
@@ -210,7 +210,8 @@ static const char *MIBCOUNTERS[] = {
 
 struct rtl8366_smi {
        struct device                      *parent;
-       struct rtl8366_smi_platform_data   *pdata;
+       unsigned int                       gpio_sda;
+       unsigned int                       gpio_sck;
        spinlock_t                         lock;
        struct mii_bus                     *mii_bus;
        struct switch_dev                  dev;
@@ -237,8 +238,8 @@ static inline void rtl8366_smi_clk_delay(struct rtl8366_smi *smi)
 
 static void rtl8366_smi_start(struct rtl8366_smi *smi)
 {
-       unsigned int sda = smi->pdata->gpio_sda;
-       unsigned int sck = smi->pdata->gpio_sck;
+       unsigned int sda = smi->gpio_sda;
+       unsigned int sck = smi->gpio_sck;
 
        /*
         * Set GPIO pins to output mode, with initial state:
@@ -266,8 +267,8 @@ static void rtl8366_smi_start(struct rtl8366_smi *smi)
 
 static void rtl8366_smi_stop(struct rtl8366_smi *smi)
 {
-       unsigned int sda = smi->pdata->gpio_sda;
-       unsigned int sck = smi->pdata->gpio_sck;
+       unsigned int sda = smi->gpio_sda;
+       unsigned int sck = smi->gpio_sck;
 
        rtl8366_smi_clk_delay(smi);
        gpio_set_value(sda, 0);
@@ -294,8 +295,8 @@ static void rtl8366_smi_stop(struct rtl8366_smi *smi)
 
 static void rtl8366_smi_write_bits(struct rtl8366_smi *smi, u32 data, u32 len)
 {
-       unsigned int sda = smi->pdata->gpio_sda;
-       unsigned int sck = smi->pdata->gpio_sck;
+       unsigned int sda = smi->gpio_sda;
+       unsigned int sck = smi->gpio_sck;
 
        for (; len > 0; len--) {
                rtl8366_smi_clk_delay(smi);
@@ -316,8 +317,8 @@ static void rtl8366_smi_write_bits(struct rtl8366_smi *smi, u32 data, u32 len)
 
 static void rtl8366_smi_read_bits(struct rtl8366_smi *smi, u32 len, u32 *data)
 {
-       unsigned int sda = smi->pdata->gpio_sda;
-       unsigned int sck = smi->pdata->gpio_sck;
+       unsigned int sda = smi->gpio_sda;
+       unsigned int sck = smi->gpio_sck;
 
        gpio_direction_input(sda);
 
@@ -1734,7 +1735,7 @@ static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
        smi->mii_bus->read = rtl8366_smi_mii_read;
        smi->mii_bus->write = rtl8366_smi_mii_write;
        snprintf(smi->mii_bus->id, MII_BUS_ID_SIZE, "%s",
-                       dev_name(smi->parent));
+                dev_name(smi->parent));
        smi->mii_bus->parent = smi->parent;
        smi->mii_bus->phy_mask = ~(0x1f);
        smi->mii_bus->irq = smi->mii_irq;
@@ -1800,6 +1801,46 @@ static int rtl8366_smi_setup(struct rtl8366_smi *smi)
        return 0;
 }
 
+static int __init rtl8366_smi_init(struct rtl8366_smi *smi)
+{
+       int err;
+
+       if (!smi->parent)
+               return -EINVAL;
+
+       err = gpio_request(smi->gpio_sda, dev_name(smi->parent));
+       if (err) {
+               dev_err(smi->parent, "gpio_request failed for %u, err=%d\n",
+                       smi->gpio_sda, err);
+               goto err_out;
+       }
+
+       err = gpio_request(smi->gpio_sck, dev_name(smi->parent));
+       if (err) {
+               dev_err(smi->parent, "gpio_request failed for %u, err=%d\n",
+                       smi->gpio_sck, err);
+               goto err_free_sda;
+       }
+
+       spin_lock_init(&smi->lock);
+
+       dev_info(smi->parent, "using GPIO pins %u (SDA) and %u (SCK)\n",
+                smi->gpio_sda, smi->gpio_sck);
+
+       return 0;
+
+ err_free_sda:
+       gpio_free(smi->gpio_sda);
+ err_out:
+       return err;
+}
+
+static void rtl8366_smi_cleanup(struct rtl8366_smi *smi)
+{
+       gpio_free(smi->gpio_sck);
+       gpio_free(smi->gpio_sda);
+}
+
 static int __init rtl8366_smi_probe(struct platform_device *pdev)
 {
        static int rtl8366_smi_version_printed;
@@ -1825,28 +1866,15 @@ static int __init rtl8366_smi_probe(struct platform_device *pdev)
                goto err_out;
        }
 
-       err = gpio_request(pdata->gpio_sda, dev_name(&pdev->dev));
-       if (err) {
-               dev_err(&pdev->dev, "gpio_request failed for %u, err=%d\n",
-                       pdata->gpio_sda, err);
-               goto err_free_smi;
-       }
-
-       err = gpio_request(pdata->gpio_sck, dev_name(&pdev->dev));
-       if (err) {
-               dev_err(&pdev->dev, "gpio_request failed for %u, err=%d\n",
-                       pdata->gpio_sck, err);
-               goto err_free_sda;
-       }
-
        smi->parent = &pdev->dev;
-       smi->pdata = pdata;
-       spin_lock_init(&smi->lock);
+       smi->gpio_sda = pdata->gpio_sda;
+       smi->gpio_sck = pdata->gpio_sck;
 
-       platform_set_drvdata(pdev, smi);
+       err = rtl8366_smi_init(smi);
+       if (err)
+               goto err_free_smi;
 
-       dev_info(&pdev->dev, "using GPIO pins %u (SDA) and %u (SCK)\n",
-                pdata->gpio_sda, pdata->gpio_sck);
+       platform_set_drvdata(pdev, smi);
 
        err = rtl8366_smi_setup(smi);
        if (err)
@@ -1866,9 +1894,6 @@ static int __init rtl8366_smi_probe(struct platform_device *pdev)
        rtl8366_smi_mii_cleanup(smi);
  err_clear_drvdata:
        platform_set_drvdata(pdev, NULL);
-       gpio_free(pdata->gpio_sck);
- err_free_sda:
-       gpio_free(pdata->gpio_sda);
  err_free_smi:
        kfree(smi);
  err_out:
@@ -1906,16 +1931,11 @@ static int __devexit rtl8366_smi_remove(struct platform_device *pdev)
        struct rtl8366_smi *smi = platform_get_drvdata(pdev);
 
        if (smi) {
-               struct rtl8366_smi_platform_data *pdata;
-
-               pdata = pdev->dev.platform_data;
-
                rtl8366_smi_switch_cleanup(smi);
                rtl8366_debugfs_remove(smi);
                rtl8366_smi_mii_cleanup(smi);
                platform_set_drvdata(pdev, NULL);
-               gpio_free(pdata->gpio_sck);
-               gpio_free(pdata->gpio_sda);
+               rtl8366_smi_cleanup(smi);
                kfree(smi);
        }
 
@@ -1931,7 +1951,7 @@ static struct platform_driver rtl8366_smi_driver = {
        .remove         = __devexit_p(rtl8366_smi_remove),
 };
 
-static int __init rtl8366_smi_init(void)
+static int __init rtl8366_smi_module_init(void)
 {
        int ret;
        ret = platform_driver_register(&rtl8366_smi_driver);
@@ -1948,7 +1968,7 @@ static int __init rtl8366_smi_init(void)
        platform_driver_unregister(&rtl8366_smi_driver);
        return ret;
 }
-module_init(rtl8366_smi_init);
+module_init(rtl8366_smi_module_init);
 
 static void __exit rtl8366_smi_exit(void)
 {