[PATCH 1/2] iio: stmpe-adc: use of_device_id for OF matching

Jonathan Cameron jic23 at kernel.org
Sun May 1 11:00:15 PDT 2022


On Sun,  1 May 2022 12:34:46 +0200
Krzysztof Kozlowski <krzysztof.kozlowski at linaro.org> wrote:

> The of_device_id was added to allow module autoloading, but it should be
> also used to allow driver matching via Devicetree.
> 
> This also fixes W=1 warning:
>   drivers/iio/adc/stmpe-adc.c:357:34: error: ‘stmpe_adc_ids’ defined but not used [-Werror=unused-const-variable=]
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski at linaro.org>
Series applied to the togreg branch of iio.git and pushed out as testing for 0-day
to poke at it.

Thanks,

Jonathan

> ---
>  drivers/iio/adc/stmpe-adc.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/iio/adc/stmpe-adc.c b/drivers/iio/adc/stmpe-adc.c
> index d2d405388499..0208789fc0f5 100644
> --- a/drivers/iio/adc/stmpe-adc.c
> +++ b/drivers/iio/adc/stmpe-adc.c
> @@ -345,21 +345,22 @@ static int __maybe_unused stmpe_adc_resume(struct device *dev)
>  
>  static SIMPLE_DEV_PM_OPS(stmpe_adc_pm_ops, NULL, stmpe_adc_resume);
>  
> +static const struct of_device_id stmpe_adc_ids[] = {
> +	{ .compatible = "st,stmpe-adc", },
> +	{ },
> +};
> +MODULE_DEVICE_TABLE(of, stmpe_adc_ids);
> +
>  static struct platform_driver stmpe_adc_driver = {
>  	.probe		= stmpe_adc_probe,
>  	.driver		= {
>  		.name	= "stmpe-adc",
>  		.pm	= &stmpe_adc_pm_ops,
> +		.of_match_table = stmpe_adc_ids,
>  	},
>  };
>  module_platform_driver(stmpe_adc_driver);
>  
> -static const struct of_device_id stmpe_adc_ids[] = {
> -	{ .compatible = "st,stmpe-adc", },
> -	{ },
> -};
> -MODULE_DEVICE_TABLE(of, stmpe_adc_ids);
> -
>  MODULE_AUTHOR("Stefan Agner <stefan.agner at toradex.com>");
>  MODULE_DESCRIPTION("STMPEXXX ADC driver");
>  MODULE_LICENSE("GPL v2");




More information about the linux-arm-kernel mailing list