aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-11-01 22:55:10 -0400
committerLiam Girdwood <lrg@slimlogic.co.uk>2009-01-08 15:10:29 -0500
commit812460a927c1d0dc1fbdbec9aa07de1b04043d83 (patch)
tree60e872faf3cf8efadcb72543c2fdef8ae336a359 /drivers/regulator
parent9e42d0cf5020aaf217433cad1a224745241d212a (diff)
regulator: struct device - replace bus_id with dev_name(), dev_set_name()
This patch is part of a larger patch series which will remove the "char bus_id[20]" name string from struct device. The device name is managed in the kobject anyway, and without any size limitation, and just needlessly copied into "struct device". To set and read the device name dev_name(dev) and dev_set_name(dev) must be used. If your code uses static kobjects, which it shouldn't do, "const char *init_name" can be used to statically provide the name the registered device should have. At registration time, the init_name field is cleared, to enforce the use of dev_name(dev) to access the device name at a later time. We need to get rid of all occurrences of bus_id in the entire tree to be able to enable the new interface. Please apply this patch, and possibly convert any remaining remaining occurrences of bus_id. We want to submit a patch to -next, which will remove bus_id from "struct device", to find the remaining pieces to convert, and finally switch over to the new api, which will remove the 20 bytes array and does no longer have a size limitation. Thanks, Kay From: Kay Sievers <kay.sievers@vrfy.org> Subject: regulator: struct device - replace bus_id with dev_name(), dev_set_name() Cc: Liam Girdwood <lrg@slimlogic.co.uk> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-Off-By: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 02a774424e8d..9a644d41b813 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1779,8 +1779,8 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
1779 /* register with sysfs */ 1779 /* register with sysfs */
1780 rdev->dev.class = &regulator_class; 1780 rdev->dev.class = &regulator_class;
1781 rdev->dev.parent = dev; 1781 rdev->dev.parent = dev;
1782 snprintf(rdev->dev.bus_id, sizeof(rdev->dev.bus_id), 1782 dev_set_name(&rdev->dev, "regulator.%d",
1783 "regulator.%d", atomic_inc_return(&regulator_no) - 1); 1783 atomic_inc_return(&regulator_no) - 1);
1784 ret = device_register(&rdev->dev); 1784 ret = device_register(&rdev->dev);
1785 if (ret != 0) { 1785 if (ret != 0) {
1786 kfree(rdev); 1786 kfree(rdev);