regulator: act8945a: Use rdev_get_id() to access id of regulator

Use rdev_get_id() instead of directly access rdev->desc->id.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/act8945a-regulator.c b/drivers/regulator/act8945a-regulator.c
index 603db77723b66de337b112459244de5bfd7454f3..caa61d306a69184d7143941de89184e3a4e50b6f 100644 (file)
--- a/drivers/regulator/act8945a-regulator.c
+++ b/drivers/regulator/act8945a-regulator.c
@@ -87,7 +87,8 @@ static const struct regulator_linear_range act8945a_voltage_ranges[] = {
 static int act8945a_set_suspend_state(struct regulator_dev *rdev, bool enable)
 {
        struct regmap *regmap = rdev->regmap;
-       int id = rdev->desc->id, reg, val;
+       int id = rdev_get_id(rdev);
+       int reg, val;
 
        switch (id) {
        case ACT8945A_ID_DCDC1:
@@ -159,7 +160,7 @@ static int act8945a_set_mode(struct regulator_dev *rdev, unsigned int mode)
 {
        struct act8945a_pmic *act8945a = rdev_get_drvdata(rdev);
        struct regmap *regmap = rdev->regmap;
-       int id = rdev->desc->id;
+       int id = rdev_get_id(rdev);
        int reg, ret, val = 0;
 
        switch (id) {
@@ -190,11 +191,11 @@ static int act8945a_set_mode(struct regulator_dev *rdev, unsigned int mode)
 
        switch (mode) {
        case REGULATOR_MODE_STANDBY:
-               if (rdev->desc->id > ACT8945A_ID_DCDC3)
+               if (id > ACT8945A_ID_DCDC3)
                        val = BIT(5);
                break;
        case REGULATOR_MODE_NORMAL:
-               if (rdev->desc->id <= ACT8945A_ID_DCDC3)
+               if (id <= ACT8945A_ID_DCDC3)
                        val = BIT(5);
                break;
        default:
@@ -213,7 +214,7 @@ static int act8945a_set_mode(struct regulator_dev *rdev, unsigned int mode)
 static unsigned int act8945a_get_mode(struct regulator_dev *rdev)
 {
        struct act8945a_pmic *act8945a = rdev_get_drvdata(rdev);
-       int id = rdev->desc->id;
+       int id = rdev_get_id(rdev);
 
        if (id < ACT8945A_ID_DCDC1 || id >= ACT8945A_ID_MAX)
                return -EINVAL;