4 files changed, 10 insertions, 20 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 935784f736b3..298e0f463c56 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -133,7 +133,7 @@ static void del_nbp(struct net_bridge_port *p)
         struct net_bridge *br = p->br;
         struct net_device *dev = p->dev;
 
-        sysfs_remove_link(&br->ifobj, dev->name);
+        sysfs_remove_link(br->ifobj, dev->name);
 
         dev_set_promiscuity(dev, -1);
 
@@ -258,12 +258,6 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
         p->state = BR_STATE_DISABLED;
         br_stp_port_timer_init(p);
 
-        kobject_init(&p->kobj);
-        kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR);
-        p->kobj.ktype = &brport_ktype;
-        p->kobj.parent = &(dev->dev.kobj);
-        p->kobj.kset = NULL;
-
         return p;
 }
 
@@ -379,7 +373,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
         if (IS_ERR(p))
                 return PTR_ERR(p);
 
-        err = kobject_add(&p->kobj);
+        err = kobject_init_and_add(&p->kobj, &brport_ktype, &(dev->dev.kobj),
+                                   SYSFS_BRIDGE_PORT_ATTR);
         if (err)
                 goto err0;
 
@@ -416,6 +411,7 @@ err2:
         br_fdb_delete_by_port(br, p, 1);
 err1:
         kobject_del(&p->kobj);
+        return err;
 err0:
         kobject_put(&p->kobj);
         return err;
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index f666f7b28ff5..c11b554fd109 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -124,7 +124,7 @@ struct net_bridge
         struct timer_list               tcn_timer;
         struct timer_list               topology_change_timer;
         struct timer_list               gc_timer;
-        struct kobject                  ifobj;
+        struct kobject                  *ifobj;
 };
 
 extern struct notifier_block br_device_notifier;
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 3312e8f2abe4..9cf0538d1717 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -426,16 +426,10 @@ int br_sysfs_addbr(struct net_device *dev)
                 goto out2;
         }
 
-
-        kobject_set_name(&br->ifobj, SYSFS_BRIDGE_PORT_SUBDIR);
-        br->ifobj.ktype = NULL;
-        br->ifobj.kset = NULL;
-        br->ifobj.parent = brobj;
-
-        err = kobject_register(&br->ifobj);
-        if (err) {
+        br->ifobj = kobject_create_and_add(SYSFS_BRIDGE_PORT_SUBDIR, brobj);
+        if (!br->ifobj) {
                 pr_info("%s: can't add kobject (directory) %s/%s\n",
-                        __FUNCTION__, dev->name, kobject_name(&br->ifobj));
+                        __FUNCTION__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR);
                 goto out3;
         }
         return 0;
@@ -453,7 +447,7 @@ void br_sysfs_delbr(struct net_device *dev)
         struct kobject *kobj = &dev->dev.kobj;
         struct net_bridge *br = netdev_priv(dev);
 
-        kobject_unregister(&br->ifobj);
+        kobject_put(br->ifobj);
         sysfs_remove_bin_file(kobj, &bridge_forward);
         sysfs_remove_group(kobj, &bridge_group);
 }
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index 79db51fcb476..02b2d50cce4d 100644
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
@@ -229,7 +229,7 @@ int br_sysfs_addif(struct net_bridge_port *p)
                         goto out2;
         }
 
-        err= sysfs_create_link(&br->ifobj, &p->kobj, p->dev->name);
+        err = sysfs_create_link(br->ifobj, &p->kobj, p->dev->name);
 out2:
         return err;
 }