generic: rtl8366: make rtl8366_{g,s}et_pvid static

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

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
index f23ec21..f71f4f2 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
@@ -15,7 +15,6 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>

-#include <linux/switch.h>

 #include <linux/rtl8366rb.h>
 
 #include "rtl8366_smi.h"
 #include <linux/rtl8366rb.h>
 
 #include "rtl8366_smi.h"


@@ -164,12 +163,6 @@
 #define RTL8366RB_VLAN_MEMBER_MASK     0xff
 #define RTL8366RB_VLAN_FID_MASK                0x7
 
 #define RTL8366RB_VLAN_MEMBER_MASK     0xff
 #define RTL8366RB_VLAN_FID_MASK                0x7
 

-struct rtl8366rb {
-       struct device           *parent;
-       struct rtl8366_smi      smi;
-       struct switch_dev       dev;
-};
-

 static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
        { 0,  0, 4, "IfInOctets"                                },
        { 0,  4, 4, "EtherStatsOctets"                          },
 static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
        { 0,  0, 4, "IfInOctets"                                },
        { 0,  4, 4, "EtherStatsOctets"                          },


@@ -220,22 +213,6 @@ static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
                        return err;                                     \
        } while (0)
 
                        return err;                                     \
        } while (0)
 

-static inline struct rtl8366rb *smi_to_rtl8366rb(struct rtl8366_smi *smi)
-{
-       return container_of(smi, struct rtl8366rb, smi);
-}
-
-static inline struct rtl8366rb *sw_to_rtl8366rb(struct switch_dev *sw)
-{
-       return container_of(sw, struct rtl8366rb, dev);
-}
-
-static inline struct rtl8366_smi *sw_to_rtl8366_smi(struct switch_dev *sw)
-{
-       struct rtl8366rb *rtl = sw_to_rtl8366rb(sw);
-       return &rtl->smi;
-}
-

 static int rtl8366rb_reset_chip(struct rtl8366_smi *smi)
 {
        int timeout = 10;
 static int rtl8366rb_reset_chip(struct rtl8366_smi *smi)
 {
        int timeout = 10;


@@ -898,18 +875,6 @@ static int rtl8366rb_sw_set_vlan_ports(struct switch_dev *dev,
        return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
 }
 
        return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
 }
 

-static int rtl8366rb_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       return rtl8366_get_pvid(smi, port, val);
-}
-
-static int rtl8366rb_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       return rtl8366_set_pvid(smi, port, val);
-}
-

 static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);


@@ -1021,30 +986,30 @@ static struct switch_dev rtl8366_switch_dev = {
 
        .get_vlan_ports = rtl8366rb_sw_get_vlan_ports,
        .set_vlan_ports = rtl8366rb_sw_set_vlan_ports,
 
        .get_vlan_ports = rtl8366rb_sw_get_vlan_ports,
        .set_vlan_ports = rtl8366rb_sw_set_vlan_ports,

-       .get_port_pvid = rtl8366rb_sw_get_port_pvid,
-       .set_port_pvid = rtl8366rb_sw_set_port_pvid,
+       .get_port_pvid = rtl8366_sw_get_port_pvid,
+       .set_port_pvid = rtl8366_sw_set_port_pvid,

        .reset_switch = rtl8366rb_sw_reset_switch,
 };
 
        .reset_switch = rtl8366rb_sw_reset_switch,
 };
 

-static int rtl8366rb_switch_init(struct rtl8366rb *rtl)
+static int rtl8366rb_switch_init(struct rtl8366_smi *smi)

 {
 {

-       struct switch_dev *dev = &rtl->dev;
+       struct switch_dev *dev = &smi->sw_dev;

        int err;
 
        memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));
        int err;
 
        memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));

-       dev->priv = rtl;
-       dev->devname = dev_name(rtl->parent);
+       dev->priv = smi;
+       dev->devname = dev_name(smi->parent);

 
        err = register_switch(dev, NULL);
        if (err)
 
        err = register_switch(dev, NULL);
        if (err)

-               dev_err(rtl->parent, "switch registration failed\n");
+               dev_err(smi->parent, "switch registration failed\n");

 
        return err;
 }
 
 
        return err;
 }
 

-static void rtl8366rb_switch_cleanup(struct rtl8366rb *rtl)
+static void rtl8366rb_switch_cleanup(struct rtl8366_smi *smi)

 {
 {

-       unregister_switch(&rtl->dev);
+       unregister_switch(&smi->sw_dev);

 }
 
 static int rtl8366rb_mii_read(struct mii_bus *bus, int addr, int reg)
 }
 
 static int rtl8366rb_mii_read(struct mii_bus *bus, int addr, int reg)


@@ -1079,9 +1044,8 @@ static int rtl8366rb_mii_bus_match(struct mii_bus *bus)
                bus->write == rtl8366rb_mii_write);
 }
 
                bus->write == rtl8366rb_mii_write);
 }
 

-static int rtl8366rb_setup(struct rtl8366rb *rtl)
+static int rtl8366rb_setup(struct rtl8366_smi *smi)

 {
 {

-       struct rtl8366_smi *smi = &rtl->smi;

        int ret;
 
        ret = rtl8366rb_reset_chip(smi);
        int ret;
 
        ret = rtl8366rb_reset_chip(smi);


@@ -1127,6 +1091,8 @@ static int rtl8366rb_detect(struct rtl8366_smi *smi)
 
 static struct rtl8366_smi_ops rtl8366rb_smi_ops = {
        .detect         = rtl8366rb_detect,
 
 static struct rtl8366_smi_ops rtl8366rb_smi_ops = {
        .detect         = rtl8366rb_detect,

+       .setup          = rtl8366rb_setup,
+

        .mii_read       = rtl8366rb_mii_read,
        .mii_write      = rtl8366rb_mii_write,
 
        .mii_read       = rtl8366rb_mii_read,
        .mii_write      = rtl8366rb_mii_write,
 


@@ -1143,7 +1109,6 @@ static int __init rtl8366rb_probe(struct platform_device *pdev)
 {
        static int rtl8366_smi_version_printed;
        struct rtl8366rb_platform_data *pdata;
 {
        static int rtl8366_smi_version_printed;
        struct rtl8366rb_platform_data *pdata;

-       struct rtl8366rb *rtl;

        struct rtl8366_smi *smi;
        int err;
 
        struct rtl8366_smi *smi;
        int err;
 


@@ -1158,17 +1123,12 @@ static int __init rtl8366rb_probe(struct platform_device *pdev)
                goto err_out;
        }
 
                goto err_out;
        }
 

-       rtl = kzalloc(sizeof(*rtl), GFP_KERNEL);
-       if (!rtl) {
-               dev_err(&pdev->dev, "no memory for private data\n");
+       smi = rtl8366_smi_alloc(&pdev->dev);
+       if (!smi) {

                err = -ENOMEM;
                goto err_out;
        }
 
                err = -ENOMEM;
                goto err_out;
        }
 

-       rtl->parent = &pdev->dev;
-
-       smi = &rtl->smi;
-       smi->parent = &pdev->dev;

        smi->gpio_sda = pdata->gpio_sda;
        smi->gpio_sck = pdata->gpio_sck;
        smi->ops = &rtl8366rb_smi_ops;
        smi->gpio_sda = pdata->gpio_sda;
        smi->gpio_sck = pdata->gpio_sck;
        smi->ops = &rtl8366rb_smi_ops;


@@ -1180,15 +1140,11 @@ static int __init rtl8366rb_probe(struct platform_device *pdev)
 
        err = rtl8366_smi_init(smi);
        if (err)
 
        err = rtl8366_smi_init(smi);
        if (err)

-               goto err_free_rtl;
+               goto err_free_smi;

 
 

-       platform_set_drvdata(pdev, rtl);
-
-       err = rtl8366rb_setup(rtl);
-       if (err)
-               goto err_clear_drvdata;
+       platform_set_drvdata(pdev, smi);

 
 

-       err = rtl8366rb_switch_init(rtl);
+       err = rtl8366rb_switch_init(smi);

        if (err)
                goto err_clear_drvdata;
 
        if (err)
                goto err_clear_drvdata;
 


@@ -1197,8 +1153,8 @@ static int __init rtl8366rb_probe(struct platform_device *pdev)
  err_clear_drvdata:
        platform_set_drvdata(pdev, NULL);
        rtl8366_smi_cleanup(smi);
  err_clear_drvdata:
        platform_set_drvdata(pdev, NULL);
        rtl8366_smi_cleanup(smi);

- err_free_rtl:
-       kfree(rtl);
+ err_free_smi:
+       kfree(smi);

  err_out:
        return err;
 }
  err_out:
        return err;
 }


@@ -1231,13 +1187,13 @@ static struct phy_driver rtl8366rb_phy_driver = {
 
 static int __devexit rtl8366rb_remove(struct platform_device *pdev)
 {
 
 static int __devexit rtl8366rb_remove(struct platform_device *pdev)
 {

-       struct rtl8366rb *rtl = platform_get_drvdata(pdev);
+       struct rtl8366_smi *smi = platform_get_drvdata(pdev);

 
 

-       if (rtl) {
-               rtl8366rb_switch_cleanup(rtl);
+       if (smi) {
+               rtl8366rb_switch_cleanup(smi);

                platform_set_drvdata(pdev, NULL);
                platform_set_drvdata(pdev, NULL);

-               rtl8366_smi_cleanup(&rtl->smi);
-               kfree(rtl);
+               rtl8366_smi_cleanup(smi);
+               kfree(smi);

        }
 
        return 0;
        }
 
        return 0;