From patchwork Wed Jun 2 07:38:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen (ThunderTown)" X-Patchwork-Id: 12293315 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 BFF0DC4708F for ; Wed, 2 Jun 2021 08:24:01 +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 7A43661360 for ; Wed, 2 Jun 2021 08:24:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A43661360 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=dOwPt8DwUC3CJGjxtTtpzz18cZjpQaxeBqwfmuF/Xfg=; b=EvuKUBxMSzvTj7 RhhE5EPg5pl3QbTVQlPwVpstxt44Rw5t2CiG9Gi/8rYtyvcfamlyVV5x1r3RL/xvC1bBkMGjj/BCC MPCHUT6VxGA5y2GWBSGRguBWyaRXHPKx4W0cKm15xwUGRwdCvVO23ExQ2rnh6a1Wd9lk3vX5R9e6w wo/sgJp5B2t0CCUhyTjMWukUhqnjm/Aq1QU4HZ86Jq9gAttRDaF73cdBmyDojiQQL2NjNL8dTUQGs 7aAcZYt9XTNyTNfTqX6j+VpWaYt/AuibSSWkpSf8kpsMxIfa/RvVgxN4YzLFyKmnUA2JHX3heID3a HNZHEC/tcKOmuF4Yv2fg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1loM8g-002bOw-So; Wed, 02 Jun 2021 08:22:11 +0000 Received: from szxga02-in.huawei.com ([45.249.212.188]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1loLSh-002Mlu-HU for linux-arm-kernel@lists.infradead.org; Wed, 02 Jun 2021 07:38:51 +0000 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Fw16B2q7zz685g; Wed, 2 Jun 2021 15:35:46 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggemv711-chm.china.huawei.com (10.1.198.66) 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 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 4/8] rtc: isl1208: use DEVICE_ATTR_* macro Date: Wed, 2 Jun 2021 15:38:16 +0800 Message-ID: <20210602073820.11011-5-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_962924_6A178D73 X-CRM114-Status: GOOD ( 10.85 ) 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_* 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-isl1208.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c index 182dfa605515572..1e0069ab9769647 100644 --- a/drivers/rtc/rtc-isl1208.c +++ b/drivers/rtc/rtc-isl1208.c @@ -654,9 +654,8 @@ static const struct rtc_class_ops isl1208_rtc_ops = { /* sysfs interface */ -static ssize_t -isl1208_sysfs_show_atrim(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t atrim_show(struct device *dev, + struct device_attribute *attr, char *buf) { int atr = isl1208_i2c_get_atr(to_i2c_client(dev->parent)); if (atr < 0) @@ -665,11 +664,10 @@ isl1208_sysfs_show_atrim(struct device *dev, return sprintf(buf, "%d.%.2d pF\n", atr >> 2, (atr & 0x3) * 25); } -static DEVICE_ATTR(atrim, S_IRUGO, isl1208_sysfs_show_atrim, NULL); +static DEVICE_ATTR_RO(atrim); -static ssize_t -isl1208_sysfs_show_dtrim(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t dtrim_show(struct device *dev, + struct device_attribute *attr, char *buf) { int dtr = isl1208_i2c_get_dtr(to_i2c_client(dev->parent)); if (dtr < 0) @@ -678,11 +676,10 @@ isl1208_sysfs_show_dtrim(struct device *dev, return sprintf(buf, "%d ppm\n", dtr - 100); } -static DEVICE_ATTR(dtrim, S_IRUGO, isl1208_sysfs_show_dtrim, NULL); +static DEVICE_ATTR_RO(dtrim); -static ssize_t -isl1208_sysfs_show_usr(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t usr_show(struct device *dev, + struct device_attribute *attr, char *buf) { int usr = isl1208_i2c_get_usr(to_i2c_client(dev->parent)); if (usr < 0) @@ -691,10 +688,9 @@ isl1208_sysfs_show_usr(struct device *dev, return sprintf(buf, "0x%.4x\n", usr); } -static ssize_t -isl1208_sysfs_store_usr(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t usr_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { int usr = -1; @@ -715,8 +711,7 @@ isl1208_sysfs_store_usr(struct device *dev, return count; } -static DEVICE_ATTR(usr, S_IRUGO | S_IWUSR, isl1208_sysfs_show_usr, - isl1208_sysfs_store_usr); +static DEVICE_ATTR_RW(usr); static struct attribute *isl1208_rtc_attrs[] = { &dev_attr_atrim.attr,