Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e32cc736 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1eada11c

net/bridge/br_if.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -258,12 +258,6 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br, 
	p->state = BR_STATE_DISABLED;

	p->state = BR_STATE_DISABLED;

	br_stp_port_timer_init(p);

	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;

	return p;

}

}
@@ -379,7 +373,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) 
	if (IS_ERR(p))

	if (IS_ERR(p))

		return PTR_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)

	if (err)

		goto err0;

		goto err0;
@@ -416,6 +411,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) 
	br_fdb_delete_by_port(br, p, 1);

	br_fdb_delete_by_port(br, p, 1);

err1:

err1:

	kobject_del(&p->kobj);

	kobject_del(&p->kobj);

	return err;

err0:

err0:

	kobject_put(&p->kobj);

	kobject_put(&p->kobj);

	return err;

	return err;