From nobody Mon Feb 9 16:51:48 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 3B75C31AAA5 for ; Fri, 26 Dec 2025 11:10:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766747436; cv=none; b=Kc54OQIp4v++twy+G7TDo2HxWXtN75JXJ0ZtAEcFeNkHqhRYH+icLJpNKu+1hWgzU0aYegehu+OheprNH3NK49NASbWugvnt1XDyk3dG/VV4inTKcMZ3dA1VbkgA7IYn7zN1IF5jFAWvIVtjsS0sEjo8kYycRDyNjpqqtn/WBGY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766747436; c=relaxed/simple; bh=TZBm7xraSyzbd3zPTXLuxxnIVTOSK7rzIf/fTMWuvKM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qKmX+syqb6PFcu1ujD61wtwF6Q96yjkRAs9thl546ZNt/oX57mn4YLR0ZzAkX3uw2KiW9PDgdXy2pFmHIFkQDacbtyu0AYimdKi0jYEp/BeO8HoCXZ/DasxNz9giDZqpgHSLh0utGt6zCaWYGWK+lc3xzu15dM/50GOhTtFN0VM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=NrkUFV31; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=sYVczA8o; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NrkUFV31"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="sYVczA8o" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766747432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hxxe+0EjF9NUofDY+U4LnGwysYHjaMOQnhMUAVNbt4s=; b=NrkUFV31gftMMa2a+qUSZ/FYPNyC2owZPstnHJH8bB2O/QyON/H6GAx9kNo1a8MQBkrtqc pr7ViWj+pltT2ApRz04Zyu6bsAA4nWQyP8xGkUgwuVBjGjcG9EoFUQO5Aa1d3NFRyHNYF3 3M6X1wH72jSO45FomcLBsux8BHSZTIc= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-541-C_vveLTAPE-z6kSS0fTQ3A-1; Fri, 26 Dec 2025 06:10:31 -0500 X-MC-Unique: C_vveLTAPE-z6kSS0fTQ3A-1 X-Mimecast-MFC-AGG-ID: C_vveLTAPE-z6kSS0fTQ3A_1766747430 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4779b3749a8so50832315e9.1 for ; Fri, 26 Dec 2025 03:10:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1766747430; x=1767352230; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hxxe+0EjF9NUofDY+U4LnGwysYHjaMOQnhMUAVNbt4s=; b=sYVczA8o+/n2PwpwgGQn25GhKGkWcEac58F11gPn+wSh5NaTH7wr40RjvrBwixICCW atZ6zz832SBwvAVPBHqkJ6A+lnnyEjCBSoIS1IS52UfUOEVmf8E/5KX/Oop3XfkUWA97 pxhrf51sQKaY+0tc8Lm4b4R3iuUG9eYNIObuubD/RNwBOpa8SCNNUkHRZ7ZseAaPSWn8 cT/IrGRjepsTRxmIeJ2V/SXPD6jXzQxFkFT3d5eRK7z1uHVuvbZpOS61h4tr2hAHaxmb +5FqHZ85mi8GrHsn7SEefab+P6x2mHFb55w0j85+fizu3VTFdnMNbgKastFzcUn6kRGL 5QVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766747430; x=1767352230; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hxxe+0EjF9NUofDY+U4LnGwysYHjaMOQnhMUAVNbt4s=; b=AfAvp0CNcjX8AnFsh+2jNX7YuYJ+7fepOhGSFnQVBYE+vfZwUW1HZvvPlPBTxZEFOz I1WDHajxz7sSmzOwVGlpPyQMWEaUPEQHnx6436LwSHtOeFiwLrpy3fGqUPEeU559jBs1 ulz5Vr09ZTOsSnZwexCIkyGdp6Q1QJThn6t09/9E6s8KTrj3g4Et+Sx9uv0V6jl9H2Kk JVmC7Ugsla61r0Hlci633HXMQtCtBscdmvPvH1d1skoBI9OF57vuo29ei19YGyuh6O5s 4Zr2vwf1vweyJxI7H93LssvBqoXRQy56xUiSckJS8c251EKl9Djlh9y1GRXWlyr5+Mm2 XsXg== X-Forwarded-Encrypted: i=1; AJvYcCVpN5iPOoQ5sva7t/bBuZIPqYP7YFZ5y4IZF1Z9noRi+Tjwqy7rfxSrgxpopM3deH0pjjVfGDiPrMPZK18=@vger.kernel.org X-Gm-Message-State: AOJu0YwBI7kmO8FAUclY2m/iHi8ud0YyvwLOaMyqOyMLLxFgz+2rO4Ip h2UfosyyjlD4IoYOgrxpckh1UfmRiY8WvymZyC3GptGnrWEchJ4sVr969ZHAlhy28Thz9Qof1ln qCPuODO/t8UPTlYegxkEBZ/B8eroYjLCs20/zMZSNpD+QASsLlytc0+iokkXJZhZx/Q== X-Gm-Gg: AY/fxX7PyAGiCfQHFMCuNoHipfDMwuKtKrnQ2xdA+EvH1K3ah1F1kptXm+Tkjy2N6wM 6pI33StnNKOF5KT9XIkfWS4zF1WNRzYUD6ivRg5lXVTzSWyNJovcbsOhcG2Bu0M/CvpwM6sMDb3 OdhWEPFTAorWyr6Nddenlc/GjVRqFgyswFWDJpFHYDSNmaYDPVxUdbgbqijYOsU0N5jHC8qpCwX sHqjJ+NJOZ5LUxc6Pxlsy3X0VRo1q0AZgTR9ObeN/W1Di20MENju7waZ9JGLNCCzA0R1F4rkzfD FL/BexkrHqHA45oZnOIAV+pgRqILH+eGqWwTi2XrZIHmq8KY7f4PP/GCgM7hweEAoQ+EZ2QX28w yOBVZTq5WU9C2B9hkTuVGWiUsW0gpcX2LQWcSBzbbFRuiG0xo2i9Zw6IBsTCyemx0VinwuxTwzD vPh7O34VJHXg== X-Received: by 2002:a05:600c:310c:b0:46e:32dd:1b1a with SMTP id 5b1f17b1804b1-47d1953b941mr192007375e9.7.1766747426188; Fri, 26 Dec 2025 03:10:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IHrAJY07FPV6QeiBb5VL/M5EhPut9Jv/p09K9isCNRbjpx9PlU/IWIEkXo0YNR2MTtFi2aaLQ== X-Received: by 2002:a05:600c:310c:b0:46e:32dd:1b1a with SMTP id 5b1f17b1804b1-47d1953b941mr192007135e9.7.1766747425712; Fri, 26 Dec 2025 03:10:25 -0800 (PST) Received: from sissix.lzampier.com ([2a06:5900:814a:ab00:3725:2991:6cf3:b3aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47d193d4e91sm375653855e9.13.2025.12.26.03.10.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Dec 2025 03:10:25 -0800 (PST) From: Lucas Zampieri To: linux-input@vger.kernel.org Cc: Lucas Zampieri , linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Sebastian Reichel , Bastien Nocera , linux-pm@vger.kernel.org, lcasmz54@gmail.com Subject: [PATCH v6 1/3] HID: input: Convert battery code to devm_* Date: Fri, 26 Dec 2025 11:10:14 +0000 Message-ID: <20251226111019.31243-2-lzampier@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251226111019.31243-1-lzampier@redhat.com> References: <20251226111019.31243-1-lzampier@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Convert the HID battery code to use devm_* managed resource APIs for the power_supply_desc allocation, battery name string, and power supply registration. The error path uses devm_kfree() to clean up allocated memory if devm_power_supply_register() fails, preventing memory waste on repeated setup attempts. The hidinput_cleanup_battery() function is removed as devm handles cleanup automatically. Signed-off-by: Lucas Zampieri --- drivers/hid/hid-input.c | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index e56e7de53279..71862beede9e 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -530,13 +530,13 @@ static int hidinput_setup_battery(struct hid_device *= dev, unsigned report_type, if (quirks & HID_BATTERY_QUIRK_IGNORE) return 0; =20 - psy_desc =3D kzalloc(sizeof(*psy_desc), GFP_KERNEL); + psy_desc =3D devm_kzalloc(&dev->dev, sizeof(*psy_desc), GFP_KERNEL); if (!psy_desc) return -ENOMEM; =20 - psy_desc->name =3D kasprintf(GFP_KERNEL, "hid-%s-battery", - strlen(dev->uniq) ? - dev->uniq : dev_name(&dev->dev)); + psy_desc->name =3D devm_kasprintf(&dev->dev, GFP_KERNEL, "hid-%s-battery", + strlen(dev->uniq) ? + dev->uniq : dev_name(&dev->dev)); if (!psy_desc->name) { error =3D -ENOMEM; goto err_free_mem; @@ -576,7 +576,7 @@ static int hidinput_setup_battery(struct hid_device *de= v, unsigned report_type, if (quirks & HID_BATTERY_QUIRK_AVOID_QUERY) dev->battery_avoid_query =3D true; =20 - dev->battery =3D power_supply_register(&dev->dev, psy_desc, &psy_cfg); + dev->battery =3D devm_power_supply_register(&dev->dev, psy_desc, &psy_cfg= ); if (IS_ERR(dev->battery)) { error =3D PTR_ERR(dev->battery); hid_warn(dev, "can't register power supply: %d\n", error); @@ -587,27 +587,13 @@ static int hidinput_setup_battery(struct hid_device *= dev, unsigned report_type, return 0; =20 err_free_name: - kfree(psy_desc->name); + devm_kfree(&dev->dev, psy_desc->name); err_free_mem: - kfree(psy_desc); + devm_kfree(&dev->dev, psy_desc); dev->battery =3D NULL; return error; } =20 -static void hidinput_cleanup_battery(struct hid_device *dev) -{ - const struct power_supply_desc *psy_desc; - - if (!dev->battery) - return; - - psy_desc =3D dev->battery->desc; - power_supply_unregister(dev->battery); - kfree(psy_desc->name); - kfree(psy_desc); - dev->battery =3D NULL; -} - static bool hidinput_update_battery_charge_status(struct hid_device *dev, unsigned int usage, int value) { @@ -660,10 +646,6 @@ static int hidinput_setup_battery(struct hid_device *d= ev, unsigned report_type, return 0; } =20 -static void hidinput_cleanup_battery(struct hid_device *dev) -{ -} - static void hidinput_update_battery(struct hid_device *dev, unsigned int u= sage, int value) { @@ -2379,8 +2361,6 @@ void hidinput_disconnect(struct hid_device *hid) { struct hid_input *hidinput, *next; =20 - hidinput_cleanup_battery(hid); - list_for_each_entry_safe(hidinput, next, &hid->inputs, list) { list_del(&hidinput->list); if (hidinput->registered) --=20 2.52.0