openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Frank Haverkamp 2014-09-10 16:37:47 +02:00 committed by Greg Kroah-Hartman
parent 95a8825c9c
commit 64df2ec510
5 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/misc/genwqe/card_base.c
View File

@ -48,7 +48,7 @@ MODULE_AUTHOR("Joerg-Stephan Vogt <jsvogt@de.ibm.com>");
MODULE_AUTHOR("Michal Jung <mijung@de.ibm.com>"); MODULE_AUTHOR("Michal Jung <mijung@de.ibm.com>");
MODULE_DESCRIPTION("GenWQE Card"); MODULE_DESCRIPTION("GenWQE Card");
MODULE_VERSION(DRV_VERS_STRING); MODULE_VERSION(DRV_VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static char genwqe_driver_name[] = GENWQE_DEVNAME; static char genwqe_driver_name[] = GENWQE_DEVNAME;

2
drivers/misc/genwqe/card_ddcb.c
View File

@ -740,7 +740,7 @@ int genwqe_init_debug_data(struct genwqe_dev *cd, struct genwqe_debug_data *d)
} }
len = sizeof(d->driver_version); 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->slu_unitcfg = cd->slu_unitcfg;
d->app_unitcfg = cd->app_unitcfg; d->app_unitcfg = cd->app_unitcfg;
return 0; return 0;

2
drivers/misc/genwqe/card_debugfs.c
View File

@ -323,7 +323,7 @@ static int genwqe_info_show(struct seq_file *s, void *unused)
" Base Clock : %u MHz\n" " Base Clock : %u MHz\n"
" Arch/SVN Release: %u/%llx\n" " Arch/SVN Release: %u/%llx\n"
" Bitstream : %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) ? genwqe_is_privileged(cd) ?
"Physical" : "Virtual or no SR-IOV", "Physical" : "Virtual or no SR-IOV",
cd->card_idx, slu_id, app_id, cd->card_idx, slu_id, app_id,

9
drivers/misc/genwqe/card_sysfs.c
View File

@ -91,13 +91,6 @@ static ssize_t type_show(struct device *dev, struct device_attribute *attr,
} }
static DEVICE_ATTR_RO(type); 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, static ssize_t tempsens_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
@ -256,7 +249,6 @@ static struct attribute *genwqe_attributes[] = {
&dev_attr_next_bitstream.attr, &dev_attr_next_bitstream.attr,
&dev_attr_curr_bitstream.attr, &dev_attr_curr_bitstream.attr,
&dev_attr_base_clock.attr, &dev_attr_base_clock.attr,
&dev_attr_driver.attr,
&dev_attr_type.attr, &dev_attr_type.attr,
&dev_attr_version.attr, &dev_attr_version.attr,
&dev_attr_appid.attr, &dev_attr_appid.attr,
@ -268,7 +260,6 @@ static struct attribute *genwqe_attributes[] = {
}; };
static struct attribute *genwqe_normal_attributes[] = { static struct attribute *genwqe_normal_attributes[] = {
&dev_attr_driver.attr,
&dev_attr_type.attr, &dev_attr_type.attr,
&dev_attr_version.attr, &dev_attr_version.attr,
&dev_attr_appid.attr, &dev_attr_appid.attr,

2
drivers/misc/genwqe/genwqe_driver.h
View File

@ -36,7 +36,7 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/genwqe/genwqe_card.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 * Static minor number assignement, until we decide/implement