p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

regulator: max8973: get rid of extra variable for gpio validity 

To find that dvs-gpio is valid or not, gpio API gpio_is_valid()
can be directly used instead of intermediate variable.

Removing the extra variable and using the gpio_is_valid().

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Laxman Dewangan 2015-05-06 18:20:10 +05:30 committed by Mark Brown
parent eaacaa09e4
commit fa5f509fb5
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/regulator/max8973-regulator.c
View File

@ -100,7 +100,6 @@ struct max8973_chip {
int curr_vout_val[MAX8973_MAX_VOUT_REG]; int curr_vout_val[MAX8973_MAX_VOUT_REG];
int curr_vout_reg; int curr_vout_reg;
int curr_gpio_val; int curr_gpio_val;
bool valid_dvs_gpio;
struct regulator_ops ops; struct regulator_ops ops;
}; };
@ -174,7 +173,7 @@ static int max8973_dcdc_set_voltage_sel(struct regulator_dev *rdev,
* If gpios are available to select the VOUT register then least * If gpios are available to select the VOUT register then least
* recently used register for new configuration. * recently used register for new configuration.
*/ */
if (max->valid_dvs_gpio) if (gpio_is_valid(max->dvs_gpio))
found = find_voltage_set_register(max, vsel, found = find_voltage_set_register(max, vsel,
&vout_reg, &gpio_val); &vout_reg, &gpio_val);
@ -191,7 +190,7 @@ static int max8973_dcdc_set_voltage_sel(struct regulator_dev *rdev,
} }
/* Select proper VOUT register vio gpios */ /* Select proper VOUT register vio gpios */
if (max->valid_dvs_gpio) { if (gpio_is_valid(max->dvs_gpio)) {
gpio_set_value_cansleep(max->dvs_gpio, gpio_val & 0x1); gpio_set_value_cansleep(max->dvs_gpio, gpio_val & 0x1);
max->curr_gpio_val = gpio_val; max->curr_gpio_val = gpio_val;
} }
@ -438,7 +437,6 @@ static int max8973_probe(struct i2c_client *client,
max->dvs_gpio, ret); max->dvs_gpio, ret);
return ret; return ret;
} }
max->valid_dvs_gpio = true;
/* /*
* Initialize the lru index with vout_reg id * Initialize the lru index with vout_reg id
@ -448,8 +446,6 @@ static int max8973_probe(struct i2c_client *client,
max->lru_index[i] = i; max->lru_index[i] = i;
max->lru_index[0] = max->curr_vout_reg; max->lru_index[0] = max->curr_vout_reg;
max->lru_index[max->curr_vout_reg] = 0; max->lru_index[max->curr_vout_reg] = 0;
} else {
max->valid_dvs_gpio = false;
} }
if (pdata) { if (pdata) {