diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-09-13 00:17:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-13 00:17:51 -0700 |
| commit | 6b6108889376bf2040be064d6db923c1c30a4e69 (patch) | |
| tree | eed4228547b870dc5dd883a2ae98a81557843837 | |
| parent | 7d33335338a8f7b33e1237c4765a7308bbfde39b (diff) | |
| parent | 394bb414b738dc5cda162bd1787f90aaef715336 (diff) | |
Merge "power: qcom: smb135x: change OTG regulator ops to static"
| -rw-r--r-- | drivers/power/supply/qcom/smb1351-charger.c | 2 | ||||
| -rw-r--r-- | drivers/power/supply/qcom/smb135x-charger.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/supply/qcom/smb1351-charger.c b/drivers/power/supply/qcom/smb1351-charger.c index f5c8252b5e41..2dc16aadc4e8 100644 --- a/drivers/power/supply/qcom/smb1351-charger.c +++ b/drivers/power/supply/qcom/smb1351-charger.c @@ -860,7 +860,7 @@ static int smb1351_chg_otg_regulator_is_enable(struct regulator_dev *rdev) return (reg & CMD_OTG_EN_BIT) ? 1 : 0; } -struct regulator_ops smb1351_chg_otg_reg_ops = { +static struct regulator_ops smb1351_chg_otg_reg_ops = { .enable = smb1351_chg_otg_regulator_enable, .disable = smb1351_chg_otg_regulator_disable, .is_enabled = smb1351_chg_otg_regulator_is_enable, diff --git a/drivers/power/supply/qcom/smb135x-charger.c b/drivers/power/supply/qcom/smb135x-charger.c index 08af01544590..3c1b8787ae21 100644 --- a/drivers/power/supply/qcom/smb135x-charger.c +++ b/drivers/power/supply/qcom/smb135x-charger.c @@ -2219,7 +2219,7 @@ static int smb135x_chg_otg_regulator_is_enable(struct regulator_dev *rdev) return (reg & OTG_EN) ? 1 : 0; } -struct regulator_ops smb135x_chg_otg_reg_ops = { +static struct regulator_ops smb135x_chg_otg_reg_ops = { .enable = smb135x_chg_otg_regulator_enable, .disable = smb135x_chg_otg_regulator_disable, .is_enabled = smb135x_chg_otg_regulator_is_enable, |