lkml.org 
[lkml]   [2016]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH v3 4/7] max8903: adds requesting of gpios.
    From
    Date
    On 17/06/2016 4:30 PM, Krzysztof Kozlowski wrote:
    > On 06/17/2016 07:00 AM, Chris Lapa wrote:
    >> From: Chris Lapa <chris@lapa.com.au>
    >>
    >> This change ensures all gpios are available for the driver to use.
    >>
    >> Signed-off-by: Chris Lapa <chris@lapa.com.au>
    >> ---
    >> drivers/power/max8903_charger.c | 79 ++++++++++++++++++++++++++++++++++++-----
    >> 1 file changed, 70 insertions(+), 9 deletions(-)
    >>
    >> diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
    >> index dbd911c4..c068efe 100644
    >> --- a/drivers/power/max8903_charger.c
    >> +++ b/drivers/power/max8903_charger.c
    >> @@ -212,6 +212,16 @@ static int max8903_probe(struct platform_device *pdev)
    >>
    >> if (pdata->dc_valid) {
    >> if (pdata->dok && gpio_is_valid(pdata->dok)) {
    >> + ret = devm_gpio_request(dev,
    >> + pdata->dok,
    >
    > No need to split these two arguments. They fit in 80 chars.
    >
    >> + data->psy_desc.name);
    >> + if (ret) {
    >> + dev_err(dev,
    >> + "Failed GPIO request for dok: %d err %d\n",
    >> + pdata->dok, ret);
    >
    > Indentation here is wrong. These should be aligned to first argument (dev).
    >
    >> + return -EINVAL;
    >
    > Return 'ret'.
    >
    > All these three comments apply also to code below.
    >
    > Anyway the probe function is getting bigger and more difficult to read.
    > Consider factoring out some code to a separate function. For example all
    > the GPIO handling stuff could be factored.
    >
    > Best regards,
    > Krzysztof

    Good idea, I've split the gpio setup code into a function named:
    max8903_setup_gpios()

    Also fixed the other issues you mentioned above.

    Thanks,
    Chris

    >
    >> + }
    >> +
    >> gpio = pdata->dok; /* PULL_UPed Interrupt */
    >> ta_in = gpio_get_value(gpio) ? 0 : 1;
    >> } else {
    >> @@ -223,6 +233,16 @@ static int max8903_probe(struct platform_device *pdev)
    >>
    >> if (pdata->dcm) {
    >> if (gpio_is_valid(pdata->dcm)) {
    >> + ret = devm_gpio_request(dev,
    >> + pdata->dcm,
    >> + data->psy_desc.name);
    >> + if (ret) {
    >> + dev_err(dev,
    >> + "Failed GPIO request for dcm: %d err %d\n",
    >> + pdata->dcm, ret);
    >> + return -EINVAL;
    >> + }
    >> +
    >> gpio = pdata->dcm; /* Output */
    >> gpio_set_value(gpio, ta_in);
    >> } else {
    >> @@ -233,6 +253,16 @@ static int max8903_probe(struct platform_device *pdev)
    >>
    >> if (pdata->usb_valid) {
    >> if (pdata->uok && gpio_is_valid(pdata->uok)) {
    >> + ret = devm_gpio_request(dev,
    >> + pdata->uok,
    >> + data->psy_desc.name);
    >> + if (ret) {
    >> + dev_err(dev,
    >> + "Failed GPIO request for uok: %d err %d\n",
    >> + pdata->uok, ret);
    >> + return -EINVAL;
    >> + }
    >> +
    >> gpio = pdata->uok;
    >> usb_in = gpio_get_value(gpio) ? 0 : 1;
    >> } else {
    >> @@ -244,6 +274,16 @@ static int max8903_probe(struct platform_device *pdev)
    >>
    >> if (pdata->cen) {
    >> if (gpio_is_valid(pdata->cen)) {
    >> + ret = devm_gpio_request(dev,
    >> + pdata->cen,
    >> + data->psy_desc.name);
    >> + if (ret) {
    >> + dev_err(dev,
    >> + "Failed GPIO request for cen: %d err %d\n",
    >> + pdata->cen, ret);
    >> + return -EINVAL;
    >> + }
    >> +
    >> gpio_set_value(pdata->cen, (ta_in || usb_in) ? 0 : 1);
    >> } else {
    >> dev_err(dev, "Invalid pin: cen.\n");
    >> @@ -252,23 +292,44 @@ static int max8903_probe(struct platform_device *pdev)
    >> }
    >>
    >> if (pdata->chg) {
    >> - if (!gpio_is_valid(pdata->chg)) {
    >> - dev_err(dev, "Invalid pin: chg.\n");
    >> - return -EINVAL;
    >> + if (gpio_is_valid(pdata->chg)) {
    >> + ret = devm_gpio_request(dev,
    >> + pdata->chg,
    >> + data->psy_desc.name);
    >> + if (ret) {
    >> + dev_err(dev,
    >> + "Failed GPIO request for chg: %d err %d\n",
    >> + pdata->chg, ret);
    >> + return -EINVAL;
    >> + }
    >> }
    >> }
    >>
    >> if (pdata->flt) {
    >> - if (!gpio_is_valid(pdata->flt)) {
    >> - dev_err(dev, "Invalid pin: flt.\n");
    >> - return -EINVAL;
    >> + if (gpio_is_valid(pdata->flt)) {
    >> + ret = devm_gpio_request(dev,
    >> + pdata->flt,
    >> + data->psy_desc.name);
    >> + if (ret) {
    >> + dev_err(dev,
    >> + "Failed GPIO request for flt: %d err %d\n",
    >> + pdata->flt, ret);
    >> + return -EINVAL;
    >> + }
    >> }
    >> }
    >>
    >> if (pdata->usus) {
    >> - if (!gpio_is_valid(pdata->usus)) {
    >> - dev_err(dev, "Invalid pin: usus.\n");
    >> - return -EINVAL;
    >> + if (gpio_is_valid(pdata->usus)) {
    >> + ret = devm_gpio_request(dev,
    >> + pdata->usus,
    >> + data->psy_desc.name);
    >> + if (ret) {
    >> + dev_err(dev,
    >> + "Failed GPIO request for usus: %d err %d\n",
    >> + pdata->usus, ret);
    >> + return -EINVAL;
    >> + }
    >> }
    >> }
    >>
    >>
    >

    \
     
     \ /
      Last update: 2016-06-19 16:41    [W:3.559 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site