Patch "xgene_enet: remove bogus forward declarations" has been added to the 4.9-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
xgene_enet: remove bogus forward declarations
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xgene_enet-remove-bogus-forward-declarations.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
1f3d62090d3ba4d0c14e5271be87812fc577b197Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Wed, 1 Feb 2017 17:46:02 +0100
Subject: xgene_enet: remove bogus forward declarations
From: Arnd Bergmann <[email protected]>
commit 1f3d62090d3ba4d0c14e5271be87812fc577b197 upstream.
The device match tables for both the xgene_enet driver and its phy driver have forward declarations that declare an array without a length, leading to a clang warning when they are not followed by an actual defitinition:
drivers/net/ethernet/apm/xgene/../../../phy/mdio-xgene.h:135:34: warning: tentative array definition assumed to have one element drivers/net/ethernet/apm/xgene/xgene_enet_main.c:33:36: warning: tentative array definition assumed to have one element
The declarations for the mdio driver are even in a header file, so they cause duplicate definitions of the tables for each file that includes them.
This removes all four forward declarations and moves the actual definitions up a little, so they are in front of their first user. For the OF match tables, this means having to remove the #ifdef around them, and passing the actual structure into of_match_device(). This has no effect on the generated object code though, as the of_match_device function has an empty stub that does not evaluate its argument, and the symbol gets dropped either way.
--- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 50 +++++++++++------------ drivers/net/phy/mdio-xgene.c | 50 +++++++++++------------ drivers/net/phy/mdio-xgene.h | 4 - 3 files changed, 48 insertions(+), 56 deletions(-)
drivers/net/ethernet/apm/xgene/xgene_enet_main.c +24 -26
@@ -1680,6 +1680,30 @@ static void xgene_enet_napi_add(struct x } } +#ifdef CONFIG_ACPI +static const struct acpi_device_id xgene_enet_acpi_match[] = { + {"APMC0D05" ,XGENE_ENET1 }, + {"APMC0D30" ,XGENE_ENET1 }, + {"APMC0D31" ,XGENE_ENET1 }, + {"APMC0D3F" ,XGENE_ENET1 }, + {"APMC0D26" ,XGENE_ENET2 }, + {"APMC0D25" ,XGENE_ENET2 }, + { } +}; +MODULE_DEVICE_TABLE (acpi, xgene_enet_acpi_match); +#endif + +static const struct of_device_id xgene_enet_of_match[] = { + {.compatible ="apm,xgene-enet" , .data = (void *)XGENE_ENET1 }, + {.compatible ="apm,xgene1-sgenet" , .data = (void *)XGENE_ENET1 }, + {.compatible ="apm,xgene1-xgenet" , .data = (void *)XGENE_ENET1 }, + {.compatible ="apm,xgene2-sgenet" , .data = (void *)XGENE_ENET2 }, + {.compatible ="apm,xgene2-xgenet" , .data = (void *)XGENE_ENET2 }, + {}, +}; + +MODULE_DEVICE_TABLE (of, xgene_enet_of_match); +static int xgene_enet_probe (struct platform_device *pdev) {struct net_device *ndev;
@@ -1826,32 +1850,6 @@ static void xgene_enet_shutdown(struct pxgene_enet_remove (pdev); } -#ifdef CONFIG_ACPI -static const struct acpi_device_id xgene_enet_acpi_match[] = { - {"APMC0D05" ,XGENE_ENET1 }, - {"APMC0D30" ,XGENE_ENET1 }, - {"APMC0D31" ,XGENE_ENET1 }, - {"APMC0D3F" ,XGENE_ENET1 }, - {"APMC0D26" ,XGENE_ENET2 }, - {"APMC0D25" ,XGENE_ENET2 }, - { } -}; -MODULE_DEVICE_TABLE (acpi, xgene_enet_acpi_match); -#endif - -#ifdef CONFIG_OF -static const struct of_device_id xgene_enet_of_match[] = { - {.compatible ="apm,xgene-enet" , .data = (void *)XGENE_ENET1 }, - {.compatible ="apm,xgene1-sgenet" , .data = (void *)XGENE_ENET1 }, - {.compatible ="apm,xgene1-xgenet" , .data = (void *)XGENE_ENET1 }, - {.compatible ="apm,xgene2-sgenet" , .data = (void *)XGENE_ENET2 }, - {.compatible ="apm,xgene2-xgenet" , .data = (void *)XGENE_ENET2 }, - {}, -}; - -MODULE_DEVICE_TABLE (of, xgene_enet_of_match); -#endif -static struct platform_driver xgene_enet_driver = { .driver = { .name ="xgene-enet" ,
drivers/net/phy/mdio-xgene.c +24 -26
62 lines not on this page · raw message
drivers/net/phy/mdio-xgene.h +0 -4
@@ -132,10 +132,6 @@ static inline u64 xgene_enet_get_field_v#define GET_BIT (field, src) \ xgene_enet_get_field_value(field ## _POS, 1, src) -static const struct of_device_id xgene_mdio_of_match[]; -#ifdef CONFIG_ACPI -static const struct acpi_device_id xgene_mdio_acpi_match[]; -#endif int xgene_mdio_rgmii_read (struct mii_bus *bus,int phy_id,int reg);int xgene_mdio_rgmii_write (struct mii_bus *bus,int phy_id,int reg,u16 data);struct phy_device *xgene_enet_phy_register (struct mii_bus *bus,int phy_addr);
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/fs-compat-remove-warning-from-compatible_ioctl.patch queue-4.9/xgene_enet-remove-bogus-forward-declarations.patch