Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1433046

Re: [PATCH 4/6] mfd: dm355evm_msp: Refactoring for add_child()

From Lee Jones <lee.jones@linaro.org>
Newsgroups linux.kernel
Subject Re: [PATCH 4/6] mfd: dm355evm_msp: Refactoring for add_child()
Date 2016-06-28 17:10 +0200
Message-ID <rP2Od-hD-5@gated-at.bofh.it> (permalink)
References (3 earlier) <rzg8O-u7-13@gated-at.bofh.it> <rzkcp-3oC-5@gated-at.bofh.it> <rHJGG-7U2-15@gated-at.bofh.it> <rOis1-3vu-13@gated-at.bofh.it> <rOiLo-3E7-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


On Sun, 26 Jun 2016, SF Markus Elfring wrote:

> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sun, 26 Jun 2016 13:56:58 +0200
> 
> Adjust jump targets according to the Linux coding style convention.
> Another check for the variable "status" can be omitted then at the end.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
>  drivers/mfd/dm355evm_msp.c | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
> index 270e19c..baf6075 100644
> --- a/drivers/mfd/dm355evm_msp.c
> +++ b/drivers/mfd/dm355evm_msp.c
> @@ -209,7 +209,7 @@ static struct device *add_child(struct i2c_client *client, const char *name,
>  		status = platform_device_add_data(pdev, pdata, pdata_len);
>  		if (status < 0) {
>  			dev_dbg(&pdev->dev, "can't add platform_data\n");
> -			goto err;
> +			goto put_device;
>  		}
>  	}
>  
> @@ -222,19 +222,21 @@ static struct device *add_child(struct i2c_client *client, const char *name,
>  		status = platform_device_add_resources(pdev, &r, 1);
>  		if (status < 0) {
>  			dev_dbg(&pdev->dev, "can't add irq\n");
> -			goto err;
> +			goto put_device;
>  		}
>  	}
>  
>  	status = platform_device_add(pdev);
>  

Remove this line too.

> -err:
> -	if (status < 0) {
> -		platform_device_put(pdev);
> -		dev_err(&client->dev, "can't add %s dev\n", name);
> -		return ERR_PTR(status);
> -	}
> +	if (status)
> +		goto put_device;
> +
>  	return &pdev->dev;
> +
> +put_device:
> +	platform_device_put(pdev);
> +	dev_err(&client->dev, "failed to add device %s\n", name);
> +	return ERR_PTR(status);
>  }
>  
>  static int add_children(struct i2c_client *client)

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/6] mfd: Fine-tuning for three function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 15:40 +0200
  [PATCH 1/6] mfd: twl-core: Return directly after a failed  platform_device_alloc() in add_numbered_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 15:50 +0200
    Re: [PATCH 1/6] mfd: twl-core: Return directly after a failed  platform_device_alloc() in add_numbered_child() Lee Jones <lee.jones@linaro.org> - 2016-06-28 17:10 +0200
  [PATCH 2/6] mfd: twl-core: Refactoring for add_numbered_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 15:50 +0200
    Re: [PATCH 2/6] mfd: twl-core: Refactoring for add_numbered_child() Lee Jones <lee.jones@linaro.org> - 2016-06-28 17:10 +0200
  [PATCH 3/6] mfd: dm355evm_msp: Return directly after a failed  platform_device_alloc() in add_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 15:50 +0200
  [PATCH 5/6] mfd: smsc-ece1099: Delete an unnecessary variable  initialisation in smsc_i2c_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 16:00 +0200
  [PATCH 4/6] mfd: dm355evm_msp: Refactoring for add_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 16:00 +0200
    Re: [PATCH 4/6] mfd: dm355evm_msp: Refactoring for add_child() Lee Jones <lee.jones@linaro.org> - 2016-06-28 17:10 +0200
      Re: [PATCH 4/6] mfd: dm355evm_msp: Refactoring for add_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-28 17:50 +0200
        Re: [PATCH 4/6] mfd: dm355evm_msp: Refactoring for add_child() Lee Jones <lee.jones@linaro.org> - 2016-06-28 18:40 +0200
          [PATCH] mfd: dm355evm_msp: Refactoring for add_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-30 22:20 +0200
            Re: [PATCH] mfd: dm355evm_msp: Refactoring for add_child() Joe Perches <joe@perches.com> - 2016-06-30 22:50 +0200
              Re: [PATCH] mfd: dm355evm_msp: Refactoring for add_child() Lee Jones <lee.jones@linaro.org> - 2016-06-30 23:00 +0200
              Re: mfd: dm355evm_msp: Refactoring for add_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-01 16:50 +0200
                Re: mfd: dm355evm_msp: Refactoring for add_child() Joe Perches <joe@perches.com> - 2016-07-01 18:30 +0200
            Re: [PATCH] mfd: dm355evm_msp: Refactoring for add_child() Lee Jones <lee.jones@linaro.org> - 2016-07-01 11:20 +0200
              Re: mfd: dm355evm_msp: Refactoring for add_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-01 17:00 +0200
  [PATCH 6/6] mfd: smsc-ece1099: Return directly after a function  failure in smsc_i2c_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 16:00 +0200
  Re: [PATCH 0/6] mfd: Fine-tuning for three function implementations Lee Jones <lee.jones@linaro.org> - 2016-06-28 17:10 +0200

csiph-web