Skip to contentSkip to conversation

fm10k: remove duplication of the driver summary

PATCH New Jacob Keller 2 participants 3 messages Feb 26, 2016

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

PATCH v3 1/1 fm10k: remove duplication of the driver summary

Use DRV_SUMMARY, similar to DRV_VERSION so that we don't have duplicate copies of the summary left in the driver.

Also update the file copyright string and the ethtool copyright string while we are here.

---
 drivers/net/ethernet/intel/fm10k/fm10k_main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_main.c +5 -5
index 3a81c1451624..98166e8b0789 100644
@@ -1,5 +1,5 @@
 /* Intel Ethernet Switch Host Interface Driver
- * Copyright(c) 2013 - 2014 Intel Corporation.
+ * Copyright(c) 2013 - 2016 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -29,15 +29,15 @@
 #include "fm10k.h"
 
 #define DRV_VERSION	"0.19.3-k"
+#define DRV_SUMMARY	"Intel(R) Ethernet Switch Host Interface Driver"
 const char fm10k_driver_version[] = DRV_VERSION;
 char fm10k_driver_name[] = "fm10k";
-static const char fm10k_driver_string[] =
-	"Intel(R) Ethernet Switch Host Interface Driver";
+static const char fm10k_driver_string[] = DRV_SUMMARY;
 static const char fm10k_copyright[] =
-	"Copyright (c) 2013 Intel Corporation.";
+	"Copyright (c) 2013 - 2016 Intel Corporation.";
 
 MODULE_AUTHOR("Intel Corporation, <[email protected]>");
-MODULE_DESCRIPTION("Intel(R) Ethernet Switch Host Interface Driver");
+MODULE_DESCRIPTION(DRV_SUMMARY);
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
Signature · 1 line
2.7.1.429.g45cd78e
#1 lore raw

PATCH v3 1/1 fm10k: remove duplication of the driver summary

Quoted 8 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jacob Keller
Sent: Thursday, February 25, 2016 5:08 PM
To: Intel Wired LAN
Subject: [Intel-wired-lan] [PATCH v3] fm10k: remove duplication of the driver summary

Quoted 5 lines

Use DRV_SUMMARY, similar to DRV_VERSION so that we don't have duplicate
copies of the summary left in the driver.

Also update the file copyright string and the ethtool copyright string

What do you mean "the ethtool copyright string"? Typo?

Quoted 47 lines

while we are here.

---
 drivers/net/ethernet/intel/fm10k/fm10k_main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_main.c +2 -1
index 3a81c1451624..98166e8b0789 100644
@@ -1,5 +1,5 @@
 /* Intel Ethernet Switch Host Interface Driver
- * Copyright(c) 2013 - 2014 Intel Corporation.
+ * Copyright(c) 2013 - 2016 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -29,15 +29,15 @@
 #include "fm10k.h"
 
 #define DRV_VERSION	"0.19.3-k"
+#define DRV_SUMMARY	"Intel(R) Ethernet Switch Host Interface

Driver"
const char fm10k_driver_version[] = DRV_VERSION;
char fm10k_driver_name[] = "fm10k";

drivers/net/ethernet/intel/fm10k/fm10k_main.c +3 -5
-static const char fm10k_driver_string[] =
-	"Intel(R) Ethernet Switch Host Interface Driver";
+static const char fm10k_driver_string[] = DRV_SUMMARY;
 static const char fm10k_copyright[] =
-	"Copyright (c) 2013 Intel Corporation.";
+	"Copyright (c) 2013 - 2016 Intel Corporation.";
 
 MODULE_AUTHOR("Intel Corporation, <[email protected]>");
-MODULE_DESCRIPTION("Intel(R) Ethernet Switch Host Interface Driver");
+MODULE_DESCRIPTION(DRV_SUMMARY);
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
--

2.7.1.429.g45cd78e

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at lists.osuosl.org
http://lists.osuosl.org/mailman/listinfo/intel-wired-lan

#2 lore raw

PATCH v3 1/1 fm10k: remove duplication of the driver summary

Quoted 11 lines · Bruce W
Quoted 11 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl. org] On
Behalf Of Jacob Keller
Sent: Thursday, February 25, 2016 5:08 PM
To: Intel Wired LAN
Subject: [Intel-wired-lan] [PATCH v3] fm10k: remove duplication of the
driver summary

Quoted 8 lines
Quoted 6 lines

Use DRV_SUMMARY, similar to DRV_VERSION so that we don't have duplicate
copies of the summary left in the driver.

Also update the file copyright string and the ethtool copyright string

What do you mean "the ethtool copyright string"???Typo?

Brain cramp. I meant the string we display in the module info, and for some reason I went to the ethtool -i output, obviously incorrect. I can fix that up.

Thanks,
Jake

Quoted 52 lines
Quoted 52 lines

while we are here.

---
?drivers/net/ethernet/intel/fm10k/fm10k_main.c | 10 +++++----- ?1 file changed, 5 insertions(+), 5 deletions(-)

drivers/net/ethernet/intel/fm10k/fm10k_main.c +0 -0
index 3a81c1451624..98166e8b0789 100644
@@ -1,5 +1,5 @@

?/* Intel Ethernet Switch Host Interface Driver
- * Copyright(c) 2013 - 2014 Intel Corporation.
+ * Copyright(c) 2013 - 2016 Intel Corporation.
? *
? * This program is free software; you can redistribute it and/or modify it
? * under the terms and conditions of the GNU General Public License,

drivers/net/ethernet/intel/fm10k/fm10k_main.c +0 -0
@@ -29,15 +29,15 @@

?#include "fm10k.h"

?#define DRV_VERSION "0.19.3-k"
+#define DRV_SUMMARY "Intel(R) Ethernet Switch Host
Interface
Driver"
?const char fm10k_driver_version[] = DRV_VERSION;
?char fm10k_driver_name[] = "fm10k";

drivers/net/ethernet/intel/fm10k/fm10k_main.c +1 -2
-static const char fm10k_driver_string[] =
-	"Intel(R) Ethernet Switch Host Interface Driver";
+static const char fm10k_driver_string[] = DRV_SUMMARY;

?static const char fm10k_copyright[] =

drivers/net/ethernet/intel/fm10k/fm10k_main.c +1 -1
-	"Copyright (c) 2013 Intel Corporation.";
+	"Copyright (c) 2013 - 2016 Intel Corporation.";

?MODULE_AUTHOR("Intel Corporation, <[email protected]>"); -MODULE_DESCRIPTION("Intel(R) Ethernet Switch Host Interface Driver");
+MODULE_DESCRIPTION(DRV_SUMMARY); ?MODULE_LICENSE("GPL"); ?MODULE_VERSION(DRV_VERSION);

--
2.7.1.429.g45cd78e

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at lists.osuosl.org
http://lists.osuosl.org/mailman/listinfo/intel-wired-lan