max8903: cleans up confusing relationship between dc_valid, dok and dcm.

The max8903_charger.h file indicated that dcm and dok were not optional
when dc_valid is set.

It makes sense to have dok as a compulsory pin when dc_valid is given.
However dcm can be optionally wired to a fixed level especially when the
circuit is configured for dc power exclusively.

The previous implementation already allowed for this somewhat, however no
error was given if dok wasn't given whilst dc_valid was.

The new implementation enforces dok presence when dc_valid is given. Whilst
allowing dcm to be optional.

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>

1 files changed, 9 insertions, 13 deletions

diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
index 0a5b0e142788..6ec705f7a9d9 100644
--- a/drivers/power/max8903_charger.c
+++ b/drivers/power/max8903_charger.c
@@ -211,27 +211,23 @@ static int max8903_probe(struct platform_device *pdev)
         }
 
         if (pdata->dc_valid) {
-                if (pdata->dok && gpio_is_valid(pdata->dok) &&
-                                pdata->dcm && gpio_is_valid(pdata->dcm)) {
+                if (pdata->dok && gpio_is_valid(pdata->dok)) {
                         gpio = pdata->dok; /* PULL_UPed Interrupt */
                         ta_in = gpio_get_value(gpio) ? 0 : 1;
+                } else {
+                        dev_err(dev, "When DC is wired, DOK should be wired as well.\n");
+                        return -EINVAL;
+                }
+        }
 
+        if (pdata->dcm) {
+                if (gpio_is_valid(pdata->dcm)) {
                         gpio = pdata->dcm; /* Output */
                         gpio_set_value(gpio, ta_in);
                 } else {
-                        dev_err(dev, "When DC is wired, DOK and DCM should"
-                                        " be wired as well.\n");
+                        dev_err(dev, "Invalid pin: dcm.\n");
                         return -EINVAL;
                 }
-        } else {
-                if (pdata->dcm) {
-                        if (gpio_is_valid(pdata->dcm))
-                                gpio_set_value(pdata->dcm, 0);
-                        else {
-                                dev_err(dev, "Invalid pin: dcm.\n");
-                                return -EINVAL;
-                        }
-                }
         }
 
         if (pdata->usb_valid) {