From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from vs81.iboxed.net (vs10.datenmanufaktur-hosting.net [213.160.73.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5AE3F19DF62; Wed, 8 Oct 2025 06:45:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.160.73.65 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759905933; cv=none; b=cZclw+elGCozFEG5yEhKtR+l2wgLuVRnSKomHxgBxbF+KPkTHnOuS+SqNA5tSid7hZ07M5W1PH9OwVaJGFHj8gCW1/x4PjUQlbdzBg/YHhypLYgDn7DRFotnCtE0Kvjx+Xv7WhGsBPPlImbcV/+g0nUzorXQ8O3IpnvShnhTJxo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759905933; c=relaxed/simple; bh=G0xQgQyrwSJHVmBE1CSnLN/FrJeKs1BASiMsyj5D/lo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eH97TFbVjp7lkwpLUwUwazZ5CwzbHWEhvq9KIZnBdosaplE9L+546yox0QTwgob6bPrTuiX5ey/XU6n0AA6yT4LNqbT4CYYgdgkHLyP6U7Z/le3I+H7pn3tgPu3UHGcL3hCLSQOE1bUtovtQjTI+HCgUtPlQqVMH76ZEHJ1hX7k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=blala.de; spf=pass smtp.mailfrom=blala.de; arc=none smtp.client-ip=213.160.73.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=blala.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=blala.de Received: from blala.de (localhost [127.0.0.1]) by vs81.iboxed.net (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTP id 5986i3Vv013914; Wed, 8 Oct 2025 06:44:03 GMT Received: (from akurz@localhost) by blala.de (8.15.2/8.15.2/Submit) id 5986i3b3013909; Wed, 8 Oct 2025 06:44:03 GMT From: Alexander Kurz To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Dmitry Torokhov , Dzmitry Sankouski , "Dr. David Alan Gilbert" , Heiko Stuebner , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , devicetree@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alexander Kurz Subject: [PATCH v5 1/5] Input: mc13783-pwrbutton: use managed resources Date: Wed, 8 Oct 2025 06:43:57 +0000 Message-Id: <20251008064401.13863-2-akurz@blala.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20251008064401.13863-1-akurz@blala.de> References: <20251008064401.13863-1-akurz@blala.de> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use devres functionality to simplify resource freeing, dev.parent will be set by devm_input_allocate_device(). Signed-off-by: Alexander Kurz --- drivers/input/misc/mc13783-pwrbutton.c | 28 ++++++++------------------ 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/drivers/input/misc/mc13783-pwrbutton.c b/drivers/input/misc/mc13783-pwrbutton.c index b83d762ae2e9..82434ea9cca5 100644 --- a/drivers/input/misc/mc13783-pwrbutton.c +++ b/drivers/input/misc/mc13783-pwrbutton.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -102,18 +103,13 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev) return -ENODEV; } - pwr = input_allocate_device(); - if (!pwr) { - dev_dbg(&pdev->dev, "Can't allocate power button\n"); + pwr = devm_input_allocate_device(&pdev->dev); + if (!pwr) return -ENOMEM; - } - priv = kzalloc(sizeof(*priv), GFP_KERNEL); - if (!priv) { - err = -ENOMEM; - dev_dbg(&pdev->dev, "Can't allocate power button\n"); - goto free_input_dev; - } + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; reg |= (pdata->b1on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON1BDBNC; reg |= (pdata->b2on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON2BDBNC; @@ -139,7 +135,7 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev) button_irq, "b1on", priv); if (err) { dev_dbg(&pdev->dev, "Can't request irq\n"); - goto free_priv; + goto free_mc13xxx_lock; } } @@ -187,7 +183,6 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev) pwr->name = "mc13783_pwrbutton"; pwr->phys = "mc13783_pwrbutton/input0"; - pwr->dev.parent = &pdev->dev; pwr->keycode = priv->keymap; pwr->keycodemax = ARRAY_SIZE(priv->keymap); @@ -218,12 +213,8 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev) if (pdata->b1on_flags & MC13783_BUTTON_ENABLE) mc13xxx_irq_free(mc13783, MC13783_IRQ_ONOFD1, priv); -free_priv: +free_mc13xxx_lock: mc13xxx_unlock(mc13783); - kfree(priv); - -free_input_dev: - input_free_device(pwr); return err; } @@ -245,9 +236,6 @@ static void mc13783_pwrbutton_remove(struct platform_device *pdev) mc13xxx_irq_free(priv->mc13783, MC13783_IRQ_ONOFD1, priv); mc13xxx_unlock(priv->mc13783); - - input_unregister_device(priv->pwr); - kfree(priv); } static struct platform_driver mc13783_pwrbutton_driver = { -- 2.39.5