Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[deliverable/linux.git] / drivers / net / ethernet / sun / niu.c

diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index fa322409bff33376dbedc59f6921a2337a60eebc..f28460ce24a7134a371dd148887cc5466e934f8b 100644 (file)
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -9360,7 +9360,7 @@ static ssize_t show_port_phy(struct device *dev,
                             struct device_attribute *attr, char *buf)
 {
        struct platform_device *plat_dev = to_platform_device(dev);
-       struct niu_parent *p = plat_dev->dev.platform_data;
+       struct niu_parent *p = dev_get_platdata(&plat_dev->dev);
        u32 port_phy = p->port_phy;
        char *orig_buf = buf;
        int i;
@@ -9390,7 +9390,7 @@ static ssize_t show_plat_type(struct device *dev,
                              struct device_attribute *attr, char *buf)
 {
        struct platform_device *plat_dev = to_platform_device(dev);
-       struct niu_parent *p = plat_dev->dev.platform_data;
+       struct niu_parent *p = dev_get_platdata(&plat_dev->dev);
        const char *type_str;
 
        switch (p->plat_type) {
@@ -9419,7 +9419,7 @@ static ssize_t __show_chan_per_port(struct device *dev,
                                    int rx)
 {
        struct platform_device *plat_dev = to_platform_device(dev);
-       struct niu_parent *p = plat_dev->dev.platform_data;
+       struct niu_parent *p = dev_get_platdata(&plat_dev->dev);
        char *orig_buf = buf;
        u8 *arr;
        int i;
@@ -9452,7 +9452,7 @@ static ssize_t show_num_ports(struct device *dev,
                              struct device_attribute *attr, char *buf)
 {
        struct platform_device *plat_dev = to_platform_device(dev);
-       struct niu_parent *p = plat_dev->dev.platform_data;
+       struct niu_parent *p = dev_get_platdata(&plat_dev->dev);
 
        return sprintf(buf, "%d\n", p->num_ports);
 }
@@ -9478,7 +9478,7 @@ static struct niu_parent *niu_new_parent(struct niu *np,
        if (IS_ERR(plat_dev))
                return NULL;
 
-       for (i = 0; attr_name(niu_parent_attributes[i]); i++) {
+       for (i = 0; niu_parent_attributes[i].attr.name; i++) {
                int err = device_create_file(&plat_dev->dev,
                                             &niu_parent_attributes[i]);
                if (err)