Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp1087341rwb; Fri, 7 Oct 2022 08:00:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM72Cb5a3hDJpTPlYZhNb0k0ERXifLRuUWNP4tSNDqLAmU6vGcikwTgOpYwMZs/PFHZp/5mq X-Received: by 2002:a17:907:728e:b0:782:8e91:64c8 with SMTP id dt14-20020a170907728e00b007828e9164c8mr4569904ejc.36.1665154844460; Fri, 07 Oct 2022 08:00:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665154844; cv=none; d=google.com; s=arc-20160816; b=BiRk4dR+I21mH0odhc6k3NGdET/GLnnbKZHgQZ2hRVnXQ1wNhgKXf/JDLCIyYzizdP hCBse0q5azyuakANaQ1SpJVwL+LJM4ZIFmcV+wbAaDMEPsoxc0nJZSeaGftDVU5/hn5A dW1XQBafWZhqqEirY0soY2QeFv9Z2aQCJUZTrEVSayU2nbw34hV3KsI1aByRBzdmOTaI az03mIeuDz7YazNG++Ue7nIm0mHyb5/UHt6gEvGlcW2Wv9XMNpCjuMr+yLBtLjEvIxI2 RBmpCOoKfV9JWwdT2d0J5hubM5LRq//be7v9dONCqP+7rHgwDwQP34YLnY2VRNIovl2D z6OQ== 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; bh=iIVkzkUIVQ2DEvR56iqaqwkhNM58nOKf8p/SMRxi8Uo=; b=NWuV5M7LrzPOYWKSe1AJly26VYsneTR747EbUKV2QgHq4zlWuBX+2svEpp1RM3uKA7 3b/nCQc3hbFSYq/35txgCfIKdsk7YGNMN6WtDR/b7/SGlisNGwAbgvdxxcmG2khU0rwr Fm15zEsh6UfXGu+RHa5lHxPOO8N8OjmWTUVXP3TY9Wyt5pCqP4BdIn7NBDAAQpnodduY YTbcQF9KaugSogpBkRZEiXMzToZh4rHqfKKje8FvCOSwPka+97FsS1UJl4bFfS9KdRPs FpiFLZG7DacVbgli+R9KvjgJlum7A+2l1nvjqBrRoORXRR04ToYdcsD0XrLYee6ZFY90 ejOA== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m6-20020a056402510600b004587e08bbcbsi2846252edd.520.2022.10.07.07.59.54; Fri, 07 Oct 2022 08:00:44 -0700 (PDT) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229913AbiJGO5C (ORCPT + 99 others); Fri, 7 Oct 2022 10:57:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbiJGO4y (ORCPT ); Fri, 7 Oct 2022 10:56:54 -0400 Received: from smtpout1.mo528.mail-out.ovh.net (smtpout1.mo528.mail-out.ovh.net [46.105.34.251]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B3BDB03EA; Fri, 7 Oct 2022 07:56:52 -0700 (PDT) Received: from pro2.mail.ovh.net (unknown [10.109.146.13]) by mo528.mail-out.ovh.net (Postfix) with ESMTPS id 86FAD12E155BB; Fri, 7 Oct 2022 16:56:50 +0200 (CEST) Received: from localhost.localdomain (88.161.25.233) by DAG1EX1.emp2.local (172.16.2.1) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Fri, 7 Oct 2022 16:56:49 +0200 From: Jean-Jacques Hiblot To: , , , , CC: , , , , , , , , Jean-Jacques Hiblot Subject: [PATCH v4 2/6] leds: class: simplify the implementation of devm_of_led_get() Date: Fri, 7 Oct 2022 16:56:37 +0200 Message-ID: <20221007145641.3307075-3-jjhiblot@traphandler.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221007145641.3307075-1-jjhiblot@traphandler.com> References: <20221007145641.3307075-1-jjhiblot@traphandler.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [88.161.25.233] X-ClientProxiedBy: CAS1.emp2.local (172.16.1.1) To DAG1EX1.emp2.local (172.16.2.1) X-Ovh-Tracer-Id: 4481644579311991259 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrfeeijedgkeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgtghisehtkeertdertddtnecuhfhrohhmpeflvggrnhdqlfgrtghquhgvshcujfhisghlohhtuceojhhjhhhisghlohhtsehtrhgrphhhrghnughlvghrrdgtohhmqeenucggtffrrghtthgvrhhnpeduteevleevvefggfdvueffffejhfehheeuiedtgedtjeeghfehueduudegfeefueenucfkpheptddrtddrtddrtddpkeekrdduiedurddvhedrvdeffeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepphhrohdvrdhmrghilhdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepjhhjhhhisghlohhtsehtrhgrphhhrghnughlvghrrdgtohhmpdhnsggprhgtphhtthhopedupdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdfovfetjfhoshhtpehmohehvdek X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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 Use the devm_add_action_or_reset() helper. Signed-off-by: Jean-Jacques Hiblot Reviewed-by: Andy Shevchenko --- drivers/leds/led-class.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index 6a8ea94834fa..2c0d979d0c8a 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -258,11 +258,9 @@ void led_put(struct led_classdev *led_cdev) } EXPORT_SYMBOL_GPL(led_put); -static void devm_led_release(struct device *dev, void *res) +static void devm_led_release(void *cdev) { - struct led_classdev **p = res; - - led_put(*p); + led_put(cdev); } /** @@ -280,7 +278,7 @@ struct led_classdev *__must_check devm_of_led_get(struct device *dev, int index) { struct led_classdev *led; - struct led_classdev **dr; + int ret; if (!dev) return ERR_PTR(-EINVAL); @@ -289,15 +287,9 @@ struct led_classdev *__must_check devm_of_led_get(struct device *dev, if (IS_ERR(led)) return led; - dr = devres_alloc(devm_led_release, sizeof(struct led_classdev *), - GFP_KERNEL); - if (!dr) { - led_put(led); - return ERR_PTR(-ENOMEM); - } - - *dr = led; - devres_add(dev, dr); + ret = devm_add_action_or_reset(dev, devm_led_release, led); + if (ret) + return ERR_PTR(ret); return led; } -- 2.25.1