GenWQE: Remove sysfs entry for driver version

A special sysfs entry to display the driver version is not
needed. We left the driver version and adjusted it to the
naming a lot of other drivers use. The information can be
retrieved by using modinfo genwqe_card.

modinfo genwqe_card will provide the same information.

Signed-off-by: Frank Haverkamp <haver@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/genwqe/card_base.c b/drivers/misc/genwqe/card_base.c
index 070a55c361010ffb6e8bc2f318dde24f26e97379..c60ad4bd7ed6dae96c4ab857a6671ef32c60a0dd 100644 (file)
--- a/drivers/misc/genwqe/card_base.c
+++ b/drivers/misc/genwqe/card_base.c
@@ -48,7 +48,7 @@ MODULE_AUTHOR("Joerg-Stephan Vogt <jsvogt@de.ibm.com>");
 MODULE_AUTHOR("Michal Jung <mijung@de.ibm.com>");
 
 MODULE_DESCRIPTION("GenWQE Card");
-MODULE_VERSION(DRV_VERS_STRING);
+MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL");
 
 static char genwqe_driver_name[] = GENWQE_DEVNAME;

diff --git a/drivers/misc/genwqe/card_ddcb.c b/drivers/misc/genwqe/card_ddcb.c
index dc9851a5540e2d3473d2ea3c281793ad52f78219..1102e1ef8104dc9c478c9d0dee7e68e3d39c33fb 100644 (file)
--- a/drivers/misc/genwqe/card_ddcb.c
+++ b/drivers/misc/genwqe/card_ddcb.c
@@ -740,7 +740,7 @@ int genwqe_init_debug_data(struct genwqe_dev *cd, struct genwqe_debug_data *d)
        }
 
        len  = sizeof(d->driver_version);
-       snprintf(d->driver_version, len, "%s", DRV_VERS_STRING);
+       snprintf(d->driver_version, len, "%s", DRV_VERSION);
        d->slu_unitcfg = cd->slu_unitcfg;
        d->app_unitcfg = cd->app_unitcfg;
        return 0;

diff --git a/drivers/misc/genwqe/card_debugfs.c b/drivers/misc/genwqe/card_debugfs.c
index c9b4d6d0eb99a5ec47beda7336c5b9336025bb56..170a7915497cff08896a779e765ca7aec821566f 100644 (file)
--- a/drivers/misc/genwqe/card_debugfs.c
+++ b/drivers/misc/genwqe/card_debugfs.c
@@ -323,7 +323,7 @@ static int genwqe_info_show(struct seq_file *s, void *unused)
                   "    Base Clock      : %u MHz\n"
                   "    Arch/SVN Release: %u/%llx\n"
                   "    Bitstream       : %llx\n",
-                  GENWQE_DEVNAME, DRV_VERS_STRING, dev_name(&pci_dev->dev),
+                  GENWQE_DEVNAME, DRV_VERSION, dev_name(&pci_dev->dev),
                   genwqe_is_privileged(cd) ?
                   "Physical" : "Virtual or no SR-IOV",
                   cd->card_idx, slu_id, app_id,

diff --git a/drivers/misc/genwqe/card_sysfs.c b/drivers/misc/genwqe/card_sysfs.c
index 7232e40a3ad90670395318aa3aa6ce3d7fc8fe3e..1d1c6069ebd7d6c86400d28023a2c5c1a4152939 100644 (file)
--- a/drivers/misc/genwqe/card_sysfs.c
+++ b/drivers/misc/genwqe/card_sysfs.c
@@ -91,13 +91,6 @@ static ssize_t type_show(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR_RO(type);
 
-static ssize_t driver_show(struct device *dev, struct device_attribute *attr,
-                          char *buf)
-{
-       return sprintf(buf, "%s\n", DRV_VERS_STRING);
-}
-static DEVICE_ATTR_RO(driver);
-
 static ssize_t tempsens_show(struct device *dev, struct device_attribute *attr,
                             char *buf)
 {
@@ -256,7 +249,6 @@ static struct attribute *genwqe_attributes[] = {
        &dev_attr_next_bitstream.attr,
        &dev_attr_curr_bitstream.attr,
        &dev_attr_base_clock.attr,
-       &dev_attr_driver.attr,
        &dev_attr_type.attr,
        &dev_attr_version.attr,
        &dev_attr_appid.attr,
@@ -268,7 +260,6 @@ static struct attribute *genwqe_attributes[] = {
 };
 
 static struct attribute *genwqe_normal_attributes[] = {
-       &dev_attr_driver.attr,
        &dev_attr_type.attr,
        &dev_attr_version.attr,
        &dev_attr_appid.attr,

diff --git a/drivers/misc/genwqe/genwqe_driver.h b/drivers/misc/genwqe/genwqe_driver.h
index a506e9aa2d57227c4b42fb5ee553005f21a7e88f..e39d81fd93c48fca58b9017acc3f172d9f07ce79 100644 (file)
--- a/drivers/misc/genwqe/genwqe_driver.h
+++ b/drivers/misc/genwqe/genwqe_driver.h
@@ -36,7 +36,7 @@
 #include <asm/byteorder.h>
 #include <linux/genwqe/genwqe_card.h>
 
-#define DRV_VERS_STRING                "2.0.21"
+#define DRV_VERSION            "2.0.25"
 
 /*
  * Static minor number assignement, until we decide/implement