From patchwork Sun May 23 06:51:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yue Haibing X-Patchwork-Id: 12274777 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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 95969C47080 for ; Sun, 23 May 2021 06:52:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 64E8F6127C for ; Sun, 23 May 2021 06:52:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231665AbhEWGxd (ORCPT ); Sun, 23 May 2021 02:53:33 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:5520 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231644AbhEWGxd (ORCPT ); Sun, 23 May 2021 02:53:33 -0400 Received: from dggems702-chm.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4FnrY41PqDzkY2V; Sun, 23 May 2021 14:49:12 +0800 (CST) Received: from dggema769-chm.china.huawei.com (10.1.198.211) by dggems702-chm.china.huawei.com (10.3.19.179) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Sun, 23 May 2021 14:52:01 +0800 Received: from localhost (10.174.179.215) by dggema769-chm.china.huawei.com (10.1.198.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Sun, 23 May 2021 14:52:00 +0800 From: YueHaibing To: CC: , , YueHaibing Subject: [PATCH -next] cuse: use DEVICE_ATTR_*() macros Date: Sun, 23 May 2021 14:51:52 +0800 Message-ID: <20210523065152.29632-1-yuehaibing@huawei.com> X-Mailer: git-send-email 2.10.2.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.174.179.215] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggema769-chm.china.huawei.com (10.1.198.211) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Use DEVICE_ATTR_*() helper instead of plain DEVICE_ATTR, which makes the code a bit shorter and easier to read. Signed-off-by: YueHaibing --- fs/fuse/cuse.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c index c7d882a9fe33..0df886224afe 100644 --- a/fs/fuse/cuse.c +++ b/fs/fuse/cuse.c @@ -574,25 +574,25 @@ static struct file_operations cuse_channel_fops; /* initialized during init */ * CUSE exports the same set of attributes to sysfs as fusectl. */ -static ssize_t cuse_class_waiting_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t waiting_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct cuse_conn *cc = dev_get_drvdata(dev); return sprintf(buf, "%d\n", atomic_read(&cc->fc.num_waiting)); } -static DEVICE_ATTR(waiting, 0400, cuse_class_waiting_show, NULL); +static DEVICE_ATTR_ADMIN_RO(waiting); -static ssize_t cuse_class_abort_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t abort_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct cuse_conn *cc = dev_get_drvdata(dev); fuse_abort_conn(&cc->fc); return count; } -static DEVICE_ATTR(abort, 0200, NULL, cuse_class_abort_store); +static DEVICE_ATTR_WO(abort); static struct attribute *cuse_class_dev_attrs[] = { &dev_attr_waiting.attr,