diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-17 23:05:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-24 20:40:31 -0800 |
| commit | e32cc7366d88eeba12d22272a73dd83fb570ccb0 (patch) | |
| tree | 40351aabab3dc4b0fe2b7c030688406d028aa7db /net/bridge/br_if.c | |
| parent | 1eada11c88251e0a30ce5690d2607bb4293b3564 (diff) | |
| download | linux-e32cc7366d88eeba12d22272a73dd83fb570ccb0.tar.gz linux-e32cc7366d88eeba12d22272a73dd83fb570ccb0.tar.bz2 linux-e32cc7366d88eeba12d22272a73dd83fb570ccb0.zip | |
Kobject: convert net/bridge/br_if.c to use kobject_init/add_ng()
This converts the code to use the new kobject functions, cleaning up the
logic in doing so.
Cc: Stephen Hemminger <shemminger@linux-foundation.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/bridge/br_if.c')
| -rw-r--r-- | net/bridge/br_if.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index dadec949d4fe..298e0f463c56 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -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; |