From patchwork Fri Aug 7 16:30:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marciniszyn, Mike" X-Patchwork-Id: 6971211 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5F8EEC05AC for ; Fri, 7 Aug 2015 16:30:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 80C6720588 for ; Fri, 7 Aug 2015 16:30:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F8152061B for ; Fri, 7 Aug 2015 16:30:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932279AbbHGQaq (ORCPT ); Fri, 7 Aug 2015 12:30:46 -0400 Received: from mga01.intel.com ([192.55.52.88]:19945 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932267AbbHGQaq (ORCPT ); Fri, 7 Aug 2015 12:30:46 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 07 Aug 2015 09:30:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,630,1432623600"; d="scan'208";a="537839047" Received: from sedona.ch.intel.com ([143.182.228.65]) by FMSMGA003.fm.intel.com with ESMTP; 07 Aug 2015 09:30:29 -0700 Received: from phlsvsles11.ph.intel.com (phlsvsles11.ph.intel.com [10.228.195.43]) by sedona.ch.intel.com (8.13.6/8.14.3/Standard MailSET/Hub) with ESMTP id t77GUS9V010808; Fri, 7 Aug 2015 09:30:28 -0700 Received: from phlsvslse11.ph.intel.com (localhost [127.0.0.1]) by phlsvsles11.ph.intel.com with ESMTP id t77GURPF023428; Fri, 7 Aug 2015 12:30:27 -0400 Subject: [PATCH v2] IB/hfi1: remove two files from /sys/class/infiniband To: dledford@redhat.com From: Mike Marciniszyn Cc: linux-rdma@vger.kernel.org Date: Fri, 07 Aug 2015 12:30:27 -0400 Message-ID: <20150807163027.23403.8339.stgit@phlsvslse11.ph.intel.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sadanand Warrier "version" and "localbus_info" are removed from the hfi1 sysfs directory. Reviewed-by: Mike Marciniszyn Signed-off-by: Sadanand Warrier --- Documentation/infiniband/sysfs.txt | 2 -- drivers/staging/hfi1/sysfs.c | 22 ---------------------- 2 files changed, 24 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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, };