Skip to content

Commit ac1530c

Browse files
krzkbroonie
krzk
authored and
broonie
committed
regulator: Use container_of_const() when all types are const
Use container_of_const(), which is preferred over container_of(), when the argument 'ptr' and returned pointer are already const, for better code safety and readability. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com> Link: https://patch.msgid.link/20251126-container-of-const-regulator-v1-1-eeec378144d4@oss.qualcomm.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent a7d6255 commit ac1530c

6 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎drivers/regulator/hi6421-regulator.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ static unsigned int hi6421_regulator_ldo_get_mode(struct regulator_dev *rdev)
387387
const struct hi6421_regulator_info *info;
388388
unsigned int reg_val;
389389

390-
info = container_of(rdev->desc, struct hi6421_regulator_info, desc);
390+
info = container_of_const(rdev->desc, struct hi6421_regulator_info, desc);
391391
regmap_read(rdev->regmap, rdev->desc->enable_reg, &reg_val);
392392
if (reg_val & info->mode_mask)
393393
return REGULATOR_MODE_IDLE;
@@ -400,7 +400,7 @@ static unsigned int hi6421_regulator_buck_get_mode(struct regulator_dev *rdev)
400400
const struct hi6421_regulator_info *info;
401401
unsigned int reg_val;
402402

403-
info = container_of(rdev->desc, struct hi6421_regulator_info, desc);
403+
info = container_of_const(rdev->desc, struct hi6421_regulator_info, desc);
404404
regmap_read(rdev->regmap, rdev->desc->enable_reg, &reg_val);
405405
if (reg_val & info->mode_mask)
406406
return REGULATOR_MODE_STANDBY;
@@ -414,7 +414,7 @@ static int hi6421_regulator_ldo_set_mode(struct regulator_dev *rdev,
414414
const struct hi6421_regulator_info *info;
415415
unsigned int new_mode;
416416

417-
info = container_of(rdev->desc, struct hi6421_regulator_info, desc);
417+
info = container_of_const(rdev->desc, struct hi6421_regulator_info, desc);
418418
switch (mode) {
419419
case REGULATOR_MODE_NORMAL:
420420
new_mode = 0;
@@ -439,7 +439,7 @@ static int hi6421_regulator_buck_set_mode(struct regulator_dev *rdev,
439439
const struct hi6421_regulator_info *info;
440440
unsigned int new_mode;
441441

442-
info = container_of(rdev->desc, struct hi6421_regulator_info, desc);
442+
info = container_of_const(rdev->desc, struct hi6421_regulator_info, desc);
443443
switch (mode) {
444444
case REGULATOR_MODE_NORMAL:
445445
new_mode = 0;
@@ -464,7 +464,7 @@ hi6421_regulator_ldo_get_optimum_mode(struct regulator_dev *rdev,
464464
{
465465
const struct hi6421_regulator_info *info;
466466

467-
info = container_of(rdev->desc, struct hi6421_regulator_info, desc);
467+
info = container_of_const(rdev->desc, struct hi6421_regulator_info, desc);
468468

469469
if (load_uA > info->eco_microamp)
470470
return REGULATOR_MODE_NORMAL;

‎drivers/regulator/hi6421v530-regulator.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static unsigned int hi6421v530_regulator_ldo_get_mode(
110110
const struct hi6421v530_regulator_info *info;
111111
unsigned int reg_val;
112112

113-
info = container_of(rdev->desc, struct hi6421v530_regulator_info, rdesc);
113+
info = container_of_const(rdev->desc, struct hi6421v530_regulator_info, rdesc);
114114
regmap_read(rdev->regmap, rdev->desc->enable_reg, &reg_val);
115115

116116
if (reg_val & (info->mode_mask))
@@ -125,7 +125,7 @@ static int hi6421v530_regulator_ldo_set_mode(struct regulator_dev *rdev,
125125
const struct hi6421v530_regulator_info *info;
126126
unsigned int new_mode;
127127

128-
info = container_of(rdev->desc, struct hi6421v530_regulator_info, rdesc);
128+
info = container_of_const(rdev->desc, struct hi6421v530_regulator_info, rdesc);
129129
switch (mode) {
130130
case REGULATOR_MODE_NORMAL:
131131
new_mode = 0;

‎drivers/regulator/hi6421v600-regulator.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev)
121121
const struct hi6421_spmi_reg_info *sreg;
122122
unsigned int reg_val;
123123

124-
sreg = container_of(rdev->desc, struct hi6421_spmi_reg_info, desc);
124+
sreg = container_of_const(rdev->desc, struct hi6421_spmi_reg_info, desc);
125125
regmap_read(rdev->regmap, rdev->desc->enable_reg, &reg_val);
126126

127127
if (reg_val & sreg->eco_mode_mask)
@@ -136,7 +136,7 @@ static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev,
136136
const struct hi6421_spmi_reg_info *sreg;
137137
unsigned int val;
138138

139-
sreg = container_of(rdev->desc, struct hi6421_spmi_reg_info, desc);
139+
sreg = container_of_const(rdev->desc, struct hi6421_spmi_reg_info, desc);
140140
switch (mode) {
141141
case REGULATOR_MODE_NORMAL:
142142
val = 0;
@@ -162,7 +162,7 @@ hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev,
162162
{
163163
const struct hi6421_spmi_reg_info *sreg;
164164

165-
sreg = container_of(rdev->desc, struct hi6421_spmi_reg_info, desc);
165+
sreg = container_of_const(rdev->desc, struct hi6421_spmi_reg_info, desc);
166166

167167
if (!sreg->eco_uA || ((unsigned int)load_uA > sreg->eco_uA))
168168
return REGULATOR_MODE_NORMAL;

‎drivers/regulator/max77650-regulator.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static int max77650_regulator_is_enabled(struct regulator_dev *rdev)
6868
struct regmap *map;
6969
int val, rv, en;
7070

71-
rdesc = container_of(rdev->desc, struct max77650_regulator_desc, desc);
71+
rdesc = container_of_const(rdev->desc, struct max77650_regulator_desc, desc);
7272
map = rdev_get_regmap(rdev);
7373

7474
rv = regmap_read(map, rdesc->regB, &val);
@@ -85,7 +85,7 @@ static int max77650_regulator_enable(struct regulator_dev *rdev)
8585
const struct max77650_regulator_desc *rdesc;
8686
struct regmap *map;
8787

88-
rdesc = container_of(rdev->desc, struct max77650_regulator_desc, desc);
88+
rdesc = container_of_const(rdev->desc, struct max77650_regulator_desc, desc);
8989
map = rdev_get_regmap(rdev);
9090

9191
return regmap_update_bits(map, rdesc->regB,
@@ -98,7 +98,7 @@ static int max77650_regulator_disable(struct regulator_dev *rdev)
9898
const struct max77650_regulator_desc *rdesc;
9999
struct regmap *map;
100100

101-
rdesc = container_of(rdev->desc, struct max77650_regulator_desc, desc);
101+
rdesc = container_of_const(rdev->desc, struct max77650_regulator_desc, desc);
102102
map = rdev_get_regmap(rdev);
103103

104104
return regmap_update_bits(map, rdesc->regB,

‎drivers/regulator/mt6315-regulator.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static unsigned int mt6315_regulator_get_mode(struct regulator_dev *rdev)
8080
int ret, regval;
8181
u32 modeset_mask;
8282

83-
info = container_of(rdev->desc, struct mt6315_regulator_info, desc);
83+
info = container_of_const(rdev->desc, struct mt6315_regulator_info, desc);
8484
modeset_mask = init->modeset_mask[rdev_get_id(rdev)];
8585
ret = regmap_read(rdev->regmap, MT6315_BUCK_TOP_4PHASE_ANA_CON42, &regval);
8686
if (ret != 0) {
@@ -111,7 +111,7 @@ static int mt6315_regulator_set_mode(struct regulator_dev *rdev,
111111
int ret, val, curr_mode;
112112
u32 modeset_mask;
113113

114-
info = container_of(rdev->desc, struct mt6315_regulator_info, desc);
114+
info = container_of_const(rdev->desc, struct mt6315_regulator_info, desc);
115115
modeset_mask = init->modeset_mask[rdev_get_id(rdev)];
116116
curr_mode = mt6315_regulator_get_mode(rdev);
117117
switch (mode) {
@@ -165,7 +165,7 @@ static int mt6315_get_status(struct regulator_dev *rdev)
165165
int ret;
166166
u32 regval;
167167

168-
info = container_of(rdev->desc, struct mt6315_regulator_info, desc);
168+
info = container_of_const(rdev->desc, struct mt6315_regulator_info, desc);
169169
ret = regmap_read(rdev->regmap, info->status_reg, &regval);
170170
if (ret < 0) {
171171
dev_err(&rdev->dev, "Failed to get enable reg: %d\n", ret);

‎drivers/regulator/pf1550-regulator.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ static int pf1550_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
7171

7272
static int pf1550_set_suspend_enable(struct regulator_dev *rdev)
7373
{
74-
const struct pf1550_desc *desc = container_of(rdev->desc,
75-
struct pf1550_desc,
76-
desc);
74+
const struct pf1550_desc *desc = container_of_const(rdev->desc,
75+
struct pf1550_desc,
76+
desc);
7777
unsigned int val = desc->stby_enable_mask;
7878

7979
return regmap_update_bits(rdev->regmap, desc->stby_enable_reg,
@@ -82,9 +82,9 @@ static int pf1550_set_suspend_enable(struct regulator_dev *rdev)
8282

8383
static int pf1550_set_suspend_disable(struct regulator_dev *rdev)
8484
{
85-
const struct pf1550_desc *desc = container_of(rdev->desc,
86-
struct pf1550_desc,
87-
desc);
85+
const struct pf1550_desc *desc = container_of_const(rdev->desc,
86+
struct pf1550_desc,
87+
desc);
8888

8989
return regmap_update_bits(rdev->regmap, desc->stby_enable_reg,
9090
desc->stby_enable_mask, 0);
@@ -93,9 +93,9 @@ static int pf1550_set_suspend_disable(struct regulator_dev *rdev)
9393
static int pf1550_buck_set_table_suspend_voltage(struct regulator_dev *rdev,
9494
int uV)
9595
{
96-
const struct pf1550_desc *desc = container_of(rdev->desc,
97-
struct pf1550_desc,
98-
desc);
96+
const struct pf1550_desc *desc = container_of_const(rdev->desc,
97+
struct pf1550_desc,
98+
desc);
9999
int ret;
100100

101101
ret = regulator_map_voltage_ascend(rdev, uV, uV);
@@ -111,9 +111,9 @@ static int pf1550_buck_set_table_suspend_voltage(struct regulator_dev *rdev,
111111
static int pf1550_buck_set_linear_suspend_voltage(struct regulator_dev *rdev,
112112
int uV)
113113
{
114-
const struct pf1550_desc *desc = container_of(rdev->desc,
115-
struct pf1550_desc,
116-
desc);
114+
const struct pf1550_desc *desc = container_of_const(rdev->desc,
115+
struct pf1550_desc,
116+
desc);
117117
int ret;
118118

119119
ret = regulator_map_voltage_linear(rdev, uV, uV);

0 commit comments

Comments
 (0)