Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
regulator
/
s2mps11.c
diff --git
a/kernel/drivers/regulator/s2mps11.c
b/kernel/drivers/regulator/s2mps11.c
index
8de1351
..
72fc3c3
100644
(file)
--- a/
kernel/drivers/regulator/s2mps11.c
+++ b/
kernel/drivers/regulator/s2mps11.c
@@
-517,7
+517,7
@@
static int s2mps14_regulator_enable(struct regulator_dev *rdev)
break;
default:
return -EINVAL;
break;
default:
return -EINVAL;
- }
;
+ }
return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,
rdev->desc->enable_mask, val);
return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,
rdev->desc->enable_mask, val);
@@
-540,7
+540,7
@@
static int s2mps14_regulator_set_suspend_disable(struct regulator_dev *rdev)
default:
state = S2MPS14_ENABLE_SUSPEND;
break;
default:
state = S2MPS14_ENABLE_SUSPEND;
break;
- }
;
+ }
break;
case S2MPU02:
switch (rdev_id) {
break;
case S2MPU02:
switch (rdev_id) {
@@
-554,11
+554,11
@@
static int s2mps14_regulator_set_suspend_disable(struct regulator_dev *rdev)
default:
state = S2MPU02_ENABLE_SUSPEND;
break;
default:
state = S2MPU02_ENABLE_SUSPEND;
break;
- }
;
+ }
break;
default:
return -EINVAL;
break;
default:
return -EINVAL;
- }
;
+ }
ret = regmap_read(rdev->regmap, rdev->desc->enable_reg, &val);
if (ret < 0)
ret = regmap_read(rdev->regmap, rdev->desc->enable_reg, &val);
if (ret < 0)
@@
-983,7
+983,7
@@
static int s2mps11_pmic_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Invalid device type: %u\n",
s2mps11->dev_type);
return -EINVAL;
dev_err(&pdev->dev, "Invalid device type: %u\n",
s2mps11->dev_type);
return -EINVAL;
- }
;
+ }
s2mps11->ext_control_gpio = devm_kmalloc(&pdev->dev,
sizeof(*s2mps11->ext_control_gpio) * s2mps11->rdev_num,
s2mps11->ext_control_gpio = devm_kmalloc(&pdev->dev,
sizeof(*s2mps11->ext_control_gpio) * s2mps11->rdev_num,