atlx: move modinfo data from atlx.h to atl1.c
Subsystems (2)
PATCH 1/1 atlx: move modinfo data from atlx.h to atl1.c
Both atl1.c and atl2.c include atlx.h, which defines some modinfo stuff. But atl2.c seems like it doesn't want the modinfo data from atlx.h, as it defines its own.
Running modinfo on atl2.ko, we get conflicting information:
$ /sbin/modinfo drivers/net/atlx/atl2.ko | egrep "version|description|author" version: 2.2.3 description: Atheros Fast Ethernet Network Driver author: Atheros Corporation <[email protected]>, Chris Snook <[email protected]> version: 2.1.3 author: Xiong Huang <[email protected]>, Chris Snook <[email protected]>, Jay Cliburn <[email protected]>
Move the modinfo data out of atlx.h and into atl1.c to eliminate the confusion:
$ /sbin/modinfo drivers/net/atlx/atl1.ko | egrep "version|description|author" version: 2.1.3 author: Xiong Huang <[email protected]>, Chris Snook <[email protected]>, Jay Cliburn <[email protected]> description: Atheros L1 Gigabit Ethernet Driver
$ /sbin/modinfo drivers/net/atlx/atl2.ko | egrep "version|description|author" version: 2.2.3 description: Atheros Fast Ethernet Network Driver author: Atheros Corporation <[email protected]>, Chris Snook <[email protected]>
--- atl1.c | 6 ++++++ atlx.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)
---
drivers/net/atlx/atl1.c +6 -0
@@ -82,6 +82,12 @@#include "atl1.h" +#define ATLX_DRIVER_VERSION "2.1.3" +MODULE_AUTHOR ("Xiong Huang <[email protected]>, \ +Chris Snook <[email protected]>, Jay Cliburn <[email protected]>" ); +MODULE_LICENSE ("GPL" ); +MODULE_VERSION (ATLX_DRIVER_VERSION ); +/* Temporary hack for merging atl1 and atl2 */ #include "atlx.c"
drivers/net/atlx/atlx.h +0 -6
@@ -29,12 +29,6 @@#include <linux/module.h> #include <linux/types.h> -#define ATLX_DRIVER_VERSION "2.1.3" -MODULE_AUTHOR ("Xiong Huang <[email protected]>, \ -Chris Snook <[email protected]>, Jay Cliburn <[email protected]>" ); -MODULE_LICENSE ("GPL" ); -MODULE_VERSION (ATLX_DRIVER_VERSION ); -#define ATLX_ERR_PHY 2#define ATLX_ERR_PHY_SPEED 7#define ATLX_ERR_PHY_RES 8
Quoted 21 lines · On Tue, 26 May 2009 16:33:50 -0600 Alex Chiang <[email protected]> wrote:
Both
atl1.candatl2.cincludeatlx.h, which defines some modinfo stuff. Butatl2.cseems like it doesn't want the modinfo data fromatlx.h, as it defines its own.Running modinfo on atl2.ko, we get conflicting information:
$ /sbin/modinfo drivers/net/atlx/atl2.ko | egrep "version|description|author" version: 2.2.3 description: Atheros Fast Ethernet Network Driver author: Atheros Corporation <[email protected]>, Chris Snook <[email protected]> version: 2.1.3 author: Xiong Huang <[email protected]>, Chris Snook <[email protected]>, Jay Cliburn <[email protected]>Move the modinfo data out of
atlx.hand intoatl1.cto eliminate the confusion:$ /sbin/modinfo drivers/net/atlx/atl1.ko | egrep "version|description|author" version: 2.1.3 author: Xiong Huang <[email protected]>, Chris Snook <[email protected]>, Jay Cliburn <[email protected]> description: Atheros L1 Gigabit Ethernet Driver
Quoted 8 lines
$ /sbin/modinfo drivers/net/atlx/atl2.ko | egrep "version|description|author" version: 2.2.3 description: Atheros Fast Ethernet Network Driver author: Atheros Corporation <[email protected]>, Chris Snook <[email protected]>Cc Jay Cliburn <[email protected]>Reported-by Scott Scriven <[email protected]>Signed-off-by Alex Chiang <[email protected]>
Quoted 39 lines
--- atl1.c | 6 ++++++ atlx.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)---
drivers/net/atlx/atl1.c +6
-0@@ -82,6 +82,12 @@#include "atl1.h" +#define ATLX_DRIVER_VERSION "2.1.3" +MODULE_AUTHOR ("Xiong Huang <[email protected]>, \ +Chris Snook <[email protected]>, Jay Cliburn <[email protected]>" ); +MODULE_LICENSE ("GPL" ); +MODULE_VERSION (ATLX_DRIVER_VERSION ); +/* Temporary hack for merging atl1 and atl2 */ #include "atlx.c" drivers/net/atlx/atlx.h +0
-6@@ -29,12 +29,6 @@#include <linux/module.h> #include <linux/types.h> -#define ATLX_DRIVER_VERSION "2.1.3" -MODULE_AUTHOR ("Xiong Huang <[email protected]>, \ -Chris Snook <[email protected]>, Jay Cliburn <[email protected]>" ); -MODULE_LICENSE ("GPL" ); -MODULE_VERSION (ATLX_DRIVER_VERSION ); -#define ATLX_ERR_PHY 2#define ATLX_ERR_PHY_SPEED 7#define ATLX_ERR_PHY_RES 8
From: Jay Cliburn <[email protected]>
Date: Tue, 26 May 2009 19:48:52 -0500
Quoted 8 lines
Quoted 5 lines · On Tue, 26 May 2009 16:33:50 -0600 Alex Chiang <[email protected]> wrote:
Both
atl1.candatl2.cincludeatlx.h, which defines some modinfo stuff. Butatl2.cseems like it doesn't want the modinfo data fromatlx.h, as it defines its own.Running modinfo on atl2.ko, we get conflicting information:
...
Quoted 4 lines
Quoted 2 lines
Reported-by Scott Scriven <[email protected]>Signed-off-by Alex Chiang <[email protected]>Acked-by Jay Cliburn <[email protected]>
Applied to net-2.6, thanks.