From patchwork Wed Jun 2 07:38:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen (ThunderTown)" X-Patchwork-Id: 12293317 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 0BB91C4708F for ; Wed, 2 Jun 2021 08:24:55 +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 C0D3361360 for ; Wed, 2 Jun 2021 08:24:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C0D3361360 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=cKtOoBnHHiGW7/nTUiN8Bs5AZUrt55cF5jRtWylYcqg=; b=GBYHKetSqvMPWy QH0VWRk6mYQA4LcZQ5rAKfFXKX9PsNxeRsMXVS6XKirVaKRm52sP1av+BD+C13dF7WbJ263LnBDW5 gzNXda8hIRLDgfm8QorZiTkCsj/0MgNK1UyKUedTGHeCYzJb9KdZoKqf6KNbxzkKiiGzQmNMuw0V6 l4uI0tvYqXNjYg1dTDRWTddSc2VkbGR5pJ/yJx4TU8ro1KdyKXVa2j+smfgaO+OF8ufpvKu+kPiig M/6FOV0ybITyS3i4iSU5a1mAv3/2z92wWgWWEKgY1LL7Ew9TlerDwF5flhIBoKE7pUEGXQHMwOnUB hs9Aqn89IOjDaJpIFRwA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1loM9T-002bjO-3H; Wed, 02 Jun 2021 08:22:59 +0000 Received: from szxga03-in.huawei.com ([45.249.212.189]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1loLSh-002Mlp-QK for linux-arm-kernel@lists.infradead.org; Wed, 02 Jun 2021 07:38:51 +0000 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Fw15H44YKz64ls; Wed, 2 Jun 2021 15:34:59 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggemv703-chm.china.huawei.com (10.3.19.46) 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:43 +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 6/8] rtc: ds1343: use DEVICE_ATTR_* macro Date: Wed, 2 Jun 2021 15:38:18 +0800 Message-ID: <20210602073820.11011-7-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_003848_232585_C280A897 X-CRM114-Status: GOOD ( 11.22 ) 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-ds1343.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/rtc/rtc-ds1343.c b/drivers/rtc/rtc-ds1343.c index f14ed6c96437b44..ffabb8b69e6d8e6 100644 --- a/drivers/rtc/rtc-ds1343.c +++ b/drivers/rtc/rtc-ds1343.c @@ -80,8 +80,8 @@ struct ds1343_priv { int irq; }; -static ssize_t ds1343_show_glitchfilter(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t glitch_filter_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct ds1343_priv *priv = dev_get_drvdata(dev->parent); int glitch_filt_status, data; @@ -99,9 +99,9 @@ static ssize_t ds1343_show_glitchfilter(struct device *dev, return sprintf(buf, "disabled\n"); } -static ssize_t ds1343_store_glitchfilter(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t glitch_filter_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct ds1343_priv *priv = dev_get_drvdata(dev->parent); int data = 0; @@ -120,8 +120,7 @@ static ssize_t ds1343_store_glitchfilter(struct device *dev, return count; } -static DEVICE_ATTR(glitch_filter, S_IRUGO | S_IWUSR, ds1343_show_glitchfilter, - ds1343_store_glitchfilter); +static DEVICE_ATTR_RW(glitch_filter); static int ds1343_nvram_write(void *priv, unsigned int off, void *val, size_t bytes) @@ -139,8 +138,8 @@ static int ds1343_nvram_read(void *priv, unsigned int off, void *val, return regmap_bulk_read(ds1343->map, DS1343_NVRAM + off, val, bytes); } -static ssize_t ds1343_show_tricklecharger(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t trickle_charger_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct ds1343_priv *priv = dev_get_drvdata(dev->parent); int res, data; @@ -183,7 +182,7 @@ static ssize_t ds1343_show_tricklecharger(struct device *dev, return sprintf(buf, "%s %s\n", diodes, resistors); } -static DEVICE_ATTR(trickle_charger, S_IRUGO, ds1343_show_tricklecharger, NULL); +static DEVICE_ATTR_RO(trickle_charger); static struct attribute *ds1343_attrs[] = { &dev_attr_glitch_filter.attr,