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

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

kobjects: fix up improper use of the kobject name field 

A number of different drivers incorrect access the kobject name field
directly.  This is not correct as the name might not be in the array.
Use the proper accessor function instead.
parent 5901d014

block/elevator.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static elevator_t *elevator_alloc(struct request_queue *q, 
	eq->ops = &e->ops;

	eq->elevator_type = e;

	kobject_init(&eq->kobj);

	snprintf(eq->kobj.name, KOBJ_NAME_LEN, "%s", "iosched");

	kobject_set_name(&eq->kobj, "%s", "iosched");

	eq->kobj.ktype = &elv_ktype;

	mutex_init(&eq->sysfs_lock);

block/ll_rw_blk.c

+1 −1
Original line number Diff line number Diff line
@@ -1854,7 +1854,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) 


	init_timer(&q->unplug_timer);



	snprintf(q->kobj.name, KOBJ_NAME_LEN, "%s", "queue");

	kobject_set_name(&q->kobj, "%s", "queue");

	q->kobj.ktype = &queue_ktype;

	kobject_init(&q->kobj);

drivers/acpi/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ int acpi_bus_set_power(acpi_handle handle, int state) 


	if (!device->flags.power_manageable) {

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable\n",

				device->dev.kobj.name));

				kobject_name(&device->dev.kobj)));

		return -ENODEV;

	}

	/*

drivers/cpufreq/cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ static int cpufreq_add_dev (struct sys_device * sys_dev) 
	/* prepare interface data */

	policy->kobj.parent = &sys_dev->kobj;

	policy->kobj.ktype = &ktype_cpufreq;

	strlcpy(policy->kobj.name, "cpufreq", KOBJ_NAME_LEN);

	kobject_set_name(&policy->kobj, "cpufreq");



	ret = kobject_register(&policy->kobj);

	if (ret) {

drivers/md/md.c

+1 −2
Original line number Diff line number Diff line
@@ -3076,8 +3076,7 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data) 
	mddev->gendisk = disk;

	mutex_unlock(&disks_mutex);

	mddev->kobj.parent = &disk->kobj;

	mddev->kobj.k_name = NULL;

	snprintf(mddev->kobj.name, KOBJ_NAME_LEN, "%s", "md");

	kobject_set_name(&mddev->kobj, "%s", "md");

	mddev->kobj.ktype = &md_ktype;

	if (kobject_register(&mddev->kobj))

		printk(KERN_WARNING "md: cannot register %s/md - name in use\n",