[PATCH 0/3] atl1c: update some information of atl1c driver

[PATCH 0/3] atl1c: update some information of atl1c driver

[Cloud Ren]

the series is to update some information of atl1c driver. Because the old author
has left, update author informatio for maintaining. and in a upstreamed driver,
driver doesn't need version information. the version of kernel will reflect its
version.

Cloud Ren (3):
  atl1c: remove ATL1C_DRV_VERSION stuff
  atl1c: change author
  atl1c: refine driver description

 drivers/net/ethernet/atheros/atl1c/atl1c.h         |    1 -
 drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c |    2 --
 drivers/net/ethernet/atheros/atl1c/atl1c_main.c    |   13 ++++++-------
 3 files changed, 6 insertions(+), 10 deletions(-)

-- 
1.7.7

[PATCH 1/3] atl1c: remove ATL1C_DRV_VERSION stuff

[Cloud Ren]

The version is reflected by the kernel release, driver versions upstream make no
sense.

Signed-off-by: Cloud Ren <cjren@qca.qualcomm.com>
---
 drivers/net/ethernet/atheros/atl1c/atl1c.h         |    1 -
 drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c |    2 --
 drivers/net/ethernet/atheros/atl1c/atl1c_main.c    |    5 -----
 3 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h
index ca70e16..b24f1ce 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c.h
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c.h
@@ -628,7 +628,6 @@ struct atl1c_adapter {
 		readl(((a)->hw_addr + reg) + ((offset) << 2)))
 
 extern char atl1c_driver_name[];
-extern char atl1c_driver_version[];
 
 extern void atl1c_reinit_locked(struct atl1c_adapter *adapter);
 extern s32 atl1c_reset_hw(struct atl1c_hw *hw);
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c b/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
index 0a9326a..8826f56 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
@@ -230,8 +230,6 @@ static void atl1c_get_drvinfo(struct net_device *netdev,
 	struct atl1c_adapter *adapter = netdev_priv(netdev);
 
 	strlcpy(drvinfo->driver,  atl1c_driver_name, sizeof(drvinfo->driver));
-	strlcpy(drvinfo->version, atl1c_driver_version,
-		sizeof(drvinfo->version));
 	strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
 		sizeof(drvinfo->bus_info));
 	drvinfo->n_stats = 0;
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 0f21a9b..6bf387b 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -21,9 +21,7 @@
 
 #include "atl1c.h"
 
-#define ATL1C_DRV_VERSION "1.0.1.0-NAPI"
 char atl1c_driver_name[] = "atl1c";
-char atl1c_driver_version[] = ATL1C_DRV_VERSION;
 #define PCI_DEVICE_ID_ATTANSIC_L2C      0x1062
 #define PCI_DEVICE_ID_ATTANSIC_L1C      0x1063
 #define PCI_DEVICE_ID_ATHEROS_L2C_B	0x2060 /* AR8152 v1.1 Fast 10/100 */
@@ -57,7 +55,6 @@ MODULE_DEVICE_TABLE(pci, atl1c_pci_tbl);
 MODULE_AUTHOR("Jie Yang <jie.yang@atheros.com>");
 MODULE_DESCRIPTION("Atheros 1000M Ethernet Network Driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(ATL1C_DRV_VERSION);
 
 static int atl1c_stop_mac(struct atl1c_hw *hw);
 static void atl1c_enable_rx_ctrl(struct atl1c_hw *hw);
@@ -2761,8 +2758,6 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
 		goto err_register;
 	}
 
-	if (netif_msg_probe(adapter))
-		dev_info(&pdev->dev, "version %s\n", ATL1C_DRV_VERSION);
 	cards_found++;
 	return 0;
 
-- 
1.7.7

[PATCH 2/3] atl1c: change author

[Cloud Ren]

The author, jie yang, has left. please use nic-devel@qualcomm.com report bugs to
us.

Signed-off-by: Cloud Ren <cjren@qca.qualcomm.com>
---
 drivers/net/ethernet/atheros/atl1c/atl1c_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 6bf387b..815f683 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -52,7 +52,7 @@ static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = {
 };
 MODULE_DEVICE_TABLE(pci, atl1c_pci_tbl);
 
-MODULE_AUTHOR("Jie Yang <jie.yang@atheros.com>");
+MODULE_AUTHOR("Qualcomm Corporation, <nic-devel@qualcomm.com>");
 MODULE_DESCRIPTION("Atheros 1000M Ethernet Network Driver");
 MODULE_LICENSE("GPL");
 
-- 
1.7.7

[PATCH 3/3] atl1c: refine driver description

[Cloud Ren]

refine driver description make it more precise. And add a print information,
when loading driver.

Signed-off-by: Cloud Ren <cjren@qca.qualcomm.com>
---
 drivers/net/ethernet/atheros/atl1c/atl1c_main.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 815f683..1d5218a 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -22,6 +22,9 @@
 #include "atl1c.h"
 
 char atl1c_driver_name[] = "atl1c";
+static const char atl1c_drv_description[] =
+	"Qualcomm Atheros(R) AR813x/AR815x PCI-E Ethernet Network Driver";
+
 #define PCI_DEVICE_ID_ATTANSIC_L2C      0x1062
 #define PCI_DEVICE_ID_ATTANSIC_L1C      0x1063
 #define PCI_DEVICE_ID_ATHEROS_L2C_B	0x2060 /* AR8152 v1.1 Fast 10/100 */
@@ -53,7 +56,7 @@ static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = {
 MODULE_DEVICE_TABLE(pci, atl1c_pci_tbl);
 
 MODULE_AUTHOR("Qualcomm Corporation, <nic-devel@qualcomm.com>");
-MODULE_DESCRIPTION("Atheros 1000M Ethernet Network Driver");
+MODULE_DESCRIPTION("Qualcomm Atheros Gigabit Ethernet Driver");
 MODULE_LICENSE("GPL");
 
 static int atl1c_stop_mac(struct atl1c_hw *hw);
@@ -2907,6 +2910,7 @@ static struct pci_driver atl1c_driver = {
  */
 static int __init atl1c_init_module(void)
 {
+	pr_info("%s\n", atl1c_drv_description);
 	return pci_register_driver(&atl1c_driver);
 }
 
-- 
1.7.7

RE: [PATCH 2/3] atl1c: change author

[Rodriguez, Luis]

Um, actually, for now can you please use QCA or Qualcomm Atheros, Inc. QCA != Qualcomm.

  Luis
________________________________________
From: Ren, Cloud
Sent: Wednesday, February 29, 2012 9:41 PM
To: davem@davemloft.net; netdev@vger.kernel.org; linux-kernel@vger.kernel.org
Cc: qca-linux-team; nic-devel; Ren, Cloud
Subject: [PATCH 2/3] atl1c: change author

The author, jie yang, has left. please use nic-devel@qualcomm.com report bugs to
us.

Signed-off-by: Cloud Ren <cjren@qca.qualcomm.com>
---
 drivers/net/ethernet/atheros/atl1c/atl1c_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 6bf387b..815f683 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -52,7 +52,7 @@ static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = {
 };
 MODULE_DEVICE_TABLE(pci, atl1c_pci_tbl);

-MODULE_AUTHOR("Jie Yang <jie.yang@atheros.com>");
+MODULE_AUTHOR("Qualcomm Corporation, <nic-devel@qualcomm.com>");
 MODULE_DESCRIPTION("Atheros 1000M Ethernet Network Driver");
 MODULE_LICENSE("GPL");

--
1.7.7

Re: [PATCH 2/3] atl1c: change author

[Eric Dumazet]

Le jeudi 01 mars 2012 à 13:41 +0800, Cloud Ren a écrit :
> The author, jie yang, has left. please use nic-devel@qualcomm.com report bugs to
> us.
> 
> Signed-off-by: Cloud Ren <cjren@qca.qualcomm.com>
> ---
>  drivers/net/ethernet/atheros/atl1c/atl1c_main.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> index 6bf387b..815f683 100644
> --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> @@ -52,7 +52,7 @@ static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = {
>  };
>  MODULE_DEVICE_TABLE(pci, atl1c_pci_tbl);
>  
> -MODULE_AUTHOR("Jie Yang <jie.yang@atheros.com>");
> +MODULE_AUTHOR("Qualcomm Corporation, <nic-devel@qualcomm.com>");
>  MODULE_DESCRIPTION("Atheros 1000M Ethernet Network Driver");
>  MODULE_LICENSE("GPL");
>  

Jie Yang, _is_ the original author. Thats a truth.

Why would you want to remove this line, this sounds very bad.

What you probably want is a change in MAINTAINERS file to reflect who
maintains atl1c at this moment and how to reach them by email.

Notes:

- Its also possible to add a new MODULE_AUTHOR() line

- You could remove the obsolete email address and keep Jie Yang name as
in :

MODULE_AUTHOR("Jie Yang");

Re: [PATCH 3/3] atl1c: refine driver description

[Francois Romieu]

Cloud Ren <cjren@qca.qualcomm.com> :
[...]
> diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> index 815f683..1d5218a 100644
> --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
> @@ -22,6 +22,9 @@
>  #include "atl1c.h"
>  
>  char atl1c_driver_name[] = "atl1c";
> +static const char atl1c_drv_description[] =
> +	"Qualcomm Atheros(R) AR813x/AR815x PCI-E Ethernet Network Driver";
> +

Missing __initdata

Btw you can remove cards_found and the bd_number field.

-- 
Ueimor