Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / qcom_rpm-regulator.c

diff --git a/drivers/regulator/qcom_rpm-regulator.c b/drivers/regulator/qcom_rpm-regulator.c
index 8f283098788aebf2e96f17ce1b48aae4315e43a0..b55cd5b50ebe546da8c6b096a93e06c5e772e218 100644 (file)
--- a/drivers/regulator/qcom_rpm-regulator.c
+++ b/drivers/regulator/qcom_rpm-regulator.c
@@ -50,7 +50,7 @@ struct rpm_reg_parts {
 };
 
 #define FORCE_MODE_IS_2_BITS(reg) \
-       ((vreg->parts->fm.mask >> vreg->parts->fm.shift) == 3)
+       (((reg)->parts->fm.mask >> (reg)->parts->fm.shift) == 3)
 
 struct qcom_rpm_reg {
        struct qcom_rpm *rpm;
@@ -631,7 +631,7 @@ static int rpm_reg_probe(struct platform_device *pdev)
        struct regulator_init_data *initdata;
        const struct qcom_rpm_reg *template;
        const struct of_device_id *match;
-       struct regulator_config config = { 0 };
+       struct regulator_config config = { };
        struct regulator_dev *rdev;
        struct qcom_rpm_reg *vreg;
        const char *key;