Skip to contentSkip to conversation

igc: Minor cleaning up of code

PATCH New Sasha Neftin 4 participants 4 messages Oct 24, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 igc: Minor cleaning up of code

Address few community comments.
Remove unused code, will be add per demand. Remove blank lines and unneeded includes. Update driver version accordance to kernel version.

---
 drivers/net/ethernet/intel/igc/igc.h      |  9 ---------
 drivers/net/ethernet/intel/igc/igc_main.c | 17 +----------------
 2 files changed, 1 insertion(+), 25 deletions(-)
drivers/net/ethernet/intel/igc/igc.h +0 -9
index cdf18a5d9e08..3b00b109b34a 100644
@@ -5,23 +5,14 @@
 #define _IGC_H_
 
 #include <linux/kobject.h>
-
 #include <linux/pci.h>
 #include <linux/netdevice.h>
 #include <linux/vmalloc.h>
-
 #include <linux/ethtool.h>
-
 #include <linux/sctp.h>
 
 #define IGC_ERR(args...) pr_err("igc: " args)
 
-#define PFX "igc: "
-
-#include <linux/timecounter.h>
-#include <linux/net_tstamp.h>
-#include <linux/ptp_clock_kernel.h>
-
 #include "igc_hw.h"
 
 /* main */
drivers/net/ethernet/intel/igc/igc_main.c +1 -16
index 9d85707e8a81..27d836f35bc2 100644
@@ -9,7 +9,7 @@
 #include "igc.h"
 #include "igc_hw.h"
 
-#define DRV_VERSION	"0.0.1-k"
+#define DRV_VERSION	"0.4.20-k"
 #define DRV_SUMMARY	"Intel(R) 2.5G Ethernet Linux Driver"
 
 static int debug = -1;
@@ -1700,20 +1700,6 @@ static bool igc_clean_tx_irq(struct igc_q_vector *q_vector, int napi_budget)
 }
 
 /**
- * igc_ioctl - I/O control method
- * @netdev: network interface device structure
- * @ifreq: frequency
- * @cmd: command
- */
-static int igc_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
-	switch (cmd) {
-	default:
-		return -EOPNOTSUPP;
-	}
-}
-
-/**
  * igc_up - Open the interface and prepare it to handle traffic
  * @adapter: board private structure
  */
@@ -3445,7 +3431,6 @@ static const struct net_device_ops igc_netdev_ops = {
 	.ndo_set_mac_address	= igc_set_mac,
 	.ndo_change_mtu		= igc_change_mtu,
 	.ndo_get_stats		= igc_get_stats,
-	.ndo_do_ioctl		= igc_ioctl,
 };
 
 /* PCIe configuration access */
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 igc: Minor cleaning up of code

drivers/net/ethernet/intel/igc/igc_main.c line 15

Quoted 11 lines · Sasha Neftin
drivers/net/ethernet/intel/igc/igc_main.c +1 -1
@@ -9,7 +9,7 @@
 #include "igc.h"
 #include "igc_hw.h"
 
-#define DRV_VERSION    "0.0.1-k"
+#define DRV_VERSION    "0.4.20-k"
 #define DRV_SUMMARY    "Intel(R) 2.5G Ethernet Linux Driver"
 
 static int debug = -1;

This is the only change that I do not agree with and feel we should not
implement the suggested change.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20181024/f69386d4/attachment.asc>

#2 lore raw

PATCH 1/1 igc: Minor cleaning up of code

Quoted 7 lines · Jeff Kirsher
Quoted 6 lines · Sasha Neftin
drivers/net/ethernet/intel/igc/igc_main.c +0 -0
@@ -9,7 +9,7 @@
  #include "igc.h"
  #include "igc_hw.h"
 
Quoted 9 lines

drivers/net/ethernet/intel/igc/igc_main.c line 15

Quoted 5 lines
drivers/net/ethernet/intel/igc/igc_main.c +1 -1
-#define DRV_VERSION    "0.0.1-k"
+#define DRV_VERSION    "0.4.20-k"
  #define DRV_SUMMARY    "Intel(R) 2.5G Ethernet Linux Driver"
 
  static int debug = -1;

This is the only change that I do not agree with and feel we should not implement the suggested change.

I will fix and re-send. We will follow our previous convention.

#3 lore raw

PATCH 1/1 igc: Minor cleaning up of code

In reply to Sasha Neftin

Dear Sasha,

Quoted 2 lines · Sasha Neftin

Address few community comments.
Remove unused code, will be add per demand.

added

Quoted 2 lines

Remove blank lines and unneeded includes. Update driver version accordance to kernel version.

in accordance

So, what is the new versioning scheme?

Why not split this up into three small commits?

Also, imperative mood seems more often used in the summary.

Quoted 3 lines

igc: Clean up code

igc: Do minor code clean-up

[?]

Kind regards,

Paul

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5174 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20181024/aa2cebc6/attachment.p7s>