From 72dca06f62c50415de3202f204200f58769d0b8b Mon Sep 17 00:00:00 2001 From: Aniroop Mathur Date: Sun, 28 Dec 2014 22:08:38 +0530 Subject: regulator: core: Avoid negative regulator no & initialize it to -1 This patch initializes regulator_no to -1 to avoid extra subtraction operation performed every time we register a regulator and avoid negative regulator no in its name. Signed-off-by: Aniroop Mathur Signed-off-by: Mark Brown --- drivers/regulator/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/regulator') diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index e225711bb8bc..4bc5ea9721c2 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3585,7 +3585,7 @@ regulator_register(const struct regulator_desc *regulator_desc, { const struct regulation_constraints *constraints = NULL; const struct regulator_init_data *init_data; - static atomic_t regulator_no = ATOMIC_INIT(0); + static atomic_t regulator_no = ATOMIC_INIT(-1); struct regulator_dev *rdev; struct device *dev; int ret, i; @@ -3658,8 +3658,8 @@ regulator_register(const struct regulator_desc *regulator_desc, /* register with sysfs */ rdev->dev.class = ®ulator_class; rdev->dev.parent = dev; - dev_set_name(&rdev->dev, "regulator.%d", - atomic_inc_return(®ulator_no) - 1); + dev_set_name(&rdev->dev, "regulator.%lu", + atomic_inc_return(®ulator_no)); ret = device_register(&rdev->dev); if (ret != 0) { put_device(&rdev->dev); -- cgit v1.2.3 From 39138818a4f5c62d70f35504477c2509f982f211 Mon Sep 17 00:00:00 2001 From: Aniroop Mathur Date: Mon, 29 Dec 2014 22:36:48 +0530 Subject: regulator: core: Fix format specifier warning Signed-off-by: Aniroop Mathur Signed-off-by: Mark Brown --- drivers/regulator/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/regulator') diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 4bc5ea9721c2..c2554d89d472 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3659,7 +3659,7 @@ regulator_register(const struct regulator_desc *regulator_desc, rdev->dev.class = ®ulator_class; rdev->dev.parent = dev; dev_set_name(&rdev->dev, "regulator.%lu", - atomic_inc_return(®ulator_no)); + (unsigned long) atomic_inc_return(®ulator_no)); ret = device_register(&rdev->dev); if (ret != 0) { put_device(&rdev->dev); -- cgit v1.2.3