From patchwork Wed Jun 2 07:38:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen (ThunderTown)" X-Patchwork-Id: 12293313 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D407AC4708F for ; Wed, 2 Jun 2021 08:23:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9A29B613AC for ; Wed, 2 Jun 2021 08:23:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A29B613AC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CHvnLdK2hb1rMEhqK2KL07WPZJcupVea/lO/XeADlTE=; b=TxpXozVHOtl+un fPCllj3JTdvSapnVu0gJETkyUS7jfLcZ9Gs5g96NLlxzWSpQiRDQGiHk3zcl15GWMwYI2gv8XMPfs VTRhzqiXvLMKhfYA0rvEWhUJuiK8ufk5elKQTD9jGh8m7k56mwdZzXPV/pQ7YacBKpQucirh3FZqx FB04bz3cIF0ddN4lkUVSfPsT2cqcKfxyeFhTZ/WZH4qKcQwJRD7JBDVGDdsXkv3022HsarRJMNBTD ORi7u4oIk2kL9g4JsaRy/Ium9zEFtPd/NfhHYeRcGjVq6agpjOA3i/4575PhYgmRYqaH7pfALTR4T 0lO+8/23nZwQZFyIId+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1loM83-002b8z-K3; Wed, 02 Jun 2021 08:21:32 +0000 Received: from szxga08-in.huawei.com ([45.249.212.255]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1loLSh-002Mli-9A for linux-arm-kernel@lists.infradead.org; Wed, 02 Jun 2021 07:38:51 +0000 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Fw1484r63z19RJy; Wed, 2 Jun 2021 15:34:00 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 2 Jun 2021 15:38:43 +0800 Received: from thunder-town.china.huawei.com (10.174.177.72) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 2 Jun 2021 15:38:42 +0800 From: Zhen Lei To: Alessandro Zummo , Alexandre Belloni , Joshua Kinard , "Linus Walleij" , linux-arm-kernel , linux-rtc , linux-kernel CC: Zhen Lei Subject: [PATCH 5/8] rtc: ds1685: use DEVICE_ATTR_RO macro Date: Wed, 2 Jun 2021 15:38:17 +0800 Message-ID: <20210602073820.11011-6-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20210602073820.11011-1-thunder.leizhen@huawei.com> References: <20210602073820.11011-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.177.72] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210602_003847_758531_F0CBC18A X-CRM114-Status: GOOD ( 10.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use DEVICE_ATTR_RO macro helper instead of plain DEVICE_ATTR, which makes the code a bit shorter and easier to read. Signed-off-by: Zhen Lei --- drivers/rtc/rtc-ds1685.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c index 75db7ab654a5ae1..60209320c7ac9ca 100644 --- a/drivers/rtc/rtc-ds1685.c +++ b/drivers/rtc/rtc-ds1685.c @@ -975,14 +975,13 @@ static int ds1685_nvram_write(void *priv, unsigned int pos, void *val, /* SysFS interface */ /** - * ds1685_rtc_sysfs_battery_show - sysfs file for main battery status. + * battery_show - sysfs file for main battery status. * @dev: pointer to device structure. * @attr: pointer to device_attribute structure. * @buf: pointer to char array to hold the output. */ -static ssize_t -ds1685_rtc_sysfs_battery_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t battery_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct ds1685_priv *rtc = dev_get_drvdata(dev->parent); u8 ctrld; @@ -992,17 +991,16 @@ ds1685_rtc_sysfs_battery_show(struct device *dev, return sprintf(buf, "%s\n", (ctrld & RTC_CTRL_D_VRT) ? "ok" : "not ok or N/A"); } -static DEVICE_ATTR(battery, S_IRUGO, ds1685_rtc_sysfs_battery_show, NULL); +static DEVICE_ATTR_RO(battery); /** - * ds1685_rtc_sysfs_auxbatt_show - sysfs file for aux battery status. + * auxbatt_show - sysfs file for aux battery status. * @dev: pointer to device structure. * @attr: pointer to device_attribute structure. * @buf: pointer to char array to hold the output. */ -static ssize_t -ds1685_rtc_sysfs_auxbatt_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t auxbatt_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct ds1685_priv *rtc = dev_get_drvdata(dev->parent); u8 ctrl4a; @@ -1014,17 +1012,16 @@ ds1685_rtc_sysfs_auxbatt_show(struct device *dev, return sprintf(buf, "%s\n", (ctrl4a & RTC_CTRL_4A_VRT2) ? "ok" : "not ok or N/A"); } -static DEVICE_ATTR(auxbatt, S_IRUGO, ds1685_rtc_sysfs_auxbatt_show, NULL); +static DEVICE_ATTR_RO(auxbatt); /** - * ds1685_rtc_sysfs_serial_show - sysfs file for silicon serial number. + * serial_show - sysfs file for silicon serial number. * @dev: pointer to device structure. * @attr: pointer to device_attribute structure. * @buf: pointer to char array to hold the output. */ -static ssize_t -ds1685_rtc_sysfs_serial_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t serial_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct ds1685_priv *rtc = dev_get_drvdata(dev->parent); u8 ssn[8]; @@ -1035,7 +1032,7 @@ ds1685_rtc_sysfs_serial_show(struct device *dev, return sprintf(buf, "%8phC\n", ssn); } -static DEVICE_ATTR(serial, S_IRUGO, ds1685_rtc_sysfs_serial_show, NULL); +static DEVICE_ATTR_RO(serial); /* * struct ds1685_rtc_sysfs_misc_attrs - list for misc RTC features.