[PATCH net-next 0/2] cleanup for realtek 8139CP

[PATCH net-next 0/2] cleanup for realtek 8139CP

[varkabhadram]

From: Varka Bhadram <varkab@cdac.in>

Varka Bhadram (2):
  ethernet: realtek: use module_pci_driver
  ethernet: realtek: use pci_device_id

 drivers/net/ethernet/realtek/8139cp.c |   30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

-- 
1.7.9.5

[PATCH net-next 1/2] ethernet: realtek: use module_pci_driver

[varkabhadram]

From: Varka Bhadram <varkab@cdac.in>

This patch converts to use the macro module_pci_driver, which makes
the code smaller and simpler.

Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
 drivers/net/ethernet/realtek/8139cp.c |   16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 2bc728e..9025fba 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -2121,18 +2121,4 @@ static struct pci_driver cp_driver = {
 #endif
 };
 
-static int __init cp_init (void)
-{
-#ifdef MODULE
-	pr_info("%s", version);
-#endif
-	return pci_register_driver(&cp_driver);
-}
-
-static void __exit cp_exit (void)
-{
-	pci_unregister_driver (&cp_driver);
-}
-
-module_init(cp_init);
-module_exit(cp_exit);
+module_pci_driver(cp_driver);
-- 
1.7.9.5

[PATCH net-next 2/2] ethernet: realtek: use pci_device_id

[varkabhadram]

From: Varka Bhadram <varkab@cdac.in>

This patch use the struct pci_device_id instead of using macro
DEFINE_PCI_DEVICE_TABLE which is deprecated and should not be used.
And also moves these ids after probe and remove functionalities.

Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
 drivers/net/ethernet/realtek/8139cp.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 9025fba..a2a2ac6 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -382,13 +382,6 @@ static int cp_get_eeprom(struct net_device *dev,
 static int cp_set_eeprom(struct net_device *dev,
 			 struct ethtool_eeprom *eeprom, u8 *data);
 
-static DEFINE_PCI_DEVICE_TABLE(cp_pci_tbl) = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	PCI_DEVICE_ID_REALTEK_8139), },
-	{ PCI_DEVICE(PCI_VENDOR_ID_TTTECH,	PCI_DEVICE_ID_TTTECH_MC322), },
-	{ },
-};
-MODULE_DEVICE_TABLE(pci, cp_pci_tbl);
-
 static struct {
 	const char str[ETH_GSTRING_LEN];
 } ethtool_stats_keys[] = {
@@ -2110,6 +2103,13 @@ static int cp_resume (struct pci_dev *pdev)
 }
 #endif /* CONFIG_PM */
 
+static const struct pci_device_id cp_pci_tbl[] = {
+        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     PCI_DEVICE_ID_REALTEK_8139), },
+        { PCI_DEVICE(PCI_VENDOR_ID_TTTECH,      PCI_DEVICE_ID_TTTECH_MC322), },
+        { },
+};
+MODULE_DEVICE_TABLE(pci, cp_pci_tbl);
+
 static struct pci_driver cp_driver = {
 	.name         = DRV_NAME,
 	.id_table     = cp_pci_tbl,
-- 
1.7.9.5

Re: [PATCH net-next 0/2] cleanup for realtek 8139CP

[David Miller]

From: varkabhadram@gmail.com
Date: Tue, 22 Jul 2014 11:28:46 +0530

> Varka Bhadram (2):
>   ethernet: realtek: use module_pci_driver
>   ethernet: realtek: use pci_device_id

Both applied, thanks.

Re: [PATCH net-next 0/2] cleanup for realtek 8139CP

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Mon, 21 Jul 2014 23:56:44 -0700 (PDT)

> From: varkabhadram@gmail.com
> Date: Tue, 22 Jul 2014 11:28:46 +0530
> 
>> Varka Bhadram (2):
>>   ethernet: realtek: use module_pci_driver
>>   ethernet: realtek: use pci_device_id
> 
> Both applied, thanks.

Actually, reverted, test your changes:

drivers/net/ethernet/realtek/8139cp.c:82:13: warning: ‘version’ defined but not used [-Wunused-variable]