[alsa-devel] [PATCH 4/7] ASoC: wm8903: simplify gpiolib callbacks

Mark Brown broonie at kernel.org
Tue Jun 2 21:41:53 CEST 2015


On Tue, Jun 02, 2015 at 02:09:15AM +0300, Vladimir Zapolskiy wrote:

> @@ -1783,18 +1783,13 @@ static int wm8903_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
>  {
>  	struct wm8903_priv *wm8903 = gpio_to_wm8903(chip);
>  	unsigned int mask, val;
> -	int ret;
>  
>  	mask = WM8903_GPn_FN_MASK | WM8903_GPn_DIR_MASK;
>  	val = (WM8903_GPn_FN_GPIO_INPUT << WM8903_GPn_FN_SHIFT) |
>  		WM8903_GPn_DIR;
>  
> -	ret = regmap_update_bits(wm8903->regmap,
> -				 WM8903_GPIO_CONTROL_1 + offset, mask, val);
> -	if (ret < 0)
> -		return ret;
> -
> -	return 0;
> +	return regmap_update_bits(wm8903->regmap,
> +				  WM8903_GPIO_CONTROL_1 + offset, mask, val);
>  }
>  
>  static int wm8903_gpio_get(struct gpio_chip *chip, unsigned offset)

This appears to be an unrelated coding style change.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://mailman.alsa-project.org/pipermail/alsa-devel/attachments/20150602/0a3b35ba/attachment-0001.sig>


More information about the Alsa-devel mailing list