Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp2247310rwb; Thu, 17 Nov 2022 08:18:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf4bphQCz1Zp995nqS7+CmFmKhOWenKMXjdwjNr3yWhcWSDNvJ9I5rHcbKmJMxNjGFK8iYgI X-Received: by 2002:a05:6402:24a0:b0:458:ad54:20d5 with SMTP id q32-20020a05640224a000b00458ad5420d5mr2789571eda.86.1668701904986; Thu, 17 Nov 2022 08:18:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668701904; cv=none; d=google.com; s=arc-20160816; b=gA+kaznYZ1qeRMkUtauTE6EqmDrT2uNZX9s4Y2u0dJ/4hfCv04hYlFGvABLfWOZWc2 6wjlpR5w3kS0EAvRsna9GN2mzxTufXtu1sophQ/G/BCIJXgJSbkj2IfWSkAVNDKBiBGf 0TglpU006PWd8JRvgz6Juae+ZT8OPPgUkBJDul5MZePZHrFLx/hZ3aZ7ZRM1WeTCfwxV Kh6sDsMLgP2fD7ieLWfTMD5wvYKGPnItmadclyWW7MQpSRngkKlA+yRhp3iOJT4BrzpG ce1Q3z6ffaRiyCECTjju+sns/2ZC2egB1iyp+8UrlcMS29diLGc9Gh1bxq6MkThhha35 o6Dw== 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=OU4vP8+Aqz9xaXtm3zPBLfvv1TWUeYwCVgxf0zR4ClOuU53tor2ReOxD226bOxPpvp H8h/Vxy0E3glvrOLBhsYr8GjhtqKg0BC1Z2um6sOQd3/VkG2b/41JdGAam5OIN2AjkZ2 wuYV3Z0Z+4V8vS6y5ji93WtScMfAw3YHHcfjJSVzPqI4FaguEqQ2cSxPAn8VOWh/QLfo RkcyFQjoJfSDlygZaKJmenFc1eNnK8cF6t0UEihc4XBZuB/JsUvl+zu89CbiRfWDkztD jWrdObk3wnIUNwbEjuGY+NJd30izwwtfgqvsWcq3/ioTDWtIxfJOUiEHvaqN1Z4coSvl H2XA== 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 di7-20020a170906730700b007b2a3ee2d2asi993408ejc.703.2022.11.17.08.18.02; Thu, 17 Nov 2022 08:18:24 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240107AbiKQQFF (ORCPT + 92 others); Thu, 17 Nov 2022 11:05:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234769AbiKQQFA (ORCPT ); Thu, 17 Nov 2022 11:05:00 -0500 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 DDA8510EF; Thu, 17 Nov 2022 08:04:57 -0800 (PST) Received: from pro2.mail.ovh.net (unknown [10.109.143.168]) by mo528.mail-out.ovh.net (Postfix) with ESMTPS id CFDFC13CAD68C; Thu, 17 Nov 2022 17:04:55 +0100 (CET) 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.16; Thu, 17 Nov 2022 17:04:55 +0100 From: Jean-Jacques Hiblot To: , , , , CC: , , , , , , , , Jean-Jacques Hiblot Subject: [PATCH v6 2/6] leds: class: simplify the implementation of devm_of_led_get() Date: Thu, 17 Nov 2022 17:04:43 +0100 Message-ID: <20221117160447.294491-3-jjhiblot@traphandler.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221117160447.294491-1-jjhiblot@traphandler.com> References: <20221117160447.294491-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: DAG1EX1.emp2.local (172.16.2.1) To DAG1EX1.emp2.local (172.16.2.1) X-Ovh-Tracer-Id: 6604247381599926747 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvgedrgeekgdekvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfgtihesthekredtredttdenucfhrhhomheplfgvrghnqdflrggtqhhuvghsucfjihgslhhothcuoehjjhhhihgslhhothesthhrrghphhgrnhgulhgvrhdrtghomheqnecuggftrfgrthhtvghrnhepudetveelveevgffgvdeuffffjefhheehueeitdegtdejgefhheeuuddugeeffeeunecukfhppeduvdejrddtrddtrddupdekkedrudeiuddrvdehrddvfeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeojhhjhhhisghlohhtsehtrhgrphhhrghnughlvghrrdgtohhmqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehlvggvrdhjohhnvghssehlihhnrghrohdrohhrghdpphgrvhgvlhesuhgtfidrtgiipdhrohgshhdoughtsehkvghrnhgvlhdrohhrghdpshhvvghnrdhstghhfigvrhhmvghrseguihhsrhhuphhtihhvvgdqthgvtghhnhholhhoghhivghsrdgtohhmpdhkrhiihihsiihtohhfrdhkohiilhhofihskhhiodgutheslhhinhgrrhhordhorhhgpdhjohhhrghnodhlihhnrghroheskhgvrhhnvghlrdhorhhgpdhmrghrihhjnhdrshhuihhjthgvnhesshhomhgrih hnlhhinhgvrdhorhhgpdgsjhhorhhnrdgrnhguvghrshhsohhnsehlihhnrghrohdrohhrghdprghnugihrdhshhgvvhgthhgvnhhkohesghhmrghilhdrtghomhdpjhgrtggvkhdrrghnrghsiigvfihskhhisehgmhgrihhlrdgtohhmpdhlihhnuhigqdhlvggushesvhhgvghrrdhkvghrnhgvlhdrohhrghdpuggvvhhitggvthhrvggvsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhlihhnuhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrghdpoffvtefjohhsthepmhhohedvkedpmhhouggvpehsmhhtphhouhht 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