Re: [PATCH] extcon: max77693: Use max77693_update_reg for rmwoperations

[Chanwoo Choi]

On 10/03/2012 12:59 AM, Axel Lin wrote:

> This simplifies the code.
> 
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>
> ---
>  drivers/extcon/extcon-max77693.c |   18 ++++++------------
>  1 file changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
> index e21387e..e0ed622 100644
> --- a/drivers/extcon/extcon-max77693.c
> +++ b/drivers/extcon/extcon-max77693.c
> @@ -239,25 +239,19 @@ const char *max77693_extcon_cable[] = {
>  static int max77693_muic_set_debounce_time(struct max77693_muic_info *info,
>  		enum max77693_muic_adc_debounce_time time)
>  {
> -	int ret = 0;
> -	u8 ctrl3;
> +	int ret;
>  
>  	switch (time) {
>  	case ADC_DEBOUNCE_TIME_5MS:
>  	case ADC_DEBOUNCE_TIME_10MS:
>  	case ADC_DEBOUNCE_TIME_25MS:
>  	case ADC_DEBOUNCE_TIME_38_62MS:
> -		ret = max77693_read_reg(info->max77693->regmap_muic,
> -				MAX77693_MUIC_REG_CTRL3, &ctrl3);
> -		ctrl3 &= ~CONTROL3_ADCDBSET_MASK;
> -		ctrl3 |= (time << CONTROL3_ADCDBSET_SHIFT);
> -
> -		ret = max77693_write_reg(info->max77693->regmap_muic,
> -				MAX77693_MUIC_REG_CTRL3, ctrl3);
> -		if (ret) {
> +		ret = max77693_update_reg(info->max77693->regmap_muic,
> +					  MAX77693_MUIC_REG_CTRL3,
> +					  time << CONTROL3_ADCDBSET_SHIFT,
> +					  CONTROL3_ADCDBSET_MASK);
> +		if (ret)
>  			dev_err(info->dev, "failed to set ADC debounce time\n");
> -			ret = -EINVAL;
> -		}
>  		break;
>  	default:
>  		dev_err(info->dev, "invalid ADC debounce time\n");


Applied, thanks.

Cheers,
Chanwoo Choi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/