[Letux-kernel] [PATCH v6 7/8] drivers:input:ads7846(+tsc2046): fix spi module table

Dmitry Torokhov dmitry.torokhov at gmail.com
Sat Nov 19 19:18:24 CET 2016


On Thu, Oct 27, 2016 at 10:44:20AM +0200, H. Nikolaus Schaller wrote:
> Fix module table so that the driver is loaded if compiled
> as module and requested by DT.

We really need to fix it between spi/i23c core and module utils instead
of keeping adding duplicate IDs all over drivers. We already have OF
module device table containing the same data, we should be able to use
it.

Thanks.

> 
> Signed-off-by: H. Nikolaus Schaller <hns at goldelico.com>
> ---
>  drivers/input/touchscreen/ads7846.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
> index 400e421..50c85d2 100644
> --- a/drivers/input/touchscreen/ads7846.c
> +++ b/drivers/input/touchscreen/ads7846.c
> @@ -1532,6 +1532,16 @@ static int ads7846_remove(struct spi_device *spi)
>  	return 0;
>  }
>  
> +static const struct spi_device_id ads7846_idtable[] = {
> +	{ "tsc2046", 0 },
> +	{ "ads7843", 0 },
> +	{ "ads7845", 0 },
> +	{ "ads7846", 0 },
> +	{ "ads7873", 0 },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(spi, ads7846_idtable);
> +
>  static struct spi_driver ads7846_driver = {
>  	.driver = {
>  		.name	= "ads7846",
> @@ -1546,4 +1556,3 @@ module_spi_driver(ads7846_driver);
>  
>  MODULE_DESCRIPTION("ADS7846 TouchScreen Driver");
>  MODULE_LICENSE("GPL");
> -MODULE_ALIAS("spi:ads7846");
> -- 
> 2.7.3
> 

-- 
Dmitry


More information about the Letux-kernel mailing list