From bb3abbb74efd22768590f88aa9eea0ae191efb53 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Fri, 14 Jul 2017 05:58:39 -0300 Subject: [PATCH] media: vimc: set id_table for platform drivers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The vimc platform drivers define a platform device ID table but these are not set to the .id_table field in the platform driver structure. So the platform device ID table is only used to fill the aliases in the module but are not used for matching (works because the platform subsystem fallbacks to the driver's name if no .id_table is set). But this also means that the platform device ID table isn't used if the driver is built-in, which leads to the following build warning: This causes the following build warnings when the driver is built-in: drivers/media/platform/vimc//vimc-capture.c:528:40: warning: ‘vimc_cap_driver_ids’ defined but not used [-Wunused-const-variable=] static const struct platform_device_id vimc_cap_driver_ids[] = { ^~~~~~~~~~~~~~~~~~~ drivers/media/platform/vimc//vimc-debayer.c:588:40: warning: ‘vimc_deb_driver_ids’ defined but not used [-Wunused-const-variable=] static const struct platform_device_id vimc_deb_driver_ids[] = { ^~~~~~~~~~~~~~~~~~~ drivers/media/platform/vimc//vimc-scaler.c:442:40: warning: ‘vimc_sca_driver_ids’ defined but not used [-Wunused-const-variable=] static const struct platform_device_id vimc_sca_driver_ids[] = { ^~~~~~~~~~~~~~~~~~~ drivers/media/platform/vimc//vimc-sensor.c:376:40: warning: ‘vimc_sen_driver_ids’ defined but not used [-Wunused-const-variable=] static const struct platform_device_id vimc_sen_driver_ids[] = { ^~~~~~~~~~~~~~~~~~~ Reported-by: Mauro Carvalho Chehab Suggested-by: Sakari Ailus Signed-off-by: Javier Martinez Canillas Reviewed-by: Helen Koike Acked-by: Sakari Ailus --- drivers/media/platform/vimc/vimc-capture.c | 17 +++++++++-------- drivers/media/platform/vimc/vimc-debayer.c | 17 +++++++++-------- drivers/media/platform/vimc/vimc-scaler.c | 17 +++++++++-------- drivers/media/platform/vimc/vimc-sensor.c | 17 +++++++++-------- 4 files changed, 36 insertions(+), 32 deletions(-) diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c index 14cb32e21130..88a1e5670c72 100644 --- a/drivers/media/platform/vimc/vimc-capture.c +++ b/drivers/media/platform/vimc/vimc-capture.c @@ -517,14 +517,6 @@ static int vimc_cap_remove(struct platform_device *pdev) return 0; } -static struct platform_driver vimc_cap_pdrv = { - .probe = vimc_cap_probe, - .remove = vimc_cap_remove, - .driver = { - .name = VIMC_CAP_DRV_NAME, - }, -}; - static const struct platform_device_id vimc_cap_driver_ids[] = { { .name = VIMC_CAP_DRV_NAME, @@ -532,6 +524,15 @@ static const struct platform_device_id vimc_cap_driver_ids[] = { { } }; +static struct platform_driver vimc_cap_pdrv = { + .probe = vimc_cap_probe, + .remove = vimc_cap_remove, + .id_table = vimc_cap_driver_ids, + .driver = { + .name = VIMC_CAP_DRV_NAME, + }, +}; + module_platform_driver(vimc_cap_pdrv); MODULE_DEVICE_TABLE(platform, vimc_cap_driver_ids); diff --git a/drivers/media/platform/vimc/vimc-debayer.c b/drivers/media/platform/vimc/vimc-debayer.c index 35b15bd4d61d..033a131f67af 100644 --- a/drivers/media/platform/vimc/vimc-debayer.c +++ b/drivers/media/platform/vimc/vimc-debayer.c @@ -577,14 +577,6 @@ static int vimc_deb_remove(struct platform_device *pdev) return 0; } -static struct platform_driver vimc_deb_pdrv = { - .probe = vimc_deb_probe, - .remove = vimc_deb_remove, - .driver = { - .name = VIMC_DEB_DRV_NAME, - }, -}; - static const struct platform_device_id vimc_deb_driver_ids[] = { { .name = VIMC_DEB_DRV_NAME, @@ -592,6 +584,15 @@ static const struct platform_device_id vimc_deb_driver_ids[] = { { } }; +static struct platform_driver vimc_deb_pdrv = { + .probe = vimc_deb_probe, + .remove = vimc_deb_remove, + .id_table = vimc_deb_driver_ids, + .driver = { + .name = VIMC_DEB_DRV_NAME, + }, +}; + module_platform_driver(vimc_deb_pdrv); MODULE_DEVICE_TABLE(platform, vimc_deb_driver_ids); diff --git a/drivers/media/platform/vimc/vimc-scaler.c b/drivers/media/platform/vimc/vimc-scaler.c index fe77505d2679..0a3e086e12f3 100644 --- a/drivers/media/platform/vimc/vimc-scaler.c +++ b/drivers/media/platform/vimc/vimc-scaler.c @@ -431,14 +431,6 @@ static int vimc_sca_remove(struct platform_device *pdev) return 0; } -static struct platform_driver vimc_sca_pdrv = { - .probe = vimc_sca_probe, - .remove = vimc_sca_remove, - .driver = { - .name = VIMC_SCA_DRV_NAME, - }, -}; - static const struct platform_device_id vimc_sca_driver_ids[] = { { .name = VIMC_SCA_DRV_NAME, @@ -446,6 +438,15 @@ static const struct platform_device_id vimc_sca_driver_ids[] = { { } }; +static struct platform_driver vimc_sca_pdrv = { + .probe = vimc_sca_probe, + .remove = vimc_sca_remove, + .id_table = vimc_sca_driver_ids, + .driver = { + .name = VIMC_SCA_DRV_NAME, + }, +}; + module_platform_driver(vimc_sca_pdrv); MODULE_DEVICE_TABLE(platform, vimc_sca_driver_ids); diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/platform/vimc/vimc-sensor.c index ebdbbe8c05ed..615c2b18dcfc 100644 --- a/drivers/media/platform/vimc/vimc-sensor.c +++ b/drivers/media/platform/vimc/vimc-sensor.c @@ -365,14 +365,6 @@ static int vimc_sen_remove(struct platform_device *pdev) return 0; } -static struct platform_driver vimc_sen_pdrv = { - .probe = vimc_sen_probe, - .remove = vimc_sen_remove, - .driver = { - .name = VIMC_SEN_DRV_NAME, - }, -}; - static const struct platform_device_id vimc_sen_driver_ids[] = { { .name = VIMC_SEN_DRV_NAME, @@ -380,6 +372,15 @@ static const struct platform_device_id vimc_sen_driver_ids[] = { { } }; +static struct platform_driver vimc_sen_pdrv = { + .probe = vimc_sen_probe, + .remove = vimc_sen_remove, + .id_table = vimc_sen_driver_ids, + .driver = { + .name = VIMC_SEN_DRV_NAME, + }, +}; + module_platform_driver(vimc_sen_pdrv); MODULE_DEVICE_TABLE(platform, vimc_sen_driver_ids);