Commit f096ca63 authored Mar 07, 2019 by Arnd Bergmann Committed by David S. Miller Mar 07, 2019

davinci_emac: always build in CONFIG_OF code



clang warns about what seems to be an unintended use of an obscure C
language feature where a forward declaration of an array remains usable
when the final definition is never seen:

drivers/net/ethernet/ti/davinci_emac.c:1694:34: error: tentative array definition assumed to have one element [-Werror]
static const struct of_device_id davinci_emac_of_match[];

There is no harm in always enabling the device tree matching code here,
and it makes the code behave in a more conventional way aside from
avoiding the warning.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6466e715

drivers/net/ethernet/ti/davinci_emac.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2029,7 +2029,6 @@ static const struct dev_pm_ops davinci_emac_pm_ops = {
		.resume = davinci_emac_resume,
		};

		#if IS_ENABLED(CONFIG_OF)
		static const struct emac_platform_data am3517_emac_data = {
		.version = EMAC_VERSION_2,
		.hw_ram_addr = 0x01e20000,
		@@ -2046,14 +2045,13 @@ static const struct of_device_id davinci_emac_of_match[] = {
		{},
		};
		MODULE_DEVICE_TABLE(of, davinci_emac_of_match);
		#endif

		/* davinci_emac_driver: EMAC platform driver structure */
		static struct platform_driver davinci_emac_driver = {
		.driver = {
		.name = "davinci_emac",
		.pm = &davinci_emac_pm_ops,
		.of_match_table = of_match_ptr(davinci_emac_of_match),
		.of_match_table = davinci_emac_of_match,
		},
		.probe = davinci_emac_probe,
		.remove = davinci_emac_remove,

Admin message