media: ti-vpe: avoid gcc-9 warning
PATCH 1/1 media: ti-vpe: avoid gcc-9 warning
gcc warns about empty array declarations, which we get in this driver when compile-testing without CONFIG_OF:
drivers/media/platform/ti-vpe/cal.c:2194:34: warning: array 'cal_of_match' assumed to have one element
2194 | static const struct of_device_id cal_of_match[];
Since all users of this driver do need CONFIG_OF anyway, there is no point in making the array definition conditional to save space, so just remove the #ifdef and move the array up a little.
--- drivers/media/platform/ti-vpe/cal.c | 46 +++++++++++++---------------- 1 file changed, 21 insertions(+), 25 deletions(-)
drivers/media/platform/ti-vpe/cal.c +21 -25
@@ -2237,7 +2237,26 @@ static struct cal_ctx *cal_create_instance(struct cal_dev *dev, int inst)return NULL ; } -static const struct of_device_id cal_of_match[]; +static const struct of_device_id cal_of_match[] = { + { + .compatible ="ti,dra72-cal" , + .data = (void *)&dra72x_cal_data, + }, + { + .compatible ="ti,dra72-pre-es2-cal" , + .data = (void *)&dra72x_es1_cal_data, + }, + { + .compatible ="ti,dra76-cal" , + .data = (void *)&dra76x_cal_data, + }, + { + .compatible ="ti,am654-cal" , + .data = (void *)&am654_cal_data, + }, + {}, +}; +MODULE_DEVICE_TABLE (of, cal_of_match);static int cal_probe (struct platform_device *pdev) {
@@ -2413,29 +2432,6 @@ static int cal_remove(struct platform_device *pdev)return 0 ; } -#if defined(CONFIG_OF ) -static const struct of_device_id cal_of_match[] = { - { - .compatible ="ti,dra72-cal" , - .data = (void *)&dra72x_cal_data, - }, - { - .compatible ="ti,dra72-pre-es2-cal" , - .data = (void *)&dra72x_es1_cal_data, - }, - { - .compatible ="ti,dra76-cal" , - .data = (void *)&dra76x_cal_data, - }, - { - .compatible ="ti,am654-cal" , - .data = (void *)&am654_cal_data, - }, - {}, -}; -MODULE_DEVICE_TABLE (of, cal_of_match); -#endif -static int cal_runtime_resume (struct device *dev) {struct cal_dev *caldev =dev_get_drvdata (dev);
@@ -2462,7 +2458,7 @@ static struct platform_driver cal_pdrv = { .driver = { .name = CAL_MODULE_NAME, .pm = &cal_pm_ops, - .of_match_table = of_match_ptr(cal_of_match), + .of_match_table = cal_of_match, }, };
Signature · 1 line
2.26.0
Arnd Bergmann <[email protected]> wrote on Tue [2020-Apr-28 23:34:19 +0200]:
Quoted 90 lines
gcc warns about empty array declarations, which we get in this driver when compile-testing without
CONFIG_OF:
drivers/media/platform/ti-vpe/cal.c:2194:34: warning: array 'cal_of_match' assumed to have one element
2194 | static const structof_device_idcal_of_match[];Since all users of this driver do need
CONFIG_OFanyway, there is no point in making the array definition conditional to save space, so just remove the #ifdef and move the array up a little.Fixes 343e89a792a5 ("[media] media: ti-vpe: Add CAL v4l2 camera capture driver")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/media/platform/ti-vpe/cal.c | 46 +++++++++++++---------------- 1 file changed, 21 insertions(+), 25 deletions(-)drivers/media/platform/ti-vpe/cal.c +21
-25@@ -2237,7 +2237,26 @@ static struct cal_ctx *cal_create_instance(struct cal_dev *dev, int inst)return NULL ; } -static const struct of_device_id cal_of_match[]; +static const struct of_device_id cal_of_match[] = { + { + .compatible ="ti,dra72-cal" , + .data = (void *)&dra72x_cal_data, + }, + { + .compatible ="ti,dra72-pre-es2-cal" , + .data = (void *)&dra72x_es1_cal_data, + }, + { + .compatible ="ti,dra76-cal" , + .data = (void *)&dra76x_cal_data, + }, + { + .compatible ="ti,am654-cal" , + .data = (void *)&am654_cal_data, + }, + {}, +}; +MODULE_DEVICE_TABLE (of, cal_of_match);static int cal_probe (struct platform_device *pdev) {@@ -2413,29 +2432,6 @@ static int cal_remove(struct platform_device *pdev)return 0 ; } -#if defined(CONFIG_OF ) -static const struct of_device_id cal_of_match[] = { - { - .compatible ="ti,dra72-cal" , - .data = (void *)&dra72x_cal_data, - }, - { - .compatible ="ti,dra72-pre-es2-cal" , - .data = (void *)&dra72x_es1_cal_data, - }, - { - .compatible ="ti,dra76-cal" , - .data = (void *)&dra76x_cal_data, - }, - { - .compatible ="ti,am654-cal" , - .data = (void *)&am654_cal_data, - }, - {}, -}; -MODULE_DEVICE_TABLE (of, cal_of_match); -#endif -static int cal_runtime_resume (struct device *dev) {struct cal_dev *caldev =dev_get_drvdata (dev);@@ -2462,7 +2458,7 @@ static struct platform_driver cal_pdrv = { .driver = { .name = CAL_MODULE_NAME, .pm = &cal_pm_ops, - .of_match_table = of_match_ptr(cal_of_match), + .of_match_table = cal_of_match, }, };Signature · 1 line
2.26.0