From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 BC1CE35F5E5 for ; Thu, 5 Mar 2026 21:46:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772747193; cv=none; b=KIzJYggHiJ0xCM5kWoihDEGVegpPEPhafteOLKdCDjRPwqYfm0A5CY1qK+xy9mFTlxKhjVxrc7WpRaz/SZlcxaU+0Mq/omDWJaP+njSBmLM/jJAvLemCwjvKUtgBH3kVLplZKEeDQj8g94TVtBjUbFh3syz73XIu+5tVTLQP0X4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772747193; c=relaxed/simple; bh=G2Qaq1IYTDtA8nYq8hb67ozAR45iYXNAROMWtKf03Uw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=d9XoRwPZYZYDPfKHnUHY9+SprqwA8Qsu/fSE0OmSdNedMLtHi8L8aqBWY8q8Eu90Pcf7U6dEaBSFVFSmvI6hMNNiS5pOpc3jNyVYL9Iwp4oF5XxLcpe7oWQOnIGcqBLWwth8gyiGmUuZ4/HY54ro50xqU7AJjPuUIXmrwefckuY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=WFSxdaVi; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=bEinuJIW; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="WFSxdaVi"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="bEinuJIW" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 625KmghB1802873 for ; Thu, 5 Mar 2026 21:46:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= AH50fw9QTtdpPbt41EGIzTuypwuiZyQQHwG7B4PGWqg=; b=WFSxdaViIVPBNC+X 9bqAQeOpl9vGXSUUioaKpINGyFSaBj1czQ0kQkCk8MAiZaNmcE7wHL7+fV2sSzvQ 6+x6p53n81WDEWEXo0Nv8GVfz/Bq6O3kyYYQTrRB5tyQjxBDwKMW+0/9IXoQz2Y6 d4BwliZ31/MTimweCNxGsU/+OJhDIJazRYQ9e0jeS9F19EGb9kvDa4WRvV90AKH6 2VVrNet5cmq2/CEVpkYGWwoO80ZawsyODj/naisE4DyT4Ns4KkPWvMc1KeARrEeT q79E+dOAggE0iGVpm+VqfUmpaIxDya2l8W/S/L/z/yRp6GtTChefieGrRO/pVVkG 7QkkbQ== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cq9srhtkg-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 05 Mar 2026 21:46:29 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8c71500f274so914053485a.1 for ; Thu, 05 Mar 2026 13:46:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772747189; x=1773351989; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=AH50fw9QTtdpPbt41EGIzTuypwuiZyQQHwG7B4PGWqg=; b=bEinuJIWCzs8oyxJ1ZQe/B5ibrlzguy8muAk1KsnTZo/ivMShgSxykKHbB8DPs4Sny k+g2UVvAfb2S61E6t2Nm8Hu1EF1Ytd93B7lH0Dz2MUtWgDntxPFi8vNPc9XgWGfZIHSw mLlKjmXqFi/cUq0hwehoEMQ/7Q++j8gY6eyqnuZQyxpbrYdsCtbvvJj9UpJXyM5JkjxJ L2hF2fDkmYBFb7gOzLsF/CDBjzDA1u6CYj+U0gID5bDfHFvSnyaNv+5nIRJYJJnrLyhg jFXcw6lFvjnBRkIX0XxXNP39prOOjuTFOUO/oMSrVMpDVwzUW0pbPx12rHFYBqgDWDN7 npxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772747189; x=1773351989; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=AH50fw9QTtdpPbt41EGIzTuypwuiZyQQHwG7B4PGWqg=; b=XYB3ElA+mXwGIJd2CvI/dM5AAdKgUskYdS98Sa5egNIpM5QKeEcRxYfzaZO7PdD/mJ EjNk9LkzDiG1LV6jAe/Hi2PirOVuMXRd999FQvnzT0ClUjGNEm9DOzsX0DYxeGfniZcQ N9iA8Tl7ZV5DfamiLObgP1iYeMKmiAhBwlx3Rkj0r++vTvSDGWeTI6Y44+tjC2J2DdbA Tfqd5vSSWbkTOgtupvVckQqWwxgb0jizuFJAb9JHyGAQDg0gpAnchCUuWNbnNSI0Fbay PwPxbysRkDqcaFs3Pg/qm+j34yxGKE5piEVukfPuzfjthihAh/OFmYDJ+Pwq6ATUUQ95 3Few== X-Forwarded-Encrypted: i=1; AJvYcCWYtwP/8IRak97+4Evkg3S22st22AJ48K6OmaKO3IUjjnRNvz2dhdZ59XwU5b9ApxtYL9YiZ2Qp33aYa2E=@vger.kernel.org X-Gm-Message-State: AOJu0YwfKEoG74tNpdArH8H5gwObzxMvR3xGNUC0gqdXwGY7AYOYbbs0 s5i+CahdX1nxbApmGKEk38TWvoCN/xtp7XgE4qT1W8hMEzcIT0XNcSQ/cJ6QFwdFK/lG1o2WEhL wgPu5YfzWjJkMwKO+090iqJ+IjAvglElEskFkMK74eOG6LgaOtlzNqFVsr3Codb77yxA= X-Gm-Gg: ATEYQzwKlgUDcEGGZEqJHYJyh8rjWmQWiXhOcTsqYX1PtXIU3ei7j0vYpA3hdSzGUj/ 8oVeoSNGENq3s2A33CjHD9YDgv1t3/r2JKbyl8Sw/yEyyE9MwJ05KNXB7NgpDv2gLGRn/C+L4n/ vnuuZzJIrIQVdjLwLJ5G7QogBG49G/QP9aLk0jsM6dGW/BkrSDJ9ZmBZjvpxohgzOtyViuE8LLE 58UmBo8aZTH3wxLhJR+ONxNTlQZjXSqPRjiFV2BawoVl3/lHYYIav4Q8nK0WLmXyn3guvaTmdqW nI0t7qkT1J7WNAXY4UlKjEr1+RAgwVIuBukjiZnk9Zr93EXzcIsaOjN3+d17lT4Q+4OR6RgAxfg WNLiRNkW8gJOwSIZGvAl+phjdxnD/PIo+qJMaa/BKP0+b X-Received: by 2002:a05:620a:1726:b0:8cb:4fa5:d47a with SMTP id af79cd13be357-8cd6d494e49mr2330485a.77.1772747189119; Thu, 05 Mar 2026 13:46:29 -0800 (PST) X-Received: by 2002:a05:620a:1726:b0:8cb:4fa5:d47a with SMTP id af79cd13be357-8cd6d494e49mr2326485a.77.1772747188622; Thu, 05 Mar 2026 13:46:28 -0800 (PST) Received: from [127.0.1.1] ([178.197.219.94]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439ba2a58dasm28571575f8f.27.2026.03.05.13.46.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 13:46:27 -0800 (PST) From: Krzysztof Kozlowski Date: Thu, 05 Mar 2026 22:45:45 +0100 Subject: [PATCH v2 06/10] power: supply: ipaq_micro: Simplify with devm Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260305-workqueue-devm-v2-6-66a38741c652@oss.qualcomm.com> References: <20260305-workqueue-devm-v2-0-66a38741c652@oss.qualcomm.com> In-Reply-To: <20260305-workqueue-devm-v2-0-66a38741c652@oss.qualcomm.com> To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Jonathan Corbet , Shuah Khan , Tejun Heo , Lai Jiangshan , Tobias Schrammm , Sebastian Reichel , Andy Shevchenko , Dan Carpenter , Krzysztof Kozlowski , Lee Jones , Dzmitry Sankouski , Matthias Brugger , AngeloGioacchino Del Regno , Benson Leung , Tzung-Bi Shih Cc: Matti Vaittinen , driver-core@lists.linux.dev, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, chrome-platform@lists.linux.dev, Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3021; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=G2Qaq1IYTDtA8nYq8hb67ozAR45iYXNAROMWtKf03Uw=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpqfmdS1zMtD2UaoQRfaiq5mLP0QlOTpilY/8TD J4ztu2IWgOJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaan5nQAKCRDBN2bmhouD 13BxD/0YZqo0vRusnBrySJI4j7j0qBvMSBLl9ERMwbH5zZQFXisFq0V0/yim2m6aeuWG3sue54q cQyLvmbMOtlHEjhHsJW0gAP7otcp1O0SfR3ykSEKToa0wZY7+zGXm7wnrXKcTsXhcddZj9Ywk7G k8pxhlb6R/iKHlXjSedxxBM2U3iicVf9s043yF+9ADEZTF2SsoruyLdMui8TCO60ILt39gQjuqx 9inYM98ZePPGSQtHGfvmONO7Gu1D+EvkseMIaO+YIhDzEMAJUAmew+WPrK567ES5pxsJ/GIg9ul ND9JhEpU12ZAB7EKrHhCcxcFQOn6vDEvL5ZJ4rtl/Ts+C8ufpzL1pVEuldmRhFHjG17dv3Mm1hU qG4oztSBnPshts2d6Nc/Y4uayRlpNpeK+7SrP2f/PrWGQdd5KdFo5Iu1uJnwGMsiExW0MLOT2eI 43o7eDO7M+jC3NfI7za2SVUY8POdUyx/ba5BPcXUmJd5RpRiyOgPbEIZeRhYhkxSm6zNITQjBIQ 7tVjG3QlahgAPAcbxe0FiplwIwhYBRcso/cJGY5XD8IFB9T8+OH6y3pOed4UM7DNe3E2zT03P08 8/si+s74GY7hTw3HR+7C9YKGWQeAGDNHcOFKDrfcLEjPqmN4Od/VOYDbfizGIxxbX4sM4VQDDfi JSVXiCJBbZxkykw== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Authority-Analysis: v=2.4 cv=a/I9NESF c=1 sm=1 tr=0 ts=69a9f9b5 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=gOEeR9iKwsj33Yj5oN/cWg==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=PkD0MmKtpR7JdVUpc-MA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: ZdfcP0SaTHjBwg7MgUcC8UFhccm3hHLc X-Proofpoint-ORIG-GUID: ZdfcP0SaTHjBwg7MgUcC8UFhccm3hHLc X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA1MDE4NSBTYWx0ZWRfX4evTWnSg3Oqh I3UTQZoBpat24jcgkqnPsnQZuuN3l+vV0xBZKrGrbWU9dythJwtafzsEK0jm6huIEFn/KFeqImj HrNjt3duUi7xEydsYArK0qdV1kFXvNslsdVnqcIDkoAdAIAJNqJRPZBmxLh7/98NkBhqkUGPdPc PzopbDbZTQyz4tjPPlPXB6ZsUS/AK8LVDEGQ4aLsKKcsW6Wfo/jvy4t12cjYTg2YMuQj1WSNo3Q Pxvc6c1ZJyrxwt1AAqAm/ZCb48q/0hbN+EwSm4SpX0FmC+C4+2lpHZ66H3E+wz5FDsWzuB7NlCF oI83b78YDSIb0pNroXc0g6V0MNq9Cew8OU5qo3PynxDNrSez/vBj55++CSEb6/2WIZ8B9xPF2Gz 1mgaydYFCjRJZKvEdJKc9ExdJ85zojqeLDxYDRRH+J9Alt/X1Z9IgcJHNTnmw2RzCvubbZhOBSy JxfKt1rlcXAQ5yqZMiw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-05_06,2026-03-04_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 impostorscore=0 phishscore=0 bulkscore=0 suspectscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603050185 Simplify the driver by using devm interfaces, which allow to drop probe() error paths and the remove() callback. Signed-off-by: Krzysztof Kozlowski --- drivers/power/supply/ipaq_micro_battery.c | 50 ++++++++++--------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/drivers/power/supply/ipaq_micro_battery.c b/drivers/power/supply/ipaq_micro_battery.c index ff8573a5ca6d..5e3fe3852d0e 100644 --- a/drivers/power/supply/ipaq_micro_battery.c +++ b/drivers/power/supply/ipaq_micro_battery.c @@ -7,6 +7,7 @@ * Author : Linus Walleij */ +#include #include #include #include @@ -232,49 +233,31 @@ static int micro_batt_probe(struct platform_device *pdev) return -ENOMEM; mb->micro = dev_get_drvdata(pdev->dev.parent); - mb->wq = alloc_workqueue("ipaq-battery-wq", - WQ_MEM_RECLAIM | WQ_PERCPU, 0); + mb->wq = devm_alloc_workqueue(&pdev->dev, "ipaq-battery-wq", + WQ_MEM_RECLAIM | WQ_PERCPU, 0); if (!mb->wq) return -ENOMEM; - INIT_DELAYED_WORK(&mb->update, micro_battery_work); + ret = devm_delayed_work_autocancel(&pdev->dev, &mb->update, micro_battery_work); + if (ret) + return ret; + platform_set_drvdata(pdev, mb); queue_delayed_work(mb->wq, &mb->update, 1); - micro_batt_power = power_supply_register(&pdev->dev, - µ_batt_power_desc, NULL); - if (IS_ERR(micro_batt_power)) { - ret = PTR_ERR(micro_batt_power); - goto batt_err; - } + micro_batt_power = devm_power_supply_register(&pdev->dev, + µ_batt_power_desc, + NULL); + if (IS_ERR(micro_batt_power)) + return PTR_ERR(micro_batt_power); - micro_ac_power = power_supply_register(&pdev->dev, - µ_ac_power_desc, NULL); - if (IS_ERR(micro_ac_power)) { - ret = PTR_ERR(micro_ac_power); - goto ac_err; - } + micro_ac_power = devm_power_supply_register(&pdev->dev, + µ_ac_power_desc, NULL); + if (IS_ERR(micro_ac_power)) + return PTR_ERR(micro_ac_power); dev_info(&pdev->dev, "iPAQ micro battery driver\n"); return 0; - -ac_err: - power_supply_unregister(micro_batt_power); -batt_err: - cancel_delayed_work_sync(&mb->update); - destroy_workqueue(mb->wq); - return ret; -} - -static void micro_batt_remove(struct platform_device *pdev) - -{ - struct micro_battery *mb = platform_get_drvdata(pdev); - - power_supply_unregister(micro_ac_power); - power_supply_unregister(micro_batt_power); - cancel_delayed_work_sync(&mb->update); - destroy_workqueue(mb->wq); } static int __maybe_unused micro_batt_suspend(struct device *dev) @@ -303,7 +286,6 @@ static struct platform_driver micro_batt_device_driver = { .pm = µ_batt_dev_pm_ops, }, .probe = micro_batt_probe, - .remove = micro_batt_remove, }; module_platform_driver(micro_batt_device_driver); -- 2.51.0