From nobody Mon Dec 15 23:31:21 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 7B6373375C2; Mon, 15 Dec 2025 14:04:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765807469; cv=none; b=S3udtz+4jGSHbOF/kikPWVTNKNgkXX+CN65Y2aY2t99doZNxHceCM95UxtiI7N/DnJtetGyeQq9Jly9Fwjsq7czkJ8Wn7lhjpw431qMAmdZthCD4w/6TBbcuAJO9ECu3k8DDpuRxXdS6q0hfY5QCoeErAu75JU6owLerrDLWn6U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765807469; c=relaxed/simple; bh=KPj0VXGkCWozRW5mspd8XopJIttba3dVN3v2ct991KQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SPrPMg2dTfxu1R9k+NbWIy2ibdRSvab+0U8XyP+EinKJ28xFlVJeGANqqJJ9KWyZo2yv7H3sTORO8AlO6qkOa7wiyRBq3ZnqSZAvME/ePHIvSRyJbZo2+XuLzS4aq0nyb2ghECMQM5y19MTjJS8+e+ees5KJrY4EfFBi/xqIEo4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=g57ELkAA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="g57ELkAA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E84EC4CEFB; Mon, 15 Dec 2025 14:04:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765807469; bh=KPj0VXGkCWozRW5mspd8XopJIttba3dVN3v2ct991KQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g57ELkAAxVthIfRQrgLDnCLvNWK8qfDHpdrZVTwHx5M/9FmGu9zdX869fWW0PUkY2 I9Lmfa8f0BKOiNujoV0LijeRy7+NcfiXNFNFpJ0UIBooLJdeUGKeM57Fh3zDmGv1aX vNuoh4XHB7RV5ZUc4HgEqApaJ/Gx+7Yt3TAmmxVK4V8H4hMiFLbZSDB3B+zJYBXJCq wVWkzc5ZMNSrwPylHWwYupiQip7/2n2yRPfGwBRasW9w4LEPcXD4YvPGWB9pVWDD+y 9lzgs3StPok4XYd3VRcqgsM8HHFHSiJhIZuLmxIcbonw8eVAQFDvdTO2siMh9YG2gX KJUMGQI5CIQ2A== From: "Rafael J. Wysocki" To: Linux ACPI Cc: Hans de Goede , LKML , Linux PM , Thomas =?ISO-8859-1?Q?Wei=DFschuh?= , Armin Wolf Subject: [PATCH v2 02/10] ACPI: scan: Reduce code duplication related to fixed event devices Date: Mon, 15 Dec 2025 14:54:17 +0100 Message-ID: <1916860.atdPhlSkOF@rafael.j.wysocki> Organization: Linux Kernel Development In-Reply-To: <2685338.Lt9SDvczpP@rafael.j.wysocki> References: <2685338.Lt9SDvczpP@rafael.j.wysocki> 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" From: Rafael J. Wysocki Move duplicate fixed event device registration code from acpi_bus_scan_fixed() into a new function called acpi_bus_add_fixed_device_object() and make acpi_bus_scan_fixed() invoke that function as needed. No intentional functional impact. Signed-off-by: Rafael J. Wysocki --- v1 -> v2: No changes --- drivers/acpi/scan.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2754,37 +2754,29 @@ int acpi_bus_register_early_device(int t } EXPORT_SYMBOL_GPL(acpi_bus_register_early_device); =20 -static void acpi_bus_scan_fixed(void) +static void acpi_bus_add_fixed_device_object(enum acpi_bus_device_type typ= e) { - if (!(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON)) { - struct acpi_device *adev =3D NULL; + struct acpi_device *adev =3D NULL; =20 - acpi_add_single_object(&adev, NULL, ACPI_BUS_TYPE_POWER_BUTTON, - false); - if (adev) { - adev->flags.match_driver =3D true; - if (device_attach(&adev->dev) >=3D 0) - device_init_wakeup(&adev->dev, true); - else - dev_dbg(&adev->dev, "No driver\n"); + acpi_add_single_object(&adev, NULL, type, false); + if (adev) { + adev->flags.match_driver =3D true; + if (device_attach(&adev->dev) >=3D 0) + device_init_wakeup(&adev->dev, true); + else + dev_dbg(&adev->dev, "No driver\n"); =20 - acpi_default_enumeration(adev); - } + acpi_default_enumeration(adev); } +} =20 - if (!(acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON)) { - struct acpi_device *adev =3D NULL; - - acpi_add_single_object(&adev, NULL, ACPI_BUS_TYPE_SLEEP_BUTTON, - false); - if (adev) { - adev->flags.match_driver =3D true; - if (device_attach(&adev->dev) < 0) - dev_dbg(&adev->dev, "No driver\n"); +static void acpi_bus_scan_fixed(void) +{ + if (!(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON)) + acpi_bus_add_fixed_device_object(ACPI_BUS_TYPE_POWER_BUTTON); =20 - acpi_default_enumeration(adev); - } - } + if (!(acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON)) + acpi_bus_add_fixed_device_object(ACPI_BUS_TYPE_SLEEP_BUTTON); } =20 static void __init acpi_get_spcr_uart_addr(void)