Skip to content

Commit a33b25f

Browse files
RishiGupta12broonie
authored andcommitted
regulator: da9063: fix code formatting warnings and errors
This commit fixes following errors & warnings in this driver as reported by checkpatch.pl: - WARNING: Prefer 'unsigned int' to bare use of 'unsigned' - WARNING: line over 80 characters - ERROR: space prohibited before that ',' (ctx:WxW) - ERROR: code indent should use tabs where possible - WARNING: Block comments use * on subsequent lines Signed-off-by: Rishi Gupta <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 4d49177 commit a33b25f

File tree

1 file changed

+34
-24
lines changed

1 file changed

+34
-24
lines changed

drivers/regulator/da9063-regulator.c

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct da9063_regulator_data {
6666
};
6767

6868
struct da9063_regulators_pdata {
69-
unsigned n_regulators;
69+
unsigned int n_regulators;
7070
struct da9063_regulator_data *regulator_data;
7171
};
7272

@@ -131,7 +131,7 @@ struct da9063_regulator_info {
131131
/* Defines asignment of regulators info table to chip model */
132132
struct da9063_dev_model {
133133
const struct da9063_regulator_info *regulator_info;
134-
unsigned n_regulators;
134+
unsigned int n_regulators;
135135
enum da9063_type type;
136136
};
137137

@@ -150,7 +150,7 @@ struct da9063_regulator {
150150

151151
/* Encapsulates all information for the regulators driver */
152152
struct da9063_regulators {
153-
unsigned n_regulators;
153+
unsigned int n_regulators;
154154
/* Array size to be defined during init. Keep at end. */
155155
struct da9063_regulator regulator[0];
156156
};
@@ -165,38 +165,46 @@ enum {
165165

166166
/* Regulator operations */
167167

168-
/* Current limits array (in uA) for BCORE1, BCORE2, BPRO.
169-
Entry indexes corresponds to register values. */
168+
/*
169+
* Current limits array (in uA) for BCORE1, BCORE2, BPRO.
170+
* Entry indexes corresponds to register values.
171+
*/
170172
static const unsigned int da9063_buck_a_limits[] = {
171173
500000, 600000, 700000, 800000, 900000, 1000000, 1100000, 1200000,
172174
1300000, 1400000, 1500000, 1600000, 1700000, 1800000, 1900000, 2000000
173175
};
174176

175-
/* Current limits array (in uA) for BMEM, BIO, BPERI.
176-
Entry indexes corresponds to register values. */
177+
/*
178+
* Current limits array (in uA) for BMEM, BIO, BPERI.
179+
* Entry indexes corresponds to register values.
180+
*/
177181
static const unsigned int da9063_buck_b_limits[] = {
178182
1500000, 1600000, 1700000, 1800000, 1900000, 2000000, 2100000, 2200000,
179183
2300000, 2400000, 2500000, 2600000, 2700000, 2800000, 2900000, 3000000
180184
};
181185

182-
/* Current limits array (in uA) for merged BCORE1 and BCORE2.
183-
Entry indexes corresponds to register values. */
186+
/*
187+
* Current limits array (in uA) for merged BCORE1 and BCORE2.
188+
* Entry indexes corresponds to register values.
189+
*/
184190
static const unsigned int da9063_bcores_merged_limits[] = {
185191
1000000, 1200000, 1400000, 1600000, 1800000, 2000000, 2200000, 2400000,
186192
2600000, 2800000, 3000000, 3200000, 3400000, 3600000, 3800000, 4000000
187193
};
188194

189-
/* Current limits array (in uA) for merged BMEM and BIO.
190-
Entry indexes corresponds to register values. */
195+
/*
196+
* Current limits array (in uA) for merged BMEM and BIO.
197+
* Entry indexes corresponds to register values.
198+
*/
191199
static const unsigned int da9063_bmem_bio_merged_limits[] = {
192200
3000000, 3200000, 3400000, 3600000, 3800000, 4000000, 4200000, 4400000,
193201
4600000, 4800000, 5000000, 5200000, 5400000, 5600000, 5800000, 6000000
194202
};
195203

196-
static int da9063_buck_set_mode(struct regulator_dev *rdev, unsigned mode)
204+
static int da9063_buck_set_mode(struct regulator_dev *rdev, unsigned int mode)
197205
{
198206
struct da9063_regulator *regl = rdev_get_drvdata(rdev);
199-
unsigned val;
207+
unsigned int val;
200208

201209
switch (mode) {
202210
case REGULATOR_MODE_FAST:
@@ -221,7 +229,7 @@ static int da9063_buck_set_mode(struct regulator_dev *rdev, unsigned mode)
221229
* There are 3 modes to map to: FAST, NORMAL, and STANDBY.
222230
*/
223231

224-
static unsigned da9063_buck_get_mode(struct regulator_dev *rdev)
232+
static unsigned int da9063_buck_get_mode(struct regulator_dev *rdev)
225233
{
226234
struct da9063_regulator *regl = rdev_get_drvdata(rdev);
227235
struct regmap_field *field;
@@ -271,10 +279,10 @@ static unsigned da9063_buck_get_mode(struct regulator_dev *rdev)
271279
* There are 2 modes to map to: NORMAL and STANDBY (sleep) for each state.
272280
*/
273281

274-
static int da9063_ldo_set_mode(struct regulator_dev *rdev, unsigned mode)
282+
static int da9063_ldo_set_mode(struct regulator_dev *rdev, unsigned int mode)
275283
{
276284
struct da9063_regulator *regl = rdev_get_drvdata(rdev);
277-
unsigned val;
285+
unsigned int val;
278286

279287
switch (mode) {
280288
case REGULATOR_MODE_NORMAL:
@@ -290,7 +298,7 @@ static int da9063_ldo_set_mode(struct regulator_dev *rdev, unsigned mode)
290298
return regmap_field_write(regl->sleep, val);
291299
}
292300

293-
static unsigned da9063_ldo_get_mode(struct regulator_dev *rdev)
301+
static unsigned int da9063_ldo_get_mode(struct regulator_dev *rdev)
294302
{
295303
struct da9063_regulator *regl = rdev_get_drvdata(rdev);
296304
struct regmap_field *field;
@@ -383,7 +391,8 @@ static int da9063_suspend_disable(struct regulator_dev *rdev)
383391
return regmap_field_write(regl->suspend, 0);
384392
}
385393

386-
static int da9063_buck_set_suspend_mode(struct regulator_dev *rdev, unsigned mode)
394+
static int da9063_buck_set_suspend_mode(struct regulator_dev *rdev,
395+
unsigned int mode)
387396
{
388397
struct da9063_regulator *regl = rdev_get_drvdata(rdev);
389398
int val;
@@ -405,10 +414,11 @@ static int da9063_buck_set_suspend_mode(struct regulator_dev *rdev, unsigned mod
405414
return regmap_field_write(regl->mode, val);
406415
}
407416

408-
static int da9063_ldo_set_suspend_mode(struct regulator_dev *rdev, unsigned mode)
417+
static int da9063_ldo_set_suspend_mode(struct regulator_dev *rdev,
418+
unsigned int mode)
409419
{
410420
struct da9063_regulator *regl = rdev_get_drvdata(rdev);
411-
unsigned val;
421+
unsigned int val;
412422

413423
switch (mode) {
414424
case REGULATOR_MODE_NORMAL:
@@ -593,7 +603,7 @@ static irqreturn_t da9063_ldo_lim_event(int irq, void *data)
593603
struct da9063_regulators *regulators = data;
594604
struct da9063 *hw = regulators->regulator[0].hw;
595605
struct da9063_regulator *regl;
596-
int bits, i , ret;
606+
int bits, i, ret;
597607

598608
ret = regmap_read(hw->regmap, DA9063_REG_STATUS_D, &bits);
599609
if (ret < 0)
@@ -605,10 +615,10 @@ static irqreturn_t da9063_ldo_lim_event(int irq, void *data)
605615
continue;
606616

607617
if (BIT(regl->info->oc_event.lsb) & bits) {
608-
regulator_lock(regl->rdev);
618+
regulator_lock(regl->rdev);
609619
regulator_notifier_call_chain(regl->rdev,
610620
REGULATOR_EVENT_OVER_CURRENT, NULL);
611-
regulator_unlock(regl->rdev);
621+
regulator_unlock(regl->rdev);
612622
}
613623
}
614624

@@ -833,7 +843,7 @@ static int da9063_regulator_probe(struct platform_device *pdev)
833843

834844
if (regl->info->suspend_sleep.reg) {
835845
regl->suspend_sleep = devm_regmap_field_alloc(&pdev->dev,
836-
da9063->regmap, regl->info->suspend_sleep);
846+
da9063->regmap, regl->info->suspend_sleep);
837847
if (IS_ERR(regl->suspend_sleep))
838848
return PTR_ERR(regl->suspend_sleep);
839849
}

0 commit comments

Comments
 (0)