From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id C6CC01C1639 for ; Thu, 16 May 2019 21:38:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C3A7B85F5D for ; Thu, 16 May 2019 21:38:18 +0000 (UTC) Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fTPSeKGGq2n7 for ; Thu, 16 May 2019 21:38:17 +0000 (UTC) Received: from kadath.azazel.net (kadath.azazel.net [81.187.231.250]) by hemlock.osuosl.org (Postfix) with ESMTPS id 4F3E287EC5 for ; Thu, 16 May 2019 21:38:17 +0000 (UTC) From: Jeremy Sowden Subject: [PATCH v2 8/9] staging: kpc2000: add separate show functions for readable kp device attributes, and defined them as read-only. Date: Thu, 16 May 2019 22:38:13 +0100 Message-Id: <20190516213814.22232-9-jeremy@azazel.net> In-Reply-To: <20190516213814.22232-1-jeremy@azazel.net> References: <20190516200411.17715-1-jeremy@azazel.net> <20190516213814.22232-1-jeremy@azazel.net> MIME-Version: 1.0 List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" To: Linux Driver Project Developer List Cc: Greg KH Define separate simple show functions for each attribute instead of having a one big one containing a chain of conditionals. Replaced calls to scnprintf with sprintf since all the outputs are single integers. All the readable device attributes are read-only, so use DEVICE_ATTR_RO to define them. Signed-off-by: Jeremy Sowden --- drivers/staging/kpc2000/kpc2000/core.c | 89 +++++++++++++++++++------- 1 file changed, 66 insertions(+), 23 deletions(-) diff --git a/drivers/staging/kpc2000/kpc2000/core.c b/drivers/staging/kpc2000/kpc2000/core.c index 6147c47c44ab..6fa3dd6531ef 100644 --- a/drivers/staging/kpc2000/kpc2000/core.c +++ b/drivers/staging/kpc2000/kpc2000/core.c @@ -19,33 +19,76 @@ #include #include "pcie.h" - static atomic_t next_card_num = ATOMIC_INIT(1); /******************************************************* * SysFS Attributes ******************************************************/ -static ssize_t show_attr(struct device *dev, struct device_attribute *attr, char *buf) + +static ssize_t ssid_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct kp2000_device *pcard = dev_get_drvdata(dev); + + return sprintf(buf, "%016llx\n", pcard->ssid); +} + +static ssize_t ddna_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct kp2000_device *pcard = dev_get_drvdata(dev); + + return sprintf(buf, "%016llx\n", pcard->ddna); +} + +static ssize_t card_id_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct kp2000_device *pcard = dev_get_drvdata(dev); + + return sprintf(buf, "%08x\n", pcard->card_id); +} + +static ssize_t hw_rev_show(struct device *dev, struct device_attribute *attr, + char *buf) { - struct kp2000_device *pcard = dev_get_drvdata(dev); - - if (strcmp("ssid", attr->attr.name) == 0){ return scnprintf(buf, PAGE_SIZE, "%016llx\n", pcard->ssid); } else - if (strcmp("ddna", attr->attr.name) == 0){ return scnprintf(buf, PAGE_SIZE, "%016llx\n", pcard->ddna); } else - if (strcmp("card_id", attr->attr.name) == 0){ return scnprintf(buf, PAGE_SIZE, "%08x\n", pcard->card_id); } else - if (strcmp("hw_rev", attr->attr.name) == 0){ return scnprintf(buf, PAGE_SIZE, "%08x\n", pcard->hardware_revision); } else - if (strcmp("build", attr->attr.name) == 0){ return scnprintf(buf, PAGE_SIZE, "%08x\n", pcard->build_version); } else - if (strcmp("build_date", attr->attr.name) == 0){ return scnprintf(buf, PAGE_SIZE, "%08x\n", pcard->build_datestamp); } else - if (strcmp("build_time", attr->attr.name) == 0){ return scnprintf(buf, PAGE_SIZE, "%08x\n", pcard->build_timestamp); } else - { return -ENXIO; } + struct kp2000_device *pcard = dev_get_drvdata(dev); + + return sprintf(buf, "%08x\n", pcard->hardware_revision); +} + +static ssize_t build_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct kp2000_device *pcard = dev_get_drvdata(dev); + + return sprintf(buf, "%08x\n", pcard->build_version); +} + +static ssize_t build_date_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct kp2000_device *pcard = dev_get_drvdata(dev); + + return sprintf(buf, "%08x\n", pcard->build_datestamp); +} + +static ssize_t build_time_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct kp2000_device *pcard = dev_get_drvdata(dev); + + return sprintf(buf, "%08x\n", pcard->build_timestamp); } -static ssize_t show_cpld_config_reg(struct device *dev, struct device_attribute *attr, char *buf) +static ssize_t cpld_reg_show(struct device *dev, struct device_attribute *attr, + char *buf) { struct kp2000_device *pcard = dev_get_drvdata(dev); u64 val; val = readq(pcard->sysinfo_regs_base + REG_CPLD_CONFIG); - return scnprintf(buf, PAGE_SIZE, "%016llx\n", val); + return sprintf(buf, "%016llx\n", val); } static ssize_t cpld_reconfigure(struct device *dev, @@ -68,15 +111,15 @@ static ssize_t cpld_reconfigure(struct device *dev, return count; } -DEVICE_ATTR(ssid, 0444, show_attr, NULL); -DEVICE_ATTR(ddna, 0444, show_attr, NULL); -DEVICE_ATTR(card_id, 0444, show_attr, NULL); -DEVICE_ATTR(hw_rev, 0444, show_attr, NULL); -DEVICE_ATTR(build, 0444, show_attr, NULL); -DEVICE_ATTR(build_date, 0444, show_attr, NULL); -DEVICE_ATTR(build_time, 0444, show_attr, NULL); -DEVICE_ATTR(cpld_reg, 0444, show_cpld_config_reg, NULL); -DEVICE_ATTR(cpld_reconfigure, 0220, NULL, cpld_reconfigure); +DEVICE_ATTR_RO(ssid); +DEVICE_ATTR_RO(ddna); +DEVICE_ATTR_RO(card_id); +DEVICE_ATTR_RO(hw_rev); +DEVICE_ATTR_RO(build); +DEVICE_ATTR_RO(build_date); +DEVICE_ATTR_RO(build_time); +DEVICE_ATTR_RO(cpld_reg); +DEVICE_ATTR(cpld_reconfigure, 0220, NULL, cpld_reconfigure); static const struct attribute *kp_attr_list[] = { &dev_attr_ssid.attr, -- 2.20.1 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel