From nobody Fri Oct 3 14:43:40 2025 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A9B352C0273 for ; Sat, 30 Aug 2025 05:34:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756532077; cv=none; b=KcUefkS5EiiZP3q4rZKIes374s2t6TGs8eGqQziFzTSy59ZCX+BmXArXpmG6Bpq2YYHrheKgc4U9seuO/atBTn4PLYWjWXwc6eUhJxZqNJBj+r8Bv/LrIYfbbbssRXd4CSBCe4dUr8Yp2Km1OEKwJ2yP74xpcJ26EWxQINHAmPQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756532077; c=relaxed/simple; bh=sUg3IHHZ5J75voc11tMfoTslPi25KOJHeq8grWg0c58=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=NjkPN2RqNT1DYLYGB9fNRO0j9j1h3hrF7nM9v3SMAef3iM06QZYa5QdLHhio5IdAb9/YGnC7kMdjBqNx5232slS+MYHkbAu2AWU1I0rg1Wnlx5vq1BFELZChGHFIMBiOKoX+WC42YgfDe1OuZIHCWrdsYOzLt9+Pv33iPZW9s4Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=S5rBQNRe; arc=none smtp.client-ip=209.85.208.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--srosek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="S5rBQNRe" Received: by mail-ed1-f73.google.com with SMTP id 4fb4d7f45d1cf-61c5b7ad547so2760960a12.3 for ; Fri, 29 Aug 2025 22:34:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756532074; x=1757136874; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=f4JCURpD1IE9B1D7dN2Ce6Y8RD7MLQqV22l08LzilKk=; b=S5rBQNRe4ZKb85YM/tXPDZ89YQZmQLfqkQBoGl9lxnuUSRlqRy2ko+aL1MT4+INTwT ++65d1r1T2luZc6cUzQRwHp4nDwxagnDgnHQ7Oo9NWvIXr0vj0dccrU+I6kRoW7r4kP+ 3NlN0Xr5DgWZa9S63YaB/q0KT89wod1qg3TMxMUEJVhl7m/clNY9vBo/AFDzQxxTG9HR 5KcAYFbu1jk9x5+HxssDYuP+xK3+3xqilSdVCk4lNsH4YN3XU6rt3wlVa0tDg8nEB4i3 /zR4KdnziSia4S1PPQFcy106HVa4VBN8wuUr6NEtThhkHiK78eT9fjs6hvS9DCu6UGu3 RvYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756532074; x=1757136874; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f4JCURpD1IE9B1D7dN2Ce6Y8RD7MLQqV22l08LzilKk=; b=uhYOhDjkonA5kxTa291TtyFPQz+bKZ3vPyknr+1zDlkWV159553+4Zw5TAFOsIEhO4 5aeHIqN0j6Ub0vwzYeEG9Cn4cG8vcANn72HOilpWirI68c+LKwGpy7iVFHCC2EVZizG7 TmuJw/aSrzteHB/5UHkhK3G3ma9oKsgG+qnvjYaeNpR2oVWrab/unBdVIHsk7KcHZimd 6/dMu62Ej1dcgZ7wqG/PDlTBf/fOBIBATxlln63DYNcexCODVkwAzaPo7s6Et1XTJN1h k2ASI+7W20eq9fFStvcra5cFnRB1NQtxh+6/ZWltN/yTmr/RiXqHx+QWq8IoHXhYJwAV bMDQ== X-Forwarded-Encrypted: i=1; AJvYcCVt7xCVkWko4CgZNrljO85kqCWyeY7T6bMIV87Xjs4GbS15w3opnXVN/b03zlOz+IDZ3s5GLMi5mv4zWMY=@vger.kernel.org X-Gm-Message-State: AOJu0YxioZPLNZ5L+mFLPu5YNvs0TBJHm/0a6/cZL1YDGfkJv4YXN7UU 5fXDu6bksaBrX8rFire+ewf5iIdBCGRh28IdzQQRe2StMZmMCXmFfC9/C48OPp2HxONuPWBde/v YJD8eaQ== X-Google-Smtp-Source: AGHT+IGFjIbQG+PkRlvNQXmqvDYraN3w1hWZbvAP9fKh5lxZvzQWxeLmsmHCe5Ni/n5zW0KmqrlkmFZN1Pg= X-Received: from edn18.prod.google.com ([2002:a05:6402:a0d2:b0:61a:165e:6a2d]) (user=srosek job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:504b:b0:618:aed3:38a with SMTP id 4fb4d7f45d1cf-61d26ebbf9fmr774333a12.31.1756532073940; Fri, 29 Aug 2025 22:34:33 -0700 (PDT) Date: Sat, 30 Aug 2025 05:34:03 +0000 In-Reply-To: <20250830053404.763995-1-srosek@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250830053404.763995-1-srosek@google.com> X-Mailer: git-send-email 2.51.0.318.gd7df087d1a-goog Message-ID: <20250830053404.763995-12-srosek@google.com> Subject: [PATCH v1 11/12] ACPI: platform: Add macro for acpi platform driver From: Slawomir Rosek To: "Rafael J . Wysocki" , Alex Hung , Hans de Goede , Ilpo Jarvinen , AceLan Kao , Daniel Lezcano Cc: Greg Kroah-Hartman , Zhang Rui , Srinivas Pandruvada , Tomasz Nowicki , Stanislaw Kardach , Michal Krawczyk , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, Slawomir Rosek Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce module_acpi_platform_driver() macro to simplify dynamic enumeration of ACPI device objects on the platform bus by loadable modules. Move common code from the intel-hid and intel-vbtn drivers to the ACPI platform core. Signed-off-by: Slawomir Rosek --- drivers/acpi/acpi_platform.c | 27 ++++++++++++++++++++ drivers/platform/x86/intel/hid.c | 41 +------------------------------ drivers/platform/x86/intel/vbtn.c | 30 +--------------------- include/linux/platform_device.h | 17 +++++++++++++ 4 files changed, 46 insertions(+), 69 deletions(-) diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c index 48d15dd785f6..adf32ffa6be6 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c @@ -190,6 +190,33 @@ struct platform_device *acpi_create_platform_device(st= ruct acpi_device *adev, } EXPORT_SYMBOL_GPL(acpi_create_platform_device); =20 +static acpi_status +__acpi_platform_driver_register_cb(acpi_handle handle, u32 lvl, + void *context, void **rv) +{ + const struct acpi_device_id *ids =3D context; + struct acpi_device *dev =3D acpi_fetch_acpi_dev(handle); + + if (dev && acpi_match_device_ids(dev, ids) =3D=3D 0) + if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL))) { + dev_info(&dev->dev, + "created platform device\n"); + } + + return AE_OK; +} + +int __acpi_platform_driver_register(struct platform_driver *drv, + struct module *owner) +{ + acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, + __acpi_platform_driver_register_cb, NULL, + (void *)drv->driver.acpi_match_table, NULL); + + return __platform_driver_register(drv, owner); +} +EXPORT_SYMBOL_GPL(__acpi_platform_driver_register); + void __init acpi_platform_init(void) { acpi_reconfig_notifier_register(&acpi_platform_notifier); diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/= hid.c index f25a427cccda..e2e0fc95e177 100644 --- a/drivers/platform/x86/intel/hid.c +++ b/drivers/platform/x86/intel/hid.c @@ -766,43 +766,4 @@ static struct platform_driver intel_hid_pl_driver =3D { .remove =3D intel_hid_remove, }; =20 -/* - * Unfortunately, some laptops provide a _HID=3D"INT33D5" device with - * _CID=3D"PNP0C02". This causes the pnpacpi scan driver to claim the - * ACPI node, so no platform device will be created. The pnpacpi - * driver rejects this device in subsequent processing, so no physical - * node is created at all. - * - * As a workaround until the ACPI core figures out how to handle - * this corner case, manually ask the ACPI platform device code to - * claim the ACPI node. - */ -static acpi_status __init -check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) -{ - const struct acpi_device_id *ids =3D context; - struct acpi_device *dev =3D acpi_fetch_acpi_dev(handle); - - if (dev && acpi_match_device_ids(dev, ids) =3D=3D 0) - if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL))) - dev_info(&dev->dev, - "intel-hid: created platform device\n"); - - return AE_OK; -} - -static int __init intel_hid_init(void) -{ - acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, - ACPI_UINT32_MAX, check_acpi_dev, NULL, - (void *)intel_hid_ids, NULL); - - return platform_driver_register(&intel_hid_pl_driver); -} -module_init(intel_hid_init); - -static void __exit intel_hid_exit(void) -{ - platform_driver_unregister(&intel_hid_pl_driver); -} -module_exit(intel_hid_exit); +module_acpi_platform_driver(intel_hid_pl_driver); diff --git a/drivers/platform/x86/intel/vbtn.c b/drivers/platform/x86/intel= /vbtn.c index 232cd12e3c9f..42932479de35 100644 --- a/drivers/platform/x86/intel/vbtn.c +++ b/drivers/platform/x86/intel/vbtn.c @@ -390,32 +390,4 @@ static struct platform_driver intel_vbtn_pl_driver =3D= { .remove =3D intel_vbtn_remove, }; =20 -static acpi_status __init -check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) -{ - const struct acpi_device_id *ids =3D context; - struct acpi_device *dev =3D acpi_fetch_acpi_dev(handle); - - if (dev && acpi_match_device_ids(dev, ids) =3D=3D 0) - if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL))) - dev_info(&dev->dev, - "intel-vbtn: created platform device\n"); - - return AE_OK; -} - -static int __init intel_vbtn_init(void) -{ - acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, - ACPI_UINT32_MAX, check_acpi_dev, NULL, - (void *)intel_vbtn_ids, NULL); - - return platform_driver_register(&intel_vbtn_pl_driver); -} -module_init(intel_vbtn_init); - -static void __exit intel_vbtn_exit(void) -{ - platform_driver_unregister(&intel_vbtn_pl_driver); -} -module_exit(intel_vbtn_exit); +module_acpi_platform_driver(intel_vbtn_pl_driver); diff --git a/include/linux/platform_device.h b/include/linux/platform_devic= e.h index 074754c23d33..3b70b054d8a5 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -264,6 +264,14 @@ extern int __platform_driver_register(struct platform_= driver *, struct module *); extern void platform_driver_unregister(struct platform_driver *); =20 +/* + * use a macro to avoid include chaining to get THIS_MODULE + */ +#define acpi_platform_driver_register(drv) \ + __acpi_platform_driver_register(drv, THIS_MODULE) +extern int __acpi_platform_driver_register(struct platform_driver *, + struct module *); + /* non-hotpluggable platform devices may use this so that probe() and * its support may live in __init sections, conserving runtime memory. */ @@ -292,6 +300,15 @@ static inline void platform_set_drvdata(struct platfor= m_device *pdev, module_driver(__platform_driver, platform_driver_register, \ platform_driver_unregister) =20 +/* module_acpi_platform_driver() - Helper macro for drivers that don't do + * anything special in module init/exit. This eliminates a lot of + * boilerplate. Each module may only use this macro once, and + * calling it replaces module_init() and module_exit() + */ +#define module_acpi_platform_driver(__platform_driver) \ + module_driver(__platform_driver, acpi_platform_driver_register, \ + platform_driver_unregister) + /* builtin_platform_driver() - Helper macro for builtin drivers that * don't do anything special in driver init. This eliminates some * boilerplate. Each driver may only use this macro once, and --=20 2.51.0.318.gd7df087d1a-goog