From patchwork Wed Dec 13 22:30:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 178322 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8134268dys; Wed, 13 Dec 2023 14:31:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IGCkZE9zSOfW7EtBO9AxJgN+4ANM6vMLYv3OeGQHHRWOGEcrAtBR5yEvN55NQ6N7Cl2F5CR X-Received: by 2002:a05:6870:41d4:b0:203:11d0:11ab with SMTP id z20-20020a05687041d400b0020311d011abmr3115378oac.2.1702506683468; Wed, 13 Dec 2023 14:31:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702506683; cv=none; d=google.com; s=arc-20160816; b=jgTp6T8hmbHlmEwPajELBautwOQejllf6XIvkB1q0s0MLs2LhHfvuM3sxAWljZ20ze zgugdI52x3ycyZBc726aDOF5xz26Xu4lygib5jz1OluHypRAudFx+FQxEdr91nu9CJiD LaKJw2sJA3hqB5brP2uEQuSBudDsYhAKsfIWGoiBiqQlyk9w5/j/5xqaIPDH2mie9usH P7QI7SsgyARKZBfz43QeukX5/nd8KA1NR9ildQOaguldEhYFAWcK94FkU8ztS6EcoVbN u3JjHy4LagGx3u/qF/KHiPcnTxa+sIA9bjUcLn64brX9T7pFIlGn+03XCLwk2zMAYqNK k2KA== 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:dkim-filter; bh=+lmmdIoH0rAig1Taqra6EznxKH0XzwvvS9jwX4KXfVg=; fh=VGV6ajQ72e9w8REvYqgUr7SYaKNgFpS3GtVmljO5VrE=; b=YRxCXIIPNDJEfiDNf5aZgSESt3tH4ioeY2glTWsWIEaa8bBNWWRs5zkHGCRBkfGstV hNLDIykpgddvb2OSj7+55R21n50aM1Pcxzpp5BPhQmRC/UeFJ0/RUlRxkdTkzkJtN2nk iuuAwWDN+JziC5l29R0pNx9zJkZPv8CbuRywPaCSDRzANyP8TpM9220Qy7whIYb0gVEI GzWtWx8012Cc0jX7HoDw7CcekBeFTNHS4W6pg4IxKrWdGJAOLm0RNGuW7QzHzdxgJyAH fbWAYQ6YaYfD49cjxBc2qsvqoI43EMgSaEf2K6cpR2CXCvqjUyZ4yM6k3p2Y5A5TGdsw UJ3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=G0eUOFci; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=salutedevices.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id 19-20020a631753000000b005c668dc242asi10198696pgx.162.2023.12.13.14.31.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 14:31:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=G0eUOFci; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=salutedevices.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 623C8803238E; Wed, 13 Dec 2023 14:31:00 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442823AbjLMWae (ORCPT + 99 others); Wed, 13 Dec 2023 17:30:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230004AbjLMWa0 (ORCPT ); Wed, 13 Dec 2023 17:30:26 -0500 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72E31100; Wed, 13 Dec 2023 14:30:30 -0800 (PST) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 5DA1A10000F; Thu, 14 Dec 2023 01:30:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 5DA1A10000F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1702506628; bh=+lmmdIoH0rAig1Taqra6EznxKH0XzwvvS9jwX4KXfVg=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=G0eUOFciMHcQd32X1QxMykiR+hbQthJ5Gg3yhiRITkuLJ8kaLc5QjsoBm/DgU06f/ iLe+TsJPevkyMCkJ+WwPxuxjBghqa5MY9tCIylKY9rp+e3j7o9DygXwswddCFF0WRk axoXYZvcb6trBgtuxzs27sSKUKvOMMudMA+NDHYr1sfMSwU4eIJXZJ3kFW275hMSbc AsOXt/jdCb6npcKxT98ql/Rj1QW7d6RIBZzH3SG82SEPGrq5lf6VjnZlJPI8OTMbl5 Jf4926WySDDeaxcXY/iCHK6RaaB7HLPX51MmCjG6C2/dR0ukrOmweu+TMac8udnTNt DVsnkd6A3HnXw== Received: from smtp.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Thu, 14 Dec 2023 01:30:28 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Thu, 14 Dec 2023 01:30:27 +0300 From: George Stark To: , , , , , , , , , , , , , , CC: , , , , George Stark Subject: [PATCH v3 04/11] leds: aw2013: use devm API to cleanup module's resources Date: Thu, 14 Dec 2023 01:30:13 +0300 Message-ID: <20231213223020.2713164-5-gnstark@salutedevices.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231213223020.2713164-1-gnstark@salutedevices.com> References: <20231213223020.2713164-1-gnstark@salutedevices.com> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 182098 [Dec 13 2023] X-KSMG-AntiSpam-Version: 6.1.0.3 X-KSMG-AntiSpam-Envelope-From: gnstark@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, 100.64.160.123:7.1.2;127.0.0.199:7.1.2;salutedevices.com:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;smtp.sberdevices.ru:5.0.1,7.1.1, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/12/13 21:35:00 #22672360 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 13 Dec 2023 14:31:00 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785207648458686141 X-GMAIL-MSGID: 1785207648458686141 In this driver LEDs are registered using devm_led_classdev_register() so they are automatically unregistered after module's remove() is done. led_classdev_unregister() calls module's led_set_brightness() to turn off the LEDs and that callback uses resources which were destroyed already in module's remove() so use devm API instead of remove(). Signed-off-by: George Stark Tested-by: Nikita Travkin --- drivers/leds/leds-aw2013.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/leds/leds-aw2013.c b/drivers/leds/leds-aw2013.c index c2bc0782c0cd..863aeb02f278 100644 --- a/drivers/leds/leds-aw2013.c +++ b/drivers/leds/leds-aw2013.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ // Driver for Awinic AW2013 3-channel LED driver +#include #include #include #include @@ -318,6 +319,11 @@ static int aw2013_probe_dt(struct aw2013 *chip) return 0; } +static void aw2013_chip_disable_action(void *data) +{ + aw2013_chip_disable(data); +} + static const struct regmap_config aw2013_regmap_config = { .reg_bits = 8, .val_bits = 8, @@ -334,7 +340,10 @@ static int aw2013_probe(struct i2c_client *client) if (!chip) return -ENOMEM; - mutex_init(&chip->mutex); + ret = devm_mutex_init(&client->dev, &chip->mutex); + if (ret) + return ret; + mutex_lock(&chip->mutex); chip->client = client; @@ -378,6 +387,10 @@ static int aw2013_probe(struct i2c_client *client) goto error_reg; } + ret = devm_add_action(&client->dev, aw2013_chip_disable_action, chip); + if (ret) + goto error_reg; + ret = aw2013_probe_dt(chip); if (ret < 0) goto error_reg; @@ -398,19 +411,9 @@ static int aw2013_probe(struct i2c_client *client) error: mutex_unlock(&chip->mutex); - mutex_destroy(&chip->mutex); return ret; } -static void aw2013_remove(struct i2c_client *client) -{ - struct aw2013 *chip = i2c_get_clientdata(client); - - aw2013_chip_disable(chip); - - mutex_destroy(&chip->mutex); -} - static const struct of_device_id aw2013_match_table[] = { { .compatible = "awinic,aw2013", }, { /* sentinel */ }, @@ -424,7 +427,6 @@ static struct i2c_driver aw2013_driver = { .of_match_table = of_match_ptr(aw2013_match_table), }, .probe = aw2013_probe, - .remove = aw2013_remove, }; module_i2c_driver(aw2013_driver);