From: Sadanand Warrier <sadanand.warr...@intel.com> "version" and "localbus_info" are removed from the hfi1 sysfs directory.
Reviewed-by: Mike Marciniszyn <mike.marcinis...@intel.com> Signed-off-by: Sadanand Warrier <sadanand.warr...@intel.com> --- Documentation/infiniband/sysfs.txt | 2 -- drivers/staging/hfi1/sysfs.c | 22 ---------------------- 2 files changed, 24 deletions(-) diff --git a/Documentation/infiniband/sysfs.txt b/Documentation/infiniband/sysfs.txt index 23d1b6d..9028b02 100644 --- a/Documentation/infiniband/sysfs.txt +++ b/Documentation/infiniband/sysfs.txt @@ -71,12 +71,10 @@ HFI1 hw_rev - hardware revision board_id - manufacturing board id - version - driver version tempsense - thermal sense information serial - board serial number nfreectxts - number of free user contexts nctxts - number of allowed contexts (PSM2) - localbus_info - PCIe info chip_reset - diagnostic (root only) boardversion - board version ports/1/ diff --git a/drivers/staging/hfi1/sysfs.c b/drivers/staging/hfi1/sysfs.c index b10e857..b78c728 100644 --- a/drivers/staging/hfi1/sysfs.c +++ b/drivers/staging/hfi1/sysfs.c @@ -466,13 +466,6 @@ static ssize_t show_hfi(struct device *device, struct device_attribute *attr, return ret; } -static ssize_t show_version(struct device *device, - struct device_attribute *attr, char *buf) -{ - /* The string printed here is already newline-terminated. */ - return scnprintf(buf, PAGE_SIZE, "%s", (char *)ib_hfi1_version); -} - static ssize_t show_boardversion(struct device *device, struct device_attribute *attr, char *buf) { @@ -485,17 +478,6 @@ static ssize_t show_boardversion(struct device *device, } -static ssize_t show_localbus_info(struct device *device, - struct device_attribute *attr, char *buf) -{ - struct hfi1_ibdev *dev = - container_of(device, struct hfi1_ibdev, ibdev.dev); - struct hfi1_devdata *dd = dd_from_dev(dev); - - return scnprintf(buf, PAGE_SIZE, "%s\n", dd->lbus_info); -} - - static ssize_t show_nctxts(struct device *device, struct device_attribute *attr, char *buf) { @@ -599,25 +581,21 @@ static ssize_t show_tempsense(struct device *device, /* start of per-unit file structures and support code */ static DEVICE_ATTR(hw_rev, S_IRUGO, show_rev, NULL); static DEVICE_ATTR(board_id, S_IRUGO, show_hfi, NULL); -static DEVICE_ATTR(version, S_IRUGO, show_version, NULL); static DEVICE_ATTR(nctxts, S_IRUGO, show_nctxts, NULL); static DEVICE_ATTR(nfreectxts, S_IRUGO, show_nfreectxts, NULL); static DEVICE_ATTR(serial, S_IRUGO, show_serial, NULL); static DEVICE_ATTR(boardversion, S_IRUGO, show_boardversion, NULL); static DEVICE_ATTR(tempsense, S_IRUGO, show_tempsense, NULL); -static DEVICE_ATTR(localbus_info, S_IRUGO, show_localbus_info, NULL); static DEVICE_ATTR(chip_reset, S_IWUSR, NULL, store_chip_reset); static struct device_attribute *hfi1_attributes[] = { &dev_attr_hw_rev, &dev_attr_board_id, - &dev_attr_version, &dev_attr_nctxts, &dev_attr_nfreectxts, &dev_attr_serial, &dev_attr_boardversion, &dev_attr_tempsense, - &dev_attr_localbus_info, &dev_attr_chip_reset, }; -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html