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

max8903: removes non zero validity checks on gpios. 

Prior to this commit a zero gpio was treated as invalid. Whereas
gpio_is_valid() will treat a zero gpio as valid.

This commit removes the confusion and explicitly uses gpio_is_valid()
throughout. Which in turn results in several of the error messages becoming
redundant and thus removed.

Signed-off-by: Chris Lapa <chris@lapa.com.au>

Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
Chris Lapa 2016-06-24 12:26:10 +10:00 committed by Sebastian Reichel
parent 88a469bbb2
commit 3525e5c5b3
1 changed files with 49 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/power/max8903_charger.c
View File

@ -53,7 +53,7 @@ static int max8903_get_property(struct power_supply *psy,
switch (psp) { switch (psp) {
case POWER_SUPPLY_PROP_STATUS: case POWER_SUPPLY_PROP_STATUS:
val->intval = POWER_SUPPLY_STATUS_UNKNOWN; val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
if (data->pdata->chg) { if (gpio_is_valid(data->pdata->chg)) {
if (gpio_get_value(data->pdata->chg) == 0) if (gpio_get_value(data->pdata->chg) == 0)
val->intval = POWER_SUPPLY_STATUS_CHARGING; val->intval = POWER_SUPPLY_STATUS_CHARGING;
else if (data->usb_in || data->ta_in) else if (data->usb_in || data->ta_in)
@ -93,11 +93,11 @@ static irqreturn_t max8903_dcin(int irq, void *_data)
data->ta_in = ta_in; data->ta_in = ta_in;
/* Set Current-Limit-Mode 1:DC 0:USB */ /* Set Current-Limit-Mode 1:DC 0:USB */
if (pdata->dcm) if (gpio_is_valid(pdata->dcm))
gpio_set_value(pdata->dcm, ta_in ? 1 : 0); gpio_set_value(pdata->dcm, ta_in ? 1 : 0);
/* Charger Enable / Disable (cen is negated) */ /* Charger Enable / Disable (cen is negated) */
if (pdata->cen) if (gpio_is_valid(pdata->cen))
gpio_set_value(pdata->cen, ta_in ? 0 : gpio_set_value(pdata->cen, ta_in ? 0 :
(data->usb_in ? 0 : 1)); (data->usb_in ? 0 : 1));
@ -136,7 +136,7 @@ static irqreturn_t max8903_usbin(int irq, void *_data)
/* Do not touch Current-Limit-Mode */ /* Do not touch Current-Limit-Mode */
/* Charger Enable / Disable (cen is negated) */ /* Charger Enable / Disable (cen is negated) */
if (pdata->cen) if (gpio_is_valid(pdata->cen))
gpio_set_value(pdata->cen, usb_in ? 0 : gpio_set_value(pdata->cen, usb_in ? 0 :
(data->ta_in ? 0 : 1)); (data->ta_in ? 0 : 1));
@ -190,7 +190,7 @@ static int max8903_setup_gpios(struct platform_device *pdev)
int usb_in = 0; int usb_in = 0;
if (pdata->dc_valid) { if (pdata->dc_valid) {
if (pdata->dok && gpio_is_valid(pdata->dok)) { if (gpio_is_valid(pdata->dok)) {
ret = devm_gpio_request(dev, pdata->dok, ret = devm_gpio_request(dev, pdata->dok,
data->psy_desc.name); data->psy_desc.name);
if (ret) { if (ret) {
@ -208,10 +208,8 @@ static int max8903_setup_gpios(struct platform_device *pdev)
} }
} }
if (pdata->dcm) {
if (gpio_is_valid(pdata->dcm)) { if (gpio_is_valid(pdata->dcm)) {
ret = devm_gpio_request(dev, pdata->dcm, ret = devm_gpio_request(dev, pdata->dcm, data->psy_desc.name);
data->psy_desc.name);
if (ret) { if (ret) {
dev_err(dev, dev_err(dev,
"Failed GPIO request for dcm: %d err %d\n", "Failed GPIO request for dcm: %d err %d\n",
@ -221,14 +219,10 @@ static int max8903_setup_gpios(struct platform_device *pdev)
gpio = pdata->dcm; /* Output */ gpio = pdata->dcm; /* Output */
gpio_set_value(gpio, ta_in); gpio_set_value(gpio, ta_in);
} else {
dev_err(dev, "Invalid pin: dcm.\n");
return -EINVAL;
}
} }
if (pdata->usb_valid) { if (pdata->usb_valid) {
if (pdata->uok && gpio_is_valid(pdata->uok)) { if (gpio_is_valid(pdata->uok)) {
ret = devm_gpio_request(dev, pdata->uok, ret = devm_gpio_request(dev, pdata->uok,
data->psy_desc.name); data->psy_desc.name);
if (ret) { if (ret) {
@ -247,10 +241,8 @@ static int max8903_setup_gpios(struct platform_device *pdev)
} }
} }
if (pdata->cen) {
if (gpio_is_valid(pdata->cen)) { if (gpio_is_valid(pdata->cen)) {
ret = devm_gpio_request(dev, pdata->cen, ret = devm_gpio_request(dev, pdata->cen, data->psy_desc.name);
data->psy_desc.name);
if (ret) { if (ret) {
dev_err(dev, dev_err(dev,
"Failed GPIO request for cen: %d err %d\n", "Failed GPIO request for cen: %d err %d\n",
@ -259,16 +251,10 @@ static int max8903_setup_gpios(struct platform_device *pdev)
} }
gpio_set_value(pdata->cen, (ta_in || usb_in) ? 0 : 1); gpio_set_value(pdata->cen, (ta_in || usb_in) ? 0 : 1);
} else {
dev_err(dev, "Invalid pin: cen.\n");
return -EINVAL;
}
} }
if (pdata->chg) {
if (gpio_is_valid(pdata->chg)) { if (gpio_is_valid(pdata->chg)) {
ret = devm_gpio_request(dev, pdata->chg, ret = devm_gpio_request(dev, pdata->chg, data->psy_desc.name);
data->psy_desc.name);
if (ret) { if (ret) {
dev_err(dev, dev_err(dev,
"Failed GPIO request for chg: %d err %d\n", "Failed GPIO request for chg: %d err %d\n",
@ -276,12 +262,9 @@ static int max8903_setup_gpios(struct platform_device *pdev)
return ret; return ret;
} }
} }
}
if (pdata->flt) {
if (gpio_is_valid(pdata->flt)) { if (gpio_is_valid(pdata->flt)) {
ret = devm_gpio_request(dev, pdata->flt, ret = devm_gpio_request(dev, pdata->flt, data->psy_desc.name);
data->psy_desc.name);
if (ret) { if (ret) {
dev_err(dev, dev_err(dev,
"Failed GPIO request for flt: %d err %d\n", "Failed GPIO request for flt: %d err %d\n",
@ -289,12 +272,9 @@ static int max8903_setup_gpios(struct platform_device *pdev)
return ret; return ret;
} }
} }
}
if (pdata->usus) {
if (gpio_is_valid(pdata->usus)) { if (gpio_is_valid(pdata->usus)) {
ret = devm_gpio_request(dev, pdata->usus, ret = devm_gpio_request(dev, pdata->usus, data->psy_desc.name);
data->psy_desc.name);
if (ret) { if (ret) {
dev_err(dev, dev_err(dev,
"Failed GPIO request for usus: %d err %d\n", "Failed GPIO request for usus: %d err %d\n",
@ -302,7 +282,6 @@ static int max8903_setup_gpios(struct platform_device *pdev)
return ret; return ret;
} }
} }
}
data->fault = false; data->fault = false;
data->ta_in = ta_in; data->ta_in = ta_in;
@ -385,7 +364,7 @@ static int max8903_probe(struct platform_device *pdev)
} }
} }
if (pdata->flt) { if (gpio_is_valid(pdata->flt)) {
ret = devm_request_threaded_irq(dev, gpio_to_irq(pdata->flt), ret = devm_request_threaded_irq(dev, gpio_to_irq(pdata->flt),
NULL, max8903_fault, NULL, max8903_fault,
IRQF_TRIGGER_FALLING | IRQF_TRIGGER_FALLING |