From nobody Sat Feb 7 21:11:54 2026 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010041.outbound.protection.outlook.com [52.101.69.41]) (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 8203C2F90DB; Sat, 20 Dec 2025 22:46:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766270794; cv=fail; b=qwLNBQlNzviyblXxUiTgDrvO4fnXfb26ar2ARbmPqGBkuqiDkiJx/uaeKMs67ksVToU53K4c3mMS9Hld9ZTJ33Xv9WYM1qZLUhI6majoDl0C3+/hlbWd1Vq5DL43Sn2TDBRmZJu+na2xZJu/RNCPS6NSgd1PIMNujN5c9wFbwJ4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766270794; c=relaxed/simple; bh=+D5uVDKyg3+LZZZ9XjonfzWqYdd06GvPS64al6NWBF4=; h=From:To:CC:Subject:In-Reply-To:References:Message-ID:Date: MIME-Version:Content-Type; b=WX9ISLBwyuZwjzQMSRwEGoBusl6FTE2mDy5/T160viIwooUN8yljSj0RVZkHpKcNAgqifIm0I19V0gK/fq9hVfrb88rEP02oqDEfBs6ie55D7ZrgP6zM9TeazWJKaOMuD9yj8uylXSRpwbUWZopkjm5G1FI8jrPySB0nmqsR+Sk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=axis.com; spf=pass smtp.mailfrom=axis.com; dkim=pass (1024-bit key) header.d=axis.com header.i=@axis.com header.b=e8Nd5jFT; arc=fail smtp.client-ip=52.101.69.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=axis.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=axis.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=axis.com header.i=@axis.com header.b="e8Nd5jFT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IWHvLCi4J64ybwIgGRkL5mBaS3bJpmj48jot4GoFONsRvbNQFBVW//SGYT3xpKpl+2tvPAmTe8fTSy6tpxc3bXljFTRZT6iXFIclEcKaXm3djX54sr3c96LE3nJETD2kq/zgubahL4xpiSBtHXiT9rsCXJMAcaiWps+3Cn6s1MKh/xuXh0X1Rve3JHYuIMohuZOCAqkEg23u9ethoOQJ3QT0xRhU9S8Yw0FSzLOjzqtnf8hMWX/NfS2OzEiuxWg575l+JrU0ak4Udp/6PZ0RjAMhfiQnN3+KdBlGmpdxm8yj4LpxUTbrsB3YH9KVXAyVUtfNT5MAOCWUptvQOZnQcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7JgNPkojs4XaiY+MPoFDHDAj2eNoxy9+dNFnPO9z3NM=; b=Hj9wksqvdpQmb1XBq8a+FXKJcjANNsV4Zsu6qUuUwsZPR70LGpJkZmxcfMkMZo6Y2A1BLIEacL03Aqq1nC5ZbWbPbqy9gMa+VHehyq1J9k3RSic7M9KbsS/j1grhkD7XQ6rS3fAK7pFP1OITHmWUbTiaKVBMFgAIw1hIUIsyOb/dWgXsNbPMERJNjazGgIMZD+htSVJfBr9wCkwibuIj2SUF4BJ6ugzk9PGnlJTgRqkAQYVs69qob//rPF4robAL5AcpfUYfJ0JCixUVdoqUkZGzfY3gSZUMAflRO99US3gOC72BquofnCmF95Yl5KvHhTeeI+AJ3x0JRhSxnNY4mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7JgNPkojs4XaiY+MPoFDHDAj2eNoxy9+dNFnPO9z3NM=; b=e8Nd5jFTvez/iOw9ITK1FBUFYjMqkmr89cVyYwYI7EgXq9M9G2tbrF6t1W/uDpe1uVDTHmwFR6c2Ogb/G9k79bHOVTtu9i/IHIK1IWEbRrUlPEtTXxMNlAPSJ//vZzLEbUplzM2kZFioE5ImH7UuvMsDRCaQdufUSaD3g5+f8SE= Received: from CWLP265CA0406.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:1b6::9) by GV1PR02MB10663.eurprd02.prod.outlook.com (2603:10a6:150:16b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.10; Sat, 20 Dec 2025 22:46:27 +0000 Received: from AMS0EPF000001AA.eurprd05.prod.outlook.com (2603:10a6:400:1b6:cafe::38) by CWLP265CA0406.outlook.office365.com (2603:10a6:400:1b6::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9434.11 via Frontend Transport; Sat, 20 Dec 2025 22:46:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AMS0EPF000001AA.mail.protection.outlook.com (10.167.16.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.6 via Frontend Transport; Sat, 20 Dec 2025 22:46:26 +0000 Received: from pc52311-2249 (10.4.0.13) by se-mail10w.axis.com (10.20.40.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1748.39; Sat, 20 Dec 2025 23:46:24 +0100 From: Waqar Hameed To: Sebastian Reichel , Anton Vorontsov , Marek Vasut CC: , , Subject: [PATCH 1/3] power: supply: wm97xx: Fix NULL pointer dereference in power_supply_changed() In-Reply-To: References: User-Agent: a.out Message-ID: <97b55f0479a932eea7213844bf66f28a974e27a2.1766270196.git.waqar.hameed@axis.com> Date: Sat, 20 Dec 2025 23:46:24 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: se-mail02w.axis.com (10.20.40.8) To se-mail10w.axis.com (10.20.40.10) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF000001AA:EE_|GV1PR02MB10663:EE_ X-MS-Office365-Filtering-Correlation-Id: 69eeee14-16ac-4032-92e7-08de40199bf2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?G0SEpwym5l78tJf9+ULQcC3fOt3vb4FTYtE33vJ9u+tm/6JCBEtpct9HB+To?= =?us-ascii?Q?n4GNwJxVvFqqS50eRoGmwNBneNWueADkvKclR7ZyVwlL9RCxc3a8HyI6v1HH?= =?us-ascii?Q?CESF5s/O3JEv5P50JgeOb8YP7ehyqyBRFi9HCEg4Hfdcb+RE64LQ9Y1tJ8my?= =?us-ascii?Q?kFaNaQju5IAOfNwp9OL4ZUHLgcotY1WIEnucrFIn2Ex3S2mfgWhsdfUfwPkV?= =?us-ascii?Q?KR44lWlnr8X6xwqd7r0I8OvUUchKvY3HEE9FSfKnpQbRHio82UYJOxElEm+2?= =?us-ascii?Q?lX1LT0NZV4vwM3ek1Ydokg9PpZ2JQsCbaBVvT5wIF5w2rrT0f81Nk9ROHLwJ?= =?us-ascii?Q?J8onNZDjHJY5mu4ndesh4jNFcE9CfeaGmSI8l3yQyyBdWwSYAu3eLkLJeM15?= =?us-ascii?Q?16cXgeMz0IB+Tb2kJyImICc7rtNohenoKX8IrxdzsWQAGbivYlajd9MqJWZ8?= =?us-ascii?Q?cltsoj8FpLFxo7AEXp8EbEopBOaWiQeT/huiuDgO8dzzbUXrzQgClyXmi/OL?= =?us-ascii?Q?fNh5NFhmjLnDH+mpkl3hzzZ8lcOjgunqXYYv943ZIojIIcAm9JEiwK2+lkQA?= =?us-ascii?Q?Kdx5MVScGH+N2Tc9Dbu95Ly/5wIEyc5I8psbX1F6wUZ71G84g0rOM3hYU30x?= =?us-ascii?Q?ms1ByiWhoCR7J9k6TtARj82ZIpA89/xN6V01OXVj3aS0fV9u3LHp+2tTERDi?= =?us-ascii?Q?RYf1z98m3BjaxWTp2Th2cyn1JzfH58KTEBtdb8L1pevKNMwKqIlZgZiH2Moi?= =?us-ascii?Q?WlgWM+Hb6Kf1LyEfFJ/BslzUs5dgK7CAJycZ8iiGBedOpqfJPZ+LmrujdoOo?= =?us-ascii?Q?G3cj5Cz7QBFTRfegCwy9ZZCdBP4ylwFidA69UO1U9vAgKdpvq3B/LhRmzBnF?= =?us-ascii?Q?48+5iKzFR67wRzPdy0XG+zTi10UYF+EReeuyznMOsdv4ZPXdRwYaZhbSwxHU?= =?us-ascii?Q?KGUS/4gqFXq/qMyxVlQbG9hjqurBp7CunmjwvhLhX5cG5OV0RcMoVgtW3Pfi?= =?us-ascii?Q?8L3bb8M0+cTXLJRhUbxtVZllDRySLIaYYccyiAU6hGi6iom6+uXpQGbg7fOG?= =?us-ascii?Q?YES1P7TRrLnA4Hlhh3pMm6cf+11M85Xhyf/UgcUEBxI3VSyI9wABVL1Qe4oU?= =?us-ascii?Q?Ifkrudnl9oeqG5CV4QjdF8jCXtrxPE5/K2UUoRQ4St+XnMbNQ3FD4AhCND1x?= =?us-ascii?Q?pWrBYdoMy3ydCZHCzLrsViHdNsQUbjxpAPV04vuLHmOj+Js0ROr2zzceWzM4?= =?us-ascii?Q?5lNCNTmoQgEX7yN1Iuc+ixlSNnezcjPJY7IAvLmMKXuElvRY6xi5tYm+Q0Vm?= =?us-ascii?Q?RcWk1R8MZ90AjOtcn3KQNBqH/xLtgoJC+SRcM/8dPTFBmurtME695RdYVhP9?= =?us-ascii?Q?wMiciGX7TTG3gc7jOYIrDeFfou0j7tFEnnoLWmDRbKwIWnPu2nSw9RsQM2OW?= =?us-ascii?Q?BYVNNTzMrpswwKDmfMdkQNYq0walaiRnnERwu874e+efyXMkz4Trp5/5ruQS?= =?us-ascii?Q?gCHK0RbTJayHlQYGQehDH15F/Shq2aHz3guOudlmVFo4M9I587Z6DSzdC1fG?= =?us-ascii?Q?NYeCBTbBoikvp6MxTm0=3D?= X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2025 22:46:26.7477 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 69eeee14-16ac-4032-92e7-08de40199bf2 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF000001AA.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR02MB10663 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In `probe()`, `request_irq()` is called before allocating/registering a `power_supply` handle. If an interrupt is fired between the call to `request_irq()` and `power_supply_register()`, the `power_supply` handle will be used uninitialized in `power_supply_changed()` in `wm97xx_bat_update()` (triggered from the interrupt handler). This will lead to a `NULL` pointer dereference since Fix this racy `NULL` pointer dereference by making sure the IRQ is requested _after_ the registration of the `power_supply` handle. Since the IRQ is the last thing requests in the `probe()` now, remove the error path for freeing it. Instead add one for unregistering the `power_supply` handle when IRQ request fails. Fixes: 7c87942aef52 ("wm97xx_battery: Use irq to detect charger state") Signed-off-by: Waqar Hameed --- drivers/power/supply/wm97xx_battery.c | 34 +++++++++++++++------------ 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/drivers/power/supply/wm97xx_battery.c b/drivers/power/supply/w= m97xx_battery.c index b3b0c37a9dd2d..f00722c88c6fe 100644 --- a/drivers/power/supply/wm97xx_battery.c +++ b/drivers/power/supply/wm97xx_battery.c @@ -178,12 +178,6 @@ static int wm97xx_bat_probe(struct platform_device *de= v) "failed to get charge GPIO\n"); if (charge_gpiod) { gpiod_set_consumer_name(charge_gpiod, "BATT CHRG"); - ret =3D request_irq(gpiod_to_irq(charge_gpiod), - wm97xx_chrg_irq, 0, - "AC Detect", dev); - if (ret) - return dev_err_probe(&dev->dev, ret, - "failed to request GPIO irq\n"); props++; /* POWER_SUPPLY_PROP_STATUS */ } =20 @@ -199,10 +193,8 @@ static int wm97xx_bat_probe(struct platform_device *de= v) props++; /* POWER_SUPPLY_PROP_VOLTAGE_MIN */ =20 prop =3D kcalloc(props, sizeof(*prop), GFP_KERNEL); - if (!prop) { - ret =3D -ENOMEM; - goto err3; - } + if (!prop) + return -ENOMEM; =20 prop[i++] =3D POWER_SUPPLY_PROP_PRESENT; if (charge_gpiod) @@ -236,15 +228,27 @@ static int wm97xx_bat_probe(struct platform_device *d= ev) schedule_work(&bat_work); } else { ret =3D PTR_ERR(bat_psy); - goto err4; + goto free; + } + + if (charge_gpiod) { + ret =3D request_irq(gpiod_to_irq(charge_gpiod), wm97xx_chrg_irq, + 0, "AC Detect", dev); + if (ret) { + dev_err_probe(&dev->dev, ret, + "failed to request GPIO irq\n"); + goto unregister; + } } =20 return 0; -err4: + +unregister: + power_supply_unregister(bat_psy); + +free: kfree(prop); -err3: - if (charge_gpiod) - free_irq(gpiod_to_irq(charge_gpiod), dev); + return ret; } =20 --=20 2.39.5 From nobody Sat Feb 7 21:11:54 2026 Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11013013.outbound.protection.outlook.com [40.107.159.13]) (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 415062F83DE; Sat, 20 Dec 2025 22:46:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.159.13 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766270793; cv=fail; b=TEkMm0yCJQnkfOydblqBoiNfhNd2ffsCKclxO967MR/mK4GL5o9DWeoktSZP1DvZ6qC5kFxrg2G+q/h/Te+Puf0xBw68wftTC9l6DoRjqEl/a7cbyOG4/9gXBWygHK+SWQtQZaTdYJjeWDt1KK69nVuKWpdSpNtRI2ZTkIXLK5g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766270793; c=relaxed/simple; bh=c6aCRUx6V5cCGHTJIe0H35hD162EHgH7CrgCZDwLqNE=; h=From:To:CC:Subject:In-Reply-To:References:Message-ID:Date: MIME-Version:Content-Type; b=Z05O3nASYBrqvJ6oiUpwAJ2BKrfbZpaes4L+fCcRb/XS2fY9mavpACedqSYbo/aicaqlUYSx8sRqVt3pqY4yBlg9TUmHpUYU7sqdl5vnLGBq9t+7iM+9We1LahTUdPZFtep2G9L8W0qKoH9xcfGp7PQYJjhETQXnb+CzBVZvZnE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=axis.com; spf=pass smtp.mailfrom=axis.com; dkim=pass (1024-bit key) header.d=axis.com header.i=@axis.com header.b=GqQc3Msx; arc=fail smtp.client-ip=40.107.159.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=axis.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=axis.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=axis.com header.i=@axis.com header.b="GqQc3Msx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KK2zncsAvHmb1dNMdZpDn7cl3IJUCCirqqZqwTDLms2HS5h55HDjAXEW8HeUyeMVt29eIUw6SFrXijdpzgmiTAYQ0HoLHMomIxqZBxdaZiMXZ0i5Gu/tzzN5pNEx+90ujGy5C3Od8/kFU9X9EBkAP7tsDLIJc5T6lZGpsRb0khx6YZt4P+fACGBmSiAuQbZYRUpXPqTfwrriDz5TLeQeCAqGmxSYZ/koTB/fQa099X2IiqUCKng4uSlLKdkfxDZWGQshnySOCTzDoXTjTEx46rZbIw4J5Z11J9t+n8Y0LjFycf1VzQLVa4NXG8xasNX3Lo51AQi0AegkRaCguEQbHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZMIy+HcAgKF9/c6lOvj8IBslPNhRns1bU9mJJYYFdKc=; b=K+yTzBU5J4TQFuublnKDFCIlzzfHV5ejlHX7R7hGJDsUBpp+CW5HC/C2to1DNmvYpUL2PjFlP9IAYSuSoSESwScP2AK5v7bVn75FswICV4keo06DZpJ1dDD9HMqiIJ+JknfZvu/hTVEN2yjNPxtK5mYfO5pQldSSG38Y7CoXnNS4qrSX1GTRtVkLpHXqNWEA768T/Ko4O3jm3XkNxItoNEGmFHw+2/XxvuBtozWMkjSl6KTl4Z9vHQlhC21EIYTPcUTuyP8Ibj1eNJBCRK8hfdNV2oLPjhGdTdlejp/PVTvWJ7BZEcOZq5akidf9gpzJch4sU4s581JAYlD3i4Z2Ug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZMIy+HcAgKF9/c6lOvj8IBslPNhRns1bU9mJJYYFdKc=; b=GqQc3MsxixJOrfFvmyuJwoRlNmEMVshMkprfhDiwCY3Mc+joTaeXMxjQKLrvlwwjR9w20BR7xK+Cc5IA2/pLw2/3bGmG1Ob8FiWDNpL1wPY+ncz8IQEfADOCK0LgRIgX0bmGpC7j+LqXcqzU/CVb2sLJdzmHf4Zfj8L5NEiZB+w= Received: from CWLP265CA0409.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:1b6::8) by PAWPR02MB9757.eurprd02.prod.outlook.com (2603:10a6:102:2eb::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.10; Sat, 20 Dec 2025 22:46:28 +0000 Received: from AMS0EPF000001AA.eurprd05.prod.outlook.com (2603:10a6:400:1b6:cafe::1c) by CWLP265CA0409.outlook.office365.com (2603:10a6:400:1b6::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9434.10 via Frontend Transport; Sat, 20 Dec 2025 22:46:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AMS0EPF000001AA.mail.protection.outlook.com (10.167.16.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.6 via Frontend Transport; Sat, 20 Dec 2025 22:46:27 +0000 Received: from pc52311-2249 (10.4.0.13) by se-mail10w.axis.com (10.20.40.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1748.39; Sat, 20 Dec 2025 23:46:25 +0100 From: Waqar Hameed To: Sebastian Reichel CC: , , Subject: [PATCH 2/3] power: supply: wm97xx: Use devm_power_supply_register() In-Reply-To: References: User-Agent: a.out Message-ID: <883bfa991f977dcda20f9ee6b82782850a0ab100.1766270196.git.waqar.hameed@axis.com> Date: Sat, 20 Dec 2025 23:46:24 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: se-mail01w.axis.com (10.20.40.7) To se-mail10w.axis.com (10.20.40.10) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF000001AA:EE_|PAWPR02MB9757:EE_ X-MS-Office365-Filtering-Correlation-Id: 87b0a2c4-43f5-459b-e9b4-08de40199cb1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ftaWgpcWWk4TvDgLjDD+f1cBlx/d7Z3e8LtS1y8+JTmNEUE28sp6pe5l0bdk?= =?us-ascii?Q?TQULYSPrN4V3k7rBb2+G8BQy+vVMmoZ3TBtqXqHARIiH5NzU3ukn9I0PnTEG?= =?us-ascii?Q?IPWi/iQNTs/T3wOSI+q7GesYmTjb5n0YWcTsnSrgGyHJzmQebvLtbF+KE5bb?= =?us-ascii?Q?VLM3jJbvTViGIZs2+BTHB9B6+TlsqYDbx9XW61ND/vTUNZ0RSQ0n1jCqzKkp?= =?us-ascii?Q?14BiIR/AYY0FZ9cgh2XBtoN1SygR0jSgksCJcajUqEAlrmfoIHqMXuz8yNex?= =?us-ascii?Q?+TZc86H8AXuAdHQGVBc9P5JJgIHvvnf5fsy5GhyRaUqil4jelTofQJpIRKoo?= =?us-ascii?Q?xKmX9NrxqAr70E5skmD5Y6+kXDxLAkfda7La2GOb4brqwgys54igRpmPygG/?= =?us-ascii?Q?xE0Ao6X6f8Ck+UrYsewFrt9Gz6Z9JBIC0dLlJZqg81r6DP0JT9SQPk8ZbhD2?= =?us-ascii?Q?usekiwrT4bxmlZta7wek/aSLl9LV5Fkx/PFJaPCMALk+AfYi1x4byWzZiE67?= =?us-ascii?Q?DgWkTkr4on3TUjLJkEd1WqIw1HdhtKlnl7QhT0+CvCuDa6EaI8VE0x8ckd0m?= =?us-ascii?Q?bqLV+IXempLfzXxf2KnrAUfnffjObtFGrtY3JXkPUR1nZ+WFO/Ng6olhk2ln?= =?us-ascii?Q?SqiDSx5xQsKaTWm5XvQEJbJU7aKBou/bD8VLtBAucQaKHLcqAMBpXv2+dsQf?= =?us-ascii?Q?IA5w3NKwN7Jgp/thCS3yVd23UDpCdIo8tcErrRBfVBZ7VKEvq8w6kP3S1BHN?= =?us-ascii?Q?DSiZIM15/kOHbhD1bZqQSv06jeaozQZqt9wP6WINZG1qNhPx4Yp2vT3bMbJA?= =?us-ascii?Q?Eedy/AyIK+qhwMDgsnpqBQdYoe6i0GNQuKGmfyoxwqJKdtN0/RX9jNtckgdu?= =?us-ascii?Q?hRXcoRWc3h17GfhkGNQMZUF7da+n8BGiIBjPaNnOgumvbJV/OcoiPfoMw/xi?= =?us-ascii?Q?LNaexDo0ZMLvxwHxBP1DC6anzbd5LOuMmy3CMS31Z0wkYIKK1kHdqp4UilDH?= =?us-ascii?Q?2Mafo5KFLsQM1Nz7ikiH8yXA0jDPPF9mxe65DtTq8WEwUE/xdlTa9rPgFzgx?= =?us-ascii?Q?6dnT9EOrUCGAOXJN0IQFtRWusGDYXn6V+bCZz+88BK+ROmptTr8jaFlacLqm?= =?us-ascii?Q?o6riEhYYWcS8FKVqILqfTQ/VlAT6TZCPs7yygwqq3ZlkWKKnyajiFm53o0jQ?= =?us-ascii?Q?xtTQiYRIbaGtIC5hORDovV38EzdsyRAdtDzYBjoVM4ABkSph/YBFTr9oxAPW?= =?us-ascii?Q?0U1f1cwLEcs6Xqx8T3nEU//KtCIYvcqcrdDtD0I5kLC2RZWUKWH4H4JcHN50?= =?us-ascii?Q?Zqc9MknSIepV9iy9w75B7Htlr+j2zUAZSP95S+W6GEa+eUO30aFqZJNPnK7I?= =?us-ascii?Q?5cvFUSUzpe0hbACKKUZvsyY5Js/ef/0GH5LJMQsGxVYRFtcD25RA5iMoGnXa?= =?us-ascii?Q?Z5zjb+mhFDmDIhjH0j3tTNQtemPX5OA+jqhH3kut+ed4rOgm7PRpznPRAvlm?= =?us-ascii?Q?yb5vEsMOjxi72vhLIr/7FRWWy6pUqOXECcwnoI3WyALpDV0lh1XrBEou4h9I?= =?us-ascii?Q?AyYg/UJpQq1N58nQNBw=3D?= X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2025 22:46:27.9968 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 87b0a2c4-43f5-459b-e9b4-08de40199cb1 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF000001AA.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR02MB9757 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Instead of handling the registration manually, use the automatic `devres` variant `devm_power_supply_register()`. This is less error prone and cleaner. Signed-off-by: Waqar Hameed --- drivers/power/supply/wm97xx_battery.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/power/supply/wm97xx_battery.c b/drivers/power/supply/w= m97xx_battery.c index f00722c88c6fe..e91467dcab19c 100644 --- a/drivers/power/supply/wm97xx_battery.c +++ b/drivers/power/supply/wm97xx_battery.c @@ -223,7 +223,7 @@ static int wm97xx_bat_probe(struct platform_device *dev) bat_psy_desc.properties =3D prop; bat_psy_desc.num_properties =3D props; =20 - bat_psy =3D power_supply_register(&dev->dev, &bat_psy_desc, &cfg); + bat_psy =3D devm_power_supply_register(&dev->dev, &bat_psy_desc, &cfg); if (!IS_ERR(bat_psy)) { schedule_work(&bat_work); } else { @@ -237,15 +237,12 @@ static int wm97xx_bat_probe(struct platform_device *d= ev) if (ret) { dev_err_probe(&dev->dev, ret, "failed to request GPIO irq\n"); - goto unregister; + goto free; } } =20 return 0; =20 -unregister: - power_supply_unregister(bat_psy); - free: kfree(prop); =20 @@ -257,7 +254,6 @@ static void wm97xx_bat_remove(struct platform_device *d= ev) if (charge_gpiod) free_irq(gpiod_to_irq(charge_gpiod), dev); cancel_work_sync(&bat_work); - power_supply_unregister(bat_psy); kfree(prop); } =20 --=20 2.39.5 From nobody Sat Feb 7 21:11:54 2026 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011044.outbound.protection.outlook.com [52.101.70.44]) (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 8626D242D83; Sat, 20 Dec 2025 22:46:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766270795; cv=fail; b=LtrCImEcc3vBeSViz5ACDrVkm0C2KZjr/DY3jpQOQ+7m7IHNuelc0AtGIJqt9Fzm0J7deR8qx3hquoWUTsLA4c7047gQr9ERXK1tmsN5hY1RDMl4V0kUpyMrLMrhC0xeyApHM/2ehGI4Jg18bwNcZdt68MZjwl0r9xnWd4MGOac= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766270795; c=relaxed/simple; bh=O5R0pcxJQWdR0JEZQ6CJNmZq46O1Uejtp1O2rsmxkdU=; h=From:To:CC:Subject:In-Reply-To:References:Message-ID:Date: MIME-Version:Content-Type; b=lbdDp+s+PjVJqp3lseq/tlbIDv9E48FAS99X8GeUz9a4ZfFFaJmKbW+oEL2fLDcj6Jpn7/c0jnxdduneWzFHDq8cUmzlMejb6xuQXDoU3JtII6b9zKyBjBPkg+WRr75Z666UTEbD+sHZ841G7GgQDL+EwffcHUolFfAGRYFKc1k= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=axis.com; spf=pass smtp.mailfrom=axis.com; dkim=pass (1024-bit key) header.d=axis.com header.i=@axis.com header.b=CUrVnVSP; arc=fail smtp.client-ip=52.101.70.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=axis.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=axis.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=axis.com header.i=@axis.com header.b="CUrVnVSP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Jj9SqFgcDQmRe7Nc2gIKE9diDY651mJ8PeIZKp87VtDYty8hY5VojSCNm5geWNh05laTDg1Kr45vq3GsoPA/hGycIe1DdIwqgQmkacp4WQ7Dt2ELwYq+HuA+pNXT6Mkr4C02DqZYDQlRtbFFwsgkKwq9Spu4oPzuJitzW0BemlX6DR+kWHMfTGuj29YqfaEF2QEi75A7QR+bTn5lEO9lb9n5WD0OLghA1/WZD+BF9w2zaoH5YriFDjwYsNus8JXhyHdJDWOtwRb6ugJulvmZUy21v4G4O7wpCCVQTTC8Rhaj8Qn2Dsz+GM4QJ7eC2uA0FpR/NAdskDWkb5qbV0yO6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pTqQORzIvekHwnGbQdHZVI+EJPJ4q6S/rIv+yCJ43gA=; b=hcYifOG18bGaxTgVm3V/YaporNWAi2GD2lKkD7oTc/jXgSYmCOd4LxseIqNLRyafKuT8Rp+JbbRmXkpfVrHekDv81riCqzIjCk4ZC1cEtCTDSE6ygn9rcw0uXnVFGih4vR6JLUvJPNyqXIkwOFmrmwgpKV/4ZSGVFSdoYDxlIOs6iq1/kpePVjDsLn7UubZpmuynh56Vf7ztrfJmPNuQ2ilfjkoFgMagTJXfMX4/wBaIXtFQ/5PV+jRONZYnXB5IXnqWoj+io44XYF529bmIoQimRrniIjFIsOsN2uvZIz+L/dW86bXZ0wfAFIgguFPhH8KEZpQscYgVx44ROJJ73A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pTqQORzIvekHwnGbQdHZVI+EJPJ4q6S/rIv+yCJ43gA=; b=CUrVnVSPACZ1Vj/MbHdt6LVCQMqW0Mj7/zFR4HTPXmFlXjFbcESlw1fkfE8o0LS+3Qsde79gzuFP2zXhwsNdnWISajjwNB7H4L07eTLjj9eXuEvE7SFAsAtw2kCTUWDNmNsOFm2g6U0U4qvpZiqCCKqE2VdKWWaIt/YIHLFFyxM= Received: from CWLP265CA0415.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:1b6::10) by AMDPR02MB11197.eurprd02.prod.outlook.com (2603:10a6:20b:6cb::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.10; Sat, 20 Dec 2025 22:46:29 +0000 Received: from AMS0EPF000001AA.eurprd05.prod.outlook.com (2603:10a6:400:1b6:cafe::cf) by CWLP265CA0415.outlook.office365.com (2603:10a6:400:1b6::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9434.10 via Frontend Transport; Sat, 20 Dec 2025 22:46:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AMS0EPF000001AA.mail.protection.outlook.com (10.167.16.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.6 via Frontend Transport; Sat, 20 Dec 2025 22:46:28 +0000 Received: from pc52311-2249 (10.4.0.13) by se-mail10w.axis.com (10.20.40.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1748.39; Sat, 20 Dec 2025 23:46:25 +0100 From: Waqar Hameed To: Sebastian Reichel CC: , , Subject: [PATCH 3/3] power: supply: wm97xx: Use devm_kcalloc() In-Reply-To: References: User-Agent: a.out Message-ID: Date: Sat, 20 Dec 2025 23:46:25 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: se-mail02w.axis.com (10.20.40.8) To se-mail10w.axis.com (10.20.40.10) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF000001AA:EE_|AMDPR02MB11197:EE_ X-MS-Office365-Filtering-Correlation-Id: 78315d30-c9f6-43d4-6d4f-08de40199d3a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bRyz2fgvzI+HtUTig9EBlARrx0J3wPFrdDPHBY+Fh47IpOopx41JyyzXdAEO?= =?us-ascii?Q?WKZhQGV5BA+cJ3ySfwzIcxl+21ifEoqi5rlsFevgHInOK8C2eHf1yK1QhlJA?= =?us-ascii?Q?CoKug83zzda0jvU0HYX8xGb8gzW10C0Jw4sMxTMaevy6IFIwrPpUrBOPMVUp?= =?us-ascii?Q?z5tlJVLifWUL+0bHXGGaHkq7qrAZHxXDDhrpQeATWw+SwyZdYPwwIZ82ILnA?= =?us-ascii?Q?hjwDhT3xmd7laaP11SvgXJbg61eXnX8S8Xnds43/RlpLTG/yW8w9uld2qpJG?= =?us-ascii?Q?8Yq2C7uWK92GY2GT2wtCFOvo309Dy7WjfV1U355L3UHmnLy0Hzrx6mt/YTo+?= =?us-ascii?Q?Eamwyahc2GYcMtw5M2sN/tkPoXd0MBUXJt7rM04wowm19yA1ko2ci84PQnwU?= =?us-ascii?Q?blnEdJebeo0uZ36D3tF+1YLzaVvZF/SoOPHcKABmovb1hu7ndxBIN/iFPcK2?= =?us-ascii?Q?/h+T985OrRL4F4KbmT+LoA8NmFkgIvfhKdivgZltMFoCm1X7+T6d/M5qF2RP?= =?us-ascii?Q?3lB0VkO/uENd9GNR2bc2+6ro29OxoZTGOQDiMq+hJCtzZo+p2bkilvhFp7zv?= =?us-ascii?Q?BxpG9S6I07TjeYs9NU8hrjiK8kMXk0Nn7qNc4pRGowehvW2N4Pva3dI0jKiY?= =?us-ascii?Q?7FvKWxjh5GgWF4GmkMu0CGRqXs+/XtI247hky5JN4T0Wn93+eEfMOuwqkXqm?= =?us-ascii?Q?ItG/6pQ1LPjsax7bTRAujex796IWx50WedOGy5shPL1i6RYgdvM6nfuwUu0Y?= =?us-ascii?Q?dRzRZCFK630Z2kqdeCTVmB9kEM//lQRZcgOe7VWTNpp/PbZnFB4aCujeTJwM?= =?us-ascii?Q?zoUCGtQTv+G0KKrnRNWCsayDFG7EK5mjkYlEQmu7CBOGL7IsvLx3cXQIcpEu?= =?us-ascii?Q?J9sWDpD51/LVDqxH/gXeX0GWZUR95bgPMjpaWdouxP9vi1dwX2pck4nkGzkd?= =?us-ascii?Q?yqIDsWRaoS9+C/WDvjV0PB4qBBpt3Choqwf0a07B/enr0OiZ4KBjDbr4IcZk?= =?us-ascii?Q?7rxLUJfo6liqD0A+ft1oc5RHhf8FUmJJbRs++7LAhhE8ETYRwf72yCdmDcmd?= =?us-ascii?Q?xYtvE3PB1UPXQB559K9JieoIkq9GU406BGWVywSqiXTuiMSko2FQwyOa+y+G?= =?us-ascii?Q?bL9HBcwKfHqnRYR9up9N2zk0idCkG92NRsD7aUD67UfntQZseo+3fDs7cSUv?= =?us-ascii?Q?kfnNFMsovoffvGomAW+vIwtyDTW4kFPRJl65iRyddI6laXqbeLEFyJfbc/h2?= =?us-ascii?Q?ozjGMEET6uozDrXwLaN2S0JZLuLRhMlOrEBIfaKNQozGO/FnN+LtriOYxZEO?= =?us-ascii?Q?8KWT8cFx1EUg7gRojRBqbtLMHp6Eb3i/eBwKapvKGVCPJl5GGtQPyXCXvqum?= =?us-ascii?Q?XPT7qiEbeSgjtXsg62EP93giRQyWyhdGhZHNmOM7ou1pFO0CF9GBVXUnG6Jf?= =?us-ascii?Q?CVNORenn0RJs86QNsbePbYFyKfUQ8i5UAe9J8wL2h4ItrA+CfqOILdqNupLu?= =?us-ascii?Q?MYQERNAElKyrIrnB1Ora6U/Hwr1EMwxte6NS1HHDlNznBE6yDdx/7LymimPN?= =?us-ascii?Q?hZLTDaeuSv1teoRj2es=3D?= X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2025 22:46:28.8956 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 78315d30-c9f6-43d4-6d4f-08de40199d3a X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF000001AA.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMDPR02MB11197 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Instead of handling the memory allocation manually, use the automatic `devres` variant `devm_kcalloc()`. This is less error prone and eliminates the `goto`-path. Signed-off-by: Waqar Hameed --- drivers/power/supply/wm97xx_battery.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/drivers/power/supply/wm97xx_battery.c b/drivers/power/supply/w= m97xx_battery.c index e91467dcab19c..a6c55b1e02863 100644 --- a/drivers/power/supply/wm97xx_battery.c +++ b/drivers/power/supply/wm97xx_battery.c @@ -192,7 +192,7 @@ static int wm97xx_bat_probe(struct platform_device *dev) if (pdata->min_voltage >=3D 0) props++; /* POWER_SUPPLY_PROP_VOLTAGE_MIN */ =20 - prop =3D kcalloc(props, sizeof(*prop), GFP_KERNEL); + prop =3D devm_kcalloc(&dev->dev, props, sizeof(*prop), GFP_KERNEL); if (!prop) return -ENOMEM; =20 @@ -224,29 +224,20 @@ static int wm97xx_bat_probe(struct platform_device *d= ev) bat_psy_desc.num_properties =3D props; =20 bat_psy =3D devm_power_supply_register(&dev->dev, &bat_psy_desc, &cfg); - if (!IS_ERR(bat_psy)) { - schedule_work(&bat_work); - } else { - ret =3D PTR_ERR(bat_psy); - goto free; - } + if (IS_ERR(bat_psy)) + return PTR_ERR(bat_psy); + + schedule_work(&bat_work); =20 if (charge_gpiod) { ret =3D request_irq(gpiod_to_irq(charge_gpiod), wm97xx_chrg_irq, 0, "AC Detect", dev); - if (ret) { - dev_err_probe(&dev->dev, ret, - "failed to request GPIO irq\n"); - goto free; - } + if (ret) + return dev_err_probe(&dev->dev, ret, + "failed to request GPIO irq\n"); } =20 return 0; - -free: - kfree(prop); - - return ret; } =20 static void wm97xx_bat_remove(struct platform_device *dev) @@ -254,7 +245,6 @@ static void wm97xx_bat_remove(struct platform_device *d= ev) if (charge_gpiod) free_irq(gpiod_to_irq(charge_gpiod), dev); cancel_work_sync(&bat_work); - kfree(prop); } =20 static struct platform_driver wm97xx_bat_driver =3D { --=20 2.39.5