staging: octeon-ethernet: eliminate OCTEON_ETHERNET_VERSION

This driver has drifted away from out-of-tree versions years ago
and the version string does not provide any useful information.
Instead provide the kernel version string to ethtool, so that we get
useful version information e.g. for bug reports.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/octeon/ethernet-defines.h b/drivers/staging/octeon/ethernet-defines.h
index 8a6f82fb3e2c8b6367106c24cc428fe6cca7c2e3..2c986236f5a3dec1d4bacd1d6f9f11c9897b26c5 100644 (file)
--- a/drivers/staging/octeon/ethernet-defines.h
+++ b/drivers/staging/octeon/ethernet-defines.h
@@ -43,9 +43,6 @@
 
 #include <asm/octeon/cvmx-config.h>
 
-
-#define OCTEON_ETHERNET_VERSION "1.9"
-
 #ifdef CONFIG_NETFILTER
 #define REUSE_SKBUFFS_WITHOUT_FREE  0
 #else

diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c
index 6322d0dd4238d79ae0dfdb5f969244b2e30baa0e..2286acac495190bcce26d81cbfc685b88ef39951 100644 (file)
--- a/drivers/staging/octeon/ethernet-mdio.c
+++ b/drivers/staging/octeon/ethernet-mdio.c
@@ -29,7 +29,7 @@
 #include <linux/phy.h>
 #include <linux/ratelimit.h>
 #include <linux/of_mdio.h>
-
+#include <generated/utsrelease.h>
 #include <net/dst.h>
 
 #include <asm/octeon/octeon.h>
@@ -45,8 +45,8 @@
 static void cvm_oct_get_drvinfo(struct net_device *dev,
                                struct ethtool_drvinfo *info)
 {
-       strlcpy(info->driver, "cavium-ethernet", sizeof(info->driver));
-       strlcpy(info->version, OCTEON_ETHERNET_VERSION, sizeof(info->version));
+       strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+       strlcpy(info->version, UTS_RELEASE, sizeof(info->version));
        strlcpy(info->bus_info, "Builtin", sizeof(info->bus_info));
 }
 

diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index d05bdca37278583b87ed781e39797f213a02f32e..b8cd450465a484bc2428e78ac3e9575584dd9305 100644 (file)
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -681,7 +681,6 @@ static int cvm_oct_probe(struct platform_device *pdev)
        struct device_node *pip;
 
        octeon_mdiobus_force_mod_depencency();
-       pr_notice("cavium-ethernet %s\n", OCTEON_ETHERNET_VERSION);
 
        pip = pdev->dev.of_node;
        if (!pip) {