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

Kobject: convert drivers/* from kobject_unregister() to kobject_put() 



There is no need for kobject_unregister() anymore, thanks to Kay's
kobject cleanup changes, so replace all instances of it with
kobject_put().


Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 38a382ae

drivers/base/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ int bus_add_driver(struct device_driver *drv) 
	kobject_uevent(&priv->kobj, KOBJ_ADD);

	return error;

out_unregister:

	kobject_unregister(&priv->kobj);

	kobject_put(&priv->kobj);

out_put_bus:

	bus_put(bus);

	return error;
@@ -708,7 +708,7 @@ void bus_remove_driver(struct device_driver * drv) 
	pr_debug("bus: '%s': remove driver %s\n", drv->bus->name, drv->name);

	driver_detach(drv);

	module_remove_driver(drv);

	kobject_unregister(&drv->p->kobj);

	kobject_put(&drv->p->kobj);

	bus_put(drv->bus);

}

drivers/base/sys.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ void sysdev_unregister(struct sys_device * sysdev) 
	}

	mutex_unlock(&sysdev_drivers_lock);



	kobject_unregister(&sysdev->kobj);

	kobject_put(&sysdev->kobj);

}

drivers/block/pktcdvd.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static struct pktcdvd_kobj* pkt_kobj_create(struct pktcdvd_device *pd, 
static void pkt_kobj_remove(struct pktcdvd_kobj *p)

{

	if (p)

		kobject_unregister(&p->kobj);

		kobject_put(&p->kobj);

}

/*

 * default release function for pktcdvd kernel objects.

drivers/cpufreq/cpufreq.c

+1 −3
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ err_out_unregister: 
		cpufreq_cpu_data[j] = NULL;

	spin_unlock_irqrestore(&cpufreq_driver_lock, flags);



	kobject_unregister(&policy->kobj);

	kobject_put(&policy->kobj);

	wait_for_completion(&policy->kobj_unregister);



err_out_driver_exit:
@@ -1030,8 +1030,6 @@ static int __cpufreq_remove_dev (struct sys_device * sys_dev) 


	unlock_policy_rwsem_write(cpu);



	kobject_unregister(&data->kobj);



	kobject_put(&data->kobj);



	/* we need to make sure that the underlying kobj is actually

drivers/cpuidle/sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static struct kobj_type ktype_state_cpuidle = { 


static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i)

{

	kobject_unregister(&device->kobjs[i]->kobj);

	kobject_put(&device->kobjs[i]->kobj);

	wait_for_completion(&device->kobjs[i]->kobj_unregister);

	kfree(device->kobjs[i]);

	device->kobjs[i] = NULL;
@@ -358,5 +358,5 @@ void cpuidle_remove_sysfs(struct sys_device *sysdev) 
	struct cpuidle_device *dev;



	dev = per_cpu(cpuidle_devices, cpu);

	kobject_unregister(&dev->kobj);

	kobject_put(&dev->kobj);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE