Re: [PATCH v2] counter/ftm-quaddec: Use device-managed registration API

[Jonathan Cameron <jic23@jic23.retrosnub.co.uk>]

On Fri, 26 Jul 2019 21:39:16 +0800
Chuhong Yuan <hslester96@gmail.com> wrote:

> Make use of devm_counter_register.
> Then we can remove redundant unregistration API
> usage to make code simpler.
> 
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>

Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.

Thanks,

Jonathan

> ---
> Changes in v2:
>   - Use devm_add_action_or_reset to keep
>     resource release order.
>   - remove() function is redundant now,
>     delete it.
> 
>  drivers/counter/ftm-quaddec.c | 30 ++++++++++++------------------
>  1 file changed, 12 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/counter/ftm-quaddec.c b/drivers/counter/ftm-quaddec.c
> index 68a9b7393457..4046aa9f9234 100644
> --- a/drivers/counter/ftm-quaddec.c
> +++ b/drivers/counter/ftm-quaddec.c
> @@ -100,16 +100,18 @@ static void ftm_quaddec_init(struct ftm_quaddec *ftm)
>  	ftm_set_write_protection(ftm);
>  }
>  
> -static void ftm_quaddec_disable(struct ftm_quaddec *ftm)
> +static void ftm_quaddec_disable(void *ftm)
>  {
> -	ftm_clear_write_protection(ftm);
> -	ftm_write(ftm, FTM_MODE, 0);
> -	ftm_write(ftm, FTM_QDCTRL, 0);
> +	struct ftm_quaddec *ftm_qua = ftm;
> +
> +	ftm_clear_write_protection(ftm_qua);
> +	ftm_write(ftm_qua, FTM_MODE, 0);
> +	ftm_write(ftm_qua, FTM_QDCTRL, 0);
>  	/*
>  	 * This is enough to disable the counter. No clock has been
>  	 * selected by writing to FTM_SC in init()
>  	 */
> -	ftm_set_write_protection(ftm);
> +	ftm_set_write_protection(ftm_qua);
>  }
>  
>  static int ftm_quaddec_get_prescaler(struct counter_device *counter,
> @@ -317,20 +319,13 @@ static int ftm_quaddec_probe(struct platform_device *pdev)
>  
>  	ftm_quaddec_init(ftm);
>  
> -	ret = counter_register(&ftm->counter);
> +	ret = devm_add_action_or_reset(&pdev->dev, ftm_quaddec_disable, ftm);
>  	if (ret)
> -		ftm_quaddec_disable(ftm);
> -
> -	return ret;
> -}
> +		return ret;
>  
> -static int ftm_quaddec_remove(struct platform_device *pdev)
> -{
> -	struct ftm_quaddec *ftm = platform_get_drvdata(pdev);
> -
> -	counter_unregister(&ftm->counter);
> -
> -	ftm_quaddec_disable(ftm);
> +	ret = devm_counter_register(&pdev->dev, &ftm->counter);
> +	if (ret)
> +		return ret;
>  
>  	return 0;
>  }
> @@ -346,7 +341,6 @@ static struct platform_driver ftm_quaddec_driver = {
>  		.of_match_table = ftm_quaddec_match,
>  	},
>  	.probe = ftm_quaddec_probe,
> -	.remove = ftm_quaddec_remove,
>  };
>  
>  module_platform_driver(ftm_quaddec_driver);