diff options
-rw-r--r-- | drivers/regulator/max77686.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index 23b7c06d30ba..17ccf365a9c0 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686.c | |||
@@ -88,7 +88,7 @@ enum max77686_ramp_rate { | |||
88 | }; | 88 | }; |
89 | 89 | ||
90 | struct max77686_data { | 90 | struct max77686_data { |
91 | u64 gpio_enabled:MAX77686_REGULATORS; | 91 | DECLARE_BITMAP(gpio_enabled, MAX77686_REGULATORS); |
92 | 92 | ||
93 | /* Array indexed by regulator id */ | 93 | /* Array indexed by regulator id */ |
94 | unsigned int opmode[MAX77686_REGULATORS]; | 94 | unsigned int opmode[MAX77686_REGULATORS]; |
@@ -121,7 +121,7 @@ static unsigned int max77686_map_normal_mode(struct max77686_data *max77686, | |||
121 | case MAX77686_BUCK8: | 121 | case MAX77686_BUCK8: |
122 | case MAX77686_BUCK9: | 122 | case MAX77686_BUCK9: |
123 | case MAX77686_LDO20 ... MAX77686_LDO22: | 123 | case MAX77686_LDO20 ... MAX77686_LDO22: |
124 | if (max77686->gpio_enabled & (1 << id)) | 124 | if (test_bit(id, max77686->gpio_enabled)) |
125 | return MAX77686_GPIO_CONTROL; | 125 | return MAX77686_GPIO_CONTROL; |
126 | } | 126 | } |
127 | 127 | ||
@@ -277,7 +277,7 @@ static int max77686_of_parse_cb(struct device_node *np, | |||
277 | } | 277 | } |
278 | 278 | ||
279 | if (gpio_is_valid(config->ena_gpio)) { | 279 | if (gpio_is_valid(config->ena_gpio)) { |
280 | max77686->gpio_enabled |= (1 << desc->id); | 280 | set_bit(desc->id, max77686->gpio_enabled); |
281 | 281 | ||
282 | return regmap_update_bits(config->regmap, desc->enable_reg, | 282 | return regmap_update_bits(config->regmap, desc->enable_reg, |
283 | desc->enable_mask, | 283 | desc->enable_mask, |