From patchwork Mon Nov 21 12:38:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kurbanov X-Patchwork-Id: 23725 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1565630wrr; Mon, 21 Nov 2022 04:51:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf4WvIiNj+h6cbAfRykg3qOM4mdY+ej8MVWEnTb++8WZTjLLp4Qr5BbqyXBMtvmvdLrIWblS X-Received: by 2002:a17:906:8d86:b0:78d:4742:bb62 with SMTP id ry6-20020a1709068d8600b0078d4742bb62mr4226350ejc.43.1669035094176; Mon, 21 Nov 2022 04:51:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669035094; cv=none; d=google.com; s=arc-20160816; b=I/26sI7nNB3GWY2sIP7KDJOcA3l+SeCaGU2cWPu5PVU0/nonqQsPIKHmX66ojet/fB lI9pc+stkhQ2O8r5brVqHyhmPanhY7CzAJdQ9N6dd47zf2ge40nvaiwcr+pji981G6rS 1IqwUiHBSX88JxR+vWSgMwdsuJMWK+NYpOqrH3MddBW0M5LQBotSvvAafKi5AQvoK4rW 1hmKPzCgFIIYnB2aJjEOTr6wy014sYawIxugLmRM3AXCavAQvXAZX7hT1P7n6n2TQ7wY 2+iQLgzzmt5SvwQ7k71BFNgVvt4k6tbYHNnFKbwkEeJLz7UGvm28lyJg8ELE4O+d7jyo 2PXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Rj/rYCPzREnMvfpm/+WyfOnp58T9LOfDCyiLf96HgW8=; b=SxMXb84sQQIAmLmmh56t5rwoV0N5lWyOwC9ogQ8fZd7jAquSkxGUXAl/ovF2KUPEqx ytKj0ta63svW09+jwWbKWthARvs/1acMLKgT+Ob3aEs/gF90Hm11T+NOlSTYQlYXdt13 OzeyvTDYmZt3/Pbxxn06IXOzpZ9WMSxxbxBFdEdbOIE2xA+ORoaitRsQm/NA6pRjCfH1 NgklS7gOl6dZeVIg2rhhFZGYIXmFHAcklcUAduqsaoS9vdLWSfe/QSC0gHPzLYREe5HU MLBXRlS8LRZdlaMhI9x8PuSGUzZ5S4pjkP5lOY8acEwWwTTBus8ELvkLQdqO/LmcXKW5 aIkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Tc+QqEUN; 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=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id er16-20020a056402449000b0045d8bff7b1asi8758168edb.403.2022.11.21.04.51.08; Mon, 21 Nov 2022 04:51: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; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Tc+QqEUN; 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=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231475AbiKUMkK (ORCPT + 99 others); Mon, 21 Nov 2022 07:40:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231577AbiKUMjk (ORCPT ); Mon, 21 Nov 2022 07:39:40 -0500 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D80F629C9E; Mon, 21 Nov 2022 04:39:32 -0800 (PST) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 793355FD0A; Mon, 21 Nov 2022 15:39:30 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1669034370; bh=Rj/rYCPzREnMvfpm/+WyfOnp58T9LOfDCyiLf96HgW8=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=Tc+QqEUNAGf3MphsbdlqbV7Kf1uvvSL8AcCZCm1Lg/kCHMuCzY2sV/IrJDSXlPHkn cA0JSrnMCMBzj77wHzH3gcpEzbGCb8mwZQQa9nc54BXlBLwEd7lFzNUeHclclylw0Q dl1q2f4IMIhbElj8UVu8dVqv846svZHSNa7NsCYfqSHAISQZRt6aRu+h0aKz+vSsiv zBbISmm5uT5jcyNislHdUXlm1AGduBnUM5iRCysuobvPSAY6d8JBiQp2NeCcm2sECd LJ3vnOznTHhj4mq5AO68hOLAOHcluWsDT/N6FPBAu7vDc7Dkq1w3g/l+5k3QRXwieo XqGnPcQqe3c0w== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Mon, 21 Nov 2022 15:39:30 +0300 (MSK) From: Martin Kurbanov To: Pavel Machek , Raphael Teysseyre , Andy Shevchenko CC: , , , Martin Kurbanov Subject: [PATCH v2 1/2] leds: trigger: pattern: minor code style changes Date: Mon, 21 Nov 2022 15:38:32 +0300 Message-ID: <20221121123833.164614-2-mmkurbanov@sberdevices.ru> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221121123833.164614-1-mmkurbanov@sberdevices.ru> References: <20221121123833.164614-1-mmkurbanov@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH02.sberdevices.ru (172.16.1.5) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2022/11/21 03:43:00 #20593185 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750110142867222996?= X-GMAIL-MSGID: =?utf-8?q?1750110142867222996?= This patch adds some minor code style changes: - remove a blank line before DEVICE_ATTR_RW declarations - convert sysfs scnprintf() to sysfs_emit()/sysfs_emit_at() - use module_led_trigger instead of pattern_trig_init/exit Signed-off-by: Martin Kurbanov --- drivers/leds/trigger/ledtrig-pattern.c | 29 +++++++------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/drivers/leds/trigger/ledtrig-pattern.c b/drivers/leds/trigger/ledtrig-pattern.c index 43a265dc4696..354304b404aa 100644 --- a/drivers/leds/trigger/ledtrig-pattern.c +++ b/drivers/leds/trigger/ledtrig-pattern.c @@ -155,7 +155,7 @@ static ssize_t repeat_show(struct device *dev, struct device_attribute *attr, mutex_unlock(&data->lock); - return scnprintf(buf, PAGE_SIZE, "%d\n", repeat); + return sysfs_emit(buf, "%d\n", repeat); } static ssize_t repeat_store(struct device *dev, struct device_attribute *attr, @@ -192,7 +192,6 @@ static ssize_t repeat_store(struct device *dev, struct device_attribute *attr, mutex_unlock(&data->lock); return err < 0 ? err : count; } - static DEVICE_ATTR_RW(repeat); static ssize_t pattern_trig_show_patterns(struct pattern_trig_data *data, @@ -207,13 +206,13 @@ static ssize_t pattern_trig_show_patterns(struct pattern_trig_data *data, goto out; for (i = 0; i < data->npatterns; i++) { - count += scnprintf(buf + count, PAGE_SIZE - count, - "%d %u ", - data->patterns[i].brightness, - data->patterns[i].delta_t); + count += sysfs_emit_at(buf, count, + "%d %u ", + data->patterns[i].brightness, + data->patterns[i].delta_t); } - buf[count - 1] = '\n'; + sysfs_emit_at(buf, count - 1, "\n"); out: mutex_unlock(&data->lock); @@ -307,7 +306,6 @@ static ssize_t pattern_store(struct device *dev, struct device_attribute *attr, return pattern_trig_store_patterns(led_cdev, buf, NULL, count, false); } - static DEVICE_ATTR_RW(pattern); static ssize_t hw_pattern_show(struct device *dev, @@ -327,7 +325,6 @@ static ssize_t hw_pattern_store(struct device *dev, return pattern_trig_store_patterns(led_cdev, buf, NULL, count, true); } - static DEVICE_ATTR_RW(hw_pattern); static umode_t pattern_trig_attrs_mode(struct kobject *kobj, @@ -443,19 +440,7 @@ static struct led_trigger pattern_led_trigger = { .deactivate = pattern_trig_deactivate, .groups = pattern_trig_groups, }; - -static int __init pattern_trig_init(void) -{ - return led_trigger_register(&pattern_led_trigger); -} - -static void __exit pattern_trig_exit(void) -{ - led_trigger_unregister(&pattern_led_trigger); -} - -module_init(pattern_trig_init); -module_exit(pattern_trig_exit); +module_led_trigger(pattern_led_trigger); MODULE_AUTHOR("Raphael Teysseyre "); MODULE_AUTHOR("Baolin Wang ");