Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp6262968rwb; Mon, 14 Nov 2022 17:19:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf75fIGelHn4SYGoUz/KjgAcNt2to/boEbVHqQMlDQTe0vESSuIxh4LNbFalC6Wq5LNeci2U X-Received: by 2002:a62:ea02:0:b0:563:f32:2c9d with SMTP id t2-20020a62ea02000000b005630f322c9dmr15669657pfh.32.1668475174021; Mon, 14 Nov 2022 17:19:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668475174; cv=none; d=google.com; s=arc-20160816; b=ZGbbcj9IazBsDdt8olNWPbtZXoj9rCPYfv8ZVYF+dUxMRYcxT63TeLbMCxOGCGxM+y UBAEOgmmRRs3nqZSXkwMuVfvrMTfjVH5j5l+bm8tXlScx9x9Bsh4iT5q6uv5DQ2A1s9J /kCyQO5uZ0b2Og5XZltOWyOkbrrxx6mwAfnGnv2gEtO6GhSWQ6RxMz+Gyn1d0T3MzhwH opFdfSKlwNA+xfeIloWIcPfTuhnIMHujp3t0ojysAW8Dym3KhDxLt5Os4WYZkMj7Vb6e 527pQMvFOX2TTf8gh/SNGqVn01jBFTS6ZK26DgbZw70sH24tYtXln8QvpazGNTWLWEhC duew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=kbvYQCAqXlXgSDl9PwsB3hAf2JrdFWYd7tiO6YYjpEE=; b=rx72E6YTXCftCqkUTFdnDrxpMVhEH7uR5zTx+Qyt3NbfzFczkCx2QU1GJrp/saa1qY CStBKnKRCgrFVAtSVRBod3lLTd12M3dmZwzU1V7cV6SvJsPgem+cQpyH5dmwL1dedRlZ X76nBrg2exq3QNsXOcUbfTB6qIkR4SUzMtUY+MD2jU8DBvlQW5sD8Xcp+2VjQmiaOuVc dECDgVno3nf6p5+rdTaqqG3xiWXtuILgKrytxI3UgpKq6xnWW/sxYcdandGX+pj3caf5 +1l3Kiu2fn/d0YzOuSui8yhY7PeEunu/G5LH9JfCzrHVcQ0kj3wv8TomYSfPOeJxL4RU 4VtA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e4-20020a17090a4a0400b00213a9e1fa86si13790039pjh.73.2022.11.14.17.19.20; Mon, 14 Nov 2022 17:19:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231851AbiKOBNC (ORCPT + 90 others); Mon, 14 Nov 2022 20:13:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230072AbiKOBNA (ORCPT ); Mon, 14 Nov 2022 20:13:00 -0500 Received: from mxct.zte.com.cn (mxct.zte.com.cn [58.251.27.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86482FAC6; Mon, 14 Nov 2022 17:12:58 -0800 (PST) Received: from mxde.zte.com.cn (unknown [10.35.20.165]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4NB7TN3Gkrz1DDK; Tue, 15 Nov 2022 09:12:56 +0800 (CST) Received: from mxus.zte.com.cn (unknown [10.207.168.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mxde.zte.com.cn (FangMail) with ESMTPS id 4NB7TJ38wbz4xD2y; Tue, 15 Nov 2022 09:12:52 +0800 (CST) Received: from mxhk.zte.com.cn (unknown [192.168.250.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mxus.zte.com.cn (FangMail) with ESMTPS id 4NB7TF08q7zdmc16; Tue, 15 Nov 2022 09:12:49 +0800 (CST) Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4NB7T95QW7z8RV7D; Tue, 15 Nov 2022 09:12:45 +0800 (CST) Received: from xaxapp01.zte.com.cn ([10.88.40.50]) by mse-fl2.zte.com.cn with SMTP id 2AF1CAIh093991; Tue, 15 Nov 2022 09:12:40 +0800 (+08) (envelope-from guo.ziliang@zte.com.cn) Received: from mapi (xaxapp03[null]) by mapi (Zmail) with MAPI id mid32; Tue, 15 Nov 2022 09:12:08 +0800 (CST) Date: Tue, 15 Nov 2022 09:12:08 +0800 (CST) X-Zmail-TransId: 2afb6372e7687810efd4 X-Mailer: Zmail v1.0 Message-ID: <202211150912088591872@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , Subject: =?UTF-8?B?W1BBVENIIGxpbnV4LW5leHRdIHpyYW06IHVzZSBzeXNmc19lbWl0KCkgdG8gaW5zdGVhZCBvZiBzY25wcmludGYoKQ==?= Content-Type: text/plain; charset="UTF-8" X-MAIL: mse-fl2.zte.com.cn 2AF1CAIh093991 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.251.14.novalocal with ID 6372E797.000 by FangMail milter! X-FangMail-Envelope: 1668474776/4NB7TN3Gkrz1DDK/6372E797.000/10.35.20.165/[10.35.20.165]/mxde.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 6372E797.000/4NB7TN3Gkrz1DDK X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: guo ziliang Replace the open-code with sysfs_emit() to simplify the code.) Signed-off-by: guo ziliang --- drivers/block/zram/zram_drv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 171eccc..a0399ee 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -255,7 +255,7 @@ static ssize_t initstate_show(struct device *dev, val = init_done(zram); up_read(&zram->init_lock); - return scnprintf(buf, PAGE_SIZE, "%u\n", val); + return sysfs_emit(buf, "%u\n", val); } static ssize_t disksize_show(struct device *dev, @@ -263,7 +263,7 @@ static ssize_t disksize_show(struct device *dev, { struct zram *zram = dev_to_zram(dev); - return scnprintf(buf, PAGE_SIZE, "%llu\n", zram->disksize); + return sysfs_emit(buf, "%llu\n", zram->disksize); } static ssize_t mem_limit_store(struct device *dev, @@ -404,7 +404,7 @@ static ssize_t writeback_limit_enable_show(struct device *dev, spin_unlock(&zram->wb_limit_lock); up_read(&zram->init_lock); - return scnprintf(buf, PAGE_SIZE, "%d\n", val); + return sysfs_emit(buf, "%d\n", val); } static ssize_t writeback_limit_store(struct device *dev, @@ -439,7 +439,7 @@ static ssize_t writeback_limit_show(struct device *dev, spin_unlock(&zram->wb_limit_lock); up_read(&zram->init_lock); - return scnprintf(buf, PAGE_SIZE, "%llu\n", val); + return sysfs_emit(buf, "%llu\n", val); } static void reset_bdev(struct zram *zram) @@ -1021,6 +1021,7 @@ static ssize_t max_comp_streams_show(struct device *dev, struct device_attribute *attr, char *buf) { return scnprintf(buf, PAGE_SIZE, "%d\n", num_online_cpus()); + return sysfs_emit(buf, "%d\n", num_online_cpus()); } static ssize_t max_comp_streams_store(struct device *dev, @@ -2504,7 +2505,7 @@ static ssize_t hot_add_show(struct class *class, if (ret < 0) return ret; - return scnprintf(buf, PAGE_SIZE, "%d\n", ret); + return sysfs_emit(buf, "%d\n", ret); } static struct class_attribute class_attr_hot_add = __ATTR(hot_add, 0400, hot_add_show, NULL); -- 1.8.3.1