From patchwork Mon Dec 4 18:05:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 173498 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2940301vqy; Mon, 4 Dec 2023 10:07:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IFUGq24IP8JN3icAKxeRT2XZn1Hi/y0lsdGugzLDGLdZB2WJKqBRl31G//247CTj3d3UAj2 X-Received: by 2002:a05:6a00:2448:b0:6ce:2731:47b2 with SMTP id d8-20020a056a00244800b006ce273147b2mr127100pfj.18.1701713255015; Mon, 04 Dec 2023 10:07:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701713254; cv=none; d=google.com; s=arc-20160816; b=t8Qb6UTGGLZImSM9qHjlEiut1QFSZETje0QgD3yRkxwZrT5KHXvdRuZDA0hWWrzawE u/4clcJmJ8M2DgKUyfUg4w7Ipu99tylyp8wb73AI6Mq6x4xK0LLRiPTfeY2pevvDnl9u OALMr67skrq5/qWZQPt8jNHcR28aVG/ZJI2SyYfngR+SAxDtPwhqNOpJVJUhdgxBirQ/ 9VuOV6Sk0pfuZuWwvZZ3fK3PrH/KAF4LN2JG/r9dHzX/vfnF4hPIh9JOsU2szV0xb6u8 VK3nv8ZrdC57ObmNOq0tbeNsj9YbTRn51yLe7JJITk7qDKdn7g8PicXioqL3Y8Z3MBfY RlDg== 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=qL7h6jprywDr6fISYueZDzA2bOo7TS7aT4PRmSDkI2I=; fh=pRi79UjbBxWuX+YtUUQtxvW+xSh0P2pNtOkO2EuISps=; b=vJJNjLFTdc4+VmlTFqKK6XyGxCgX21D8Qax5gq0wSpqxnrlT2WGgfAf/FH7gQSnwjh 3G+ofRAgbz6BQaFmNfac5Ho4ZWDpdgu7w2z7bsHd3WgiTjJokoEfvZt/e+Gr8pceoQUp kUjJkNLKfeDMm9hCVb4sbMC4I5ekAApja8wMDL0jEofQLRnIHB3gfT2zBrRLJf4DdVYW +BrSEnoUW+Ej6Eozl7y6BSk2dSved71UG2qJ1cWHEzxl0tuAtHsdgNuDdOOs1FfUpGB1 7+8hR5dQU6qGPVenRnpYxOMlwCDVBAnPpishz8Lfy1zOMfnxjE1rT4ZLa8n5+UVwyT/F Ir8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=AXHUIPIp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id k16-20020a056a00135000b006ce45456a1dsi2857885pfu.184.2023.12.04.10.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 10:07:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=AXHUIPIp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 7838B80C61A2; Mon, 4 Dec 2023 10:07:32 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231683AbjLDSHU (ORCPT + 99 others); Mon, 4 Dec 2023 13:07:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231797AbjLDSHM (ORCPT ); Mon, 4 Dec 2023 13:07:12 -0500 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B7FA119; Mon, 4 Dec 2023 10:07:16 -0800 (PST) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 1573310000D; Mon, 4 Dec 2023 21:07:15 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 1573310000D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1701713235; bh=qL7h6jprywDr6fISYueZDzA2bOo7TS7aT4PRmSDkI2I=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=AXHUIPIpepj4mQIREeF1kPC+nP2Aeg9UgKbAaF+a/4Og621TFJQudDk4CAmH1u+xr GqcDgMerISDiO4q8KtuHwNhymJ9MyfcKFAxc8c2XCIYw699xRp+PWBeYWVKQZoOSKE Rh4MdF5tAjhSiMKlAteb8s2h9f7uoFFepa2HjfoAHr5PnsvTA0/3ML6ZMoPfhGDi0V rjfGtTevCdAkowz7R0zBmygiQCGMEYbYRdKL7xsU5Kty0rYH7Q5ss9uWAgejTZHyUz P7T6DS9QgKBBFH1Wb7GMLfED2orgtYZ8yh6XrKEKt+tICBCt0BBqRyqMXx5HXo1Inx 5i/pIBi4Oky2g== Received: from p-i-exch-sc-m01.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; Mon, 4 Dec 2023 21:07:14 +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; Mon, 4 Dec 2023 21:07:14 +0300 From: George Stark To: , , , , , , , , , CC: , , , , George Stark Subject: [PATCH v2 03/10] leds: aw2013: use devm API to cleanup module's resources Date: Mon, 4 Dec 2023 21:05:56 +0300 Message-ID: <20231204180603.470421-4-gnstark@salutedevices.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231204180603.470421-1-gnstark@salutedevices.com> References: <20231204180603.470421-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: 181831 [Dec 04 2023] X-KSMG-AntiSpam-Version: 6.0.0.2 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: 5 0.3.5 98d108ddd984cca1d7e65e595eac546a62b0144b, {Tracking_from_domain_doesnt_match_to}, salutedevices.com:7.1.1;100.64.160.123:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.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/04 11:06:00 #22624476 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 morse.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 (morse.vger.email [0.0.0.0]); Mon, 04 Dec 2023 10:07:32 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784375678130439535 X-GMAIL-MSGID: 1784375678130439535 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 --- drivers/leds/leds-aw2013.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/leds/leds-aw2013.c b/drivers/leds/leds-aw2013.c index c2bc0782c0cd..1a8acf303548 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,13 @@ static int aw2013_probe_dt(struct aw2013 *chip) return 0; } +static void aw2013_chip_disable_action(void *data) +{ + struct aw2013 *chip = (struct aw2013 *)data; + + aw2013_chip_disable(chip); +} + static const struct regmap_config aw2013_regmap_config = { .reg_bits = 8, .val_bits = 8, @@ -334,7 +342,9 @@ static int aw2013_probe(struct i2c_client *client) if (!chip) return -ENOMEM; - mutex_init(&chip->mutex); + if (devm_mutex_init(&client->dev, &chip->mutex)) + return -ENOMEM; + mutex_lock(&chip->mutex); chip->client = client; @@ -378,6 +388,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 +412,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 +428,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);