From patchwork Mon Feb 3 14:25:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 13957595 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 BDAA420A5DE; Mon, 3 Feb 2025 14:25:36 +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=1738592736; cv=none; b=Ud52NpYU5OmljIhp5druQALc8Hi/UocfFkdOb3y0BdORwxyNTmCWOYa4uw/3YrDn7iRi2zXTZ2EhXX282d+By3DcLV71IyUUb9jIaDnPwUj/oF1WoQi+Lz3xMpSTPDukByVnRkowXSCvPVOFPcsdmSRNBxBNMJ2DTSyxNeSvGVo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738592736; c=relaxed/simple; bh=+nmWW1bZ6UVBEYR5zkaQ0IEV8ri+eM8vDjtD4wRg5i4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g/RKLAsv+ADvHSJxQa5w1cqXaE2dlysGdajOb838NO6Nnx6AKKtnPJQiJ4FiM4ZFZ6T60KSM4/P2q2YK9WXij3Jtyxf2piMz8c+8e840KD+14EAJKwKt9YrCeE0rHig018lbQ+6zM/LDrSCk+7adZBLPrAOmUSBTf7cR+SHXsCk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Fc2BwV3I; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Fc2BwV3I" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8401EC4CEE3; Mon, 3 Feb 2025 14:25:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738592736; bh=+nmWW1bZ6UVBEYR5zkaQ0IEV8ri+eM8vDjtD4wRg5i4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fc2BwV3ItPgbMwUt1lzN5YfUPbXowxuV59LxB110WhX01ofrPGo+P71Rp2ubbz98C Ul4m6tYtyFTTi1ps5Q6AOTIrUfFQUN684Tr7hJM0mTr0z5H22xPCcyOb7hsI43ko4a 8auXMwRYv2tITXtNpFAFuHZBGFMMPfBlnCeZ7OKc= From: Greg Kroah-Hartman To: "Rafael J. Wysocki" , Danilo Krummrich , Lyude Paul Cc: Greg Kroah-Hartman , Alexander Lobakin , Andy Shevchenko , Bjorn Helgaas , Jonathan Cameron , Liam Girdwood , Lukas Wunner , Mark Brown , =?utf-8?q?Ma=C3=ADra_Canal?= , Robin Murphy , Simona Vetter , Zijun Hu , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, rust-for-linux@vger.kernel.org Subject: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed Date: Mon, 3 Feb 2025 15:25:17 +0100 Message-ID: <2025020326-backer-vendetta-7094@gregkh> X-Mailer: git-send-email 2.48.1 In-Reply-To: <2025020324-thermal-quilt-1bae@gregkh> References: <2025020324-thermal-quilt-1bae@gregkh> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=8853; i=gregkh@linuxfoundation.org; h=from:subject:message-id; bh=+nmWW1bZ6UVBEYR5zkaQ0IEV8ri+eM8vDjtD4wRg5i4=; b=owGbwMvMwCRo6H6F97bub03G02pJDOkLLl5L2ymdfGXanmuzamZeEA1RPLn/1teph96vzOEM7 N2XuMEztyOWhUGQiUFWTJHlyzaeo/srDil6GdqehpnDygQyhIGLUwAmopzCMFeq8m/2vQUe6upu mj9K65YE/bY+IMswP0epWaOuSKxspWDzJbcHsk+zGzYlAgA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 Many drivers abuse the platform driver/bus system as it provides a simple way to create and bind a device to a driver-specific set of probe/release functions. Instead of doing that, and wasting all of the memory associated with a platform device, here is a "faux" bus that can be used instead. Signed-off-by: Greg Kroah-Hartman --- drivers/base/Makefile | 2 +- drivers/base/base.h | 1 + drivers/base/faux.c | 189 ++++++++++++++++++++++++++++++++++++ drivers/base/init.c | 1 + include/linux/device/faux.h | 33 +++++++ 5 files changed, 225 insertions(+), 1 deletion(-) create mode 100644 drivers/base/faux.c create mode 100644 include/linux/device/faux.h diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 7fb21768ca36..8074a10183dc 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile @@ -6,7 +6,7 @@ obj-y := component.o core.o bus.o dd.o syscore.o \ cpu.o firmware.o init.o map.o devres.o \ attribute_container.o transport_class.o \ topology.o container.o property.o cacheinfo.o \ - swnode.o + swnode.o faux.o obj-$(CONFIG_AUXILIARY_BUS) += auxiliary.o obj-$(CONFIG_DEVTMPFS) += devtmpfs.o obj-y += power/ diff --git a/drivers/base/base.h b/drivers/base/base.h index 8cf04a557bdb..0042e4774b0c 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -137,6 +137,7 @@ int hypervisor_init(void); static inline int hypervisor_init(void) { return 0; } #endif int platform_bus_init(void); +int faux_bus_init(void); void cpu_dev_init(void); void container_dev_init(void); #ifdef CONFIG_AUXILIARY_BUS diff --git a/drivers/base/faux.c b/drivers/base/faux.c new file mode 100644 index 000000000000..0eba89a5cd57 --- /dev/null +++ b/drivers/base/faux.c @@ -0,0 +1,189 @@ +// SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2025 Greg Kroah-Hartman + * Copyright (c) 2025 The Linux Foundation + * + * A "simple" faux bus that allows devices to be created and added + * automatically to it. Whenever you need a device that is not "real", + * use this interface instead of even thinking of using a platform device. + * + */ +#include +#include +#include +#include +#include +#include "base.h" + +/* + * Internal wrapper structure so we can hold the memory + * for the driver and the name string of the faux device. + */ +struct faux_object { + struct faux_device faux_dev; + struct device_driver driver; + const struct faux_driver_ops *faux_ops; + char name[]; +}; +#define to_faux_object(x) container_of_const(dev, struct faux_object, faux_dev.dev); + +static struct device faux_bus_root = { + .init_name = "faux_bus", +}; + +static int faux_match(struct device *dev, const struct device_driver *drv) +{ + struct faux_object *faux_obj = to_faux_object(dev); + + /* Match is simple, strcmp()! */ + return (strcmp(faux_obj->name, drv->name) == 0); +} + +static int faux_probe(struct device *dev) +{ + struct faux_object *faux_obj = to_faux_object(dev); + struct faux_device *faux_dev = &faux_obj->faux_dev; + const struct faux_driver_ops *faux_ops = faux_obj->faux_ops; + int ret = 0; + + if (faux_ops && faux_ops->probe) + ret = faux_ops->probe(faux_dev); + + return ret; +} + +static void faux_remove(struct device *dev) +{ + struct faux_object *faux_obj = to_faux_object(dev); + struct faux_device *faux_dev = &faux_obj->faux_dev; + const struct faux_driver_ops *faux_ops = faux_obj->faux_ops; + + if (faux_ops && faux_ops->remove) + faux_ops->remove(faux_dev); +} + +static const struct bus_type faux_bus_type = { + .name = "faux_bus", + .match = faux_match, + .probe = faux_probe, + .remove = faux_remove, +}; + +static void faux_device_release(struct device *dev) +{ + struct faux_object *faux_obj = to_faux_object(dev); + struct device_driver *drv = &faux_obj->driver; + + /* + * Now that the device is going away, it has been unbound from the + * driver we created for it, so it is safe to unregister the driver from + * the system. + */ + driver_unregister(drv); + + kfree(faux_obj); +} + +/** + * __faux_device_create - create and register a faux device and driver + * @name: name of the device and driver we are adding + * @faux_ops: struct faux_driver_ops that the new device will call back into, can be NULL + * @owner: module owner of the device/driver + * + * Create a new faux device and driver, both with the same name, and register + * them in the driver core properly. The probe() callback of @faux_ops will be + * called with the new device that is created for the caller to do something + * with. + */ +struct faux_device *__faux_device_create(const char *name, + struct faux_driver_ops *faux_ops, + struct module *owner) +{ + struct device_driver *drv; + struct device *dev; + struct faux_object *faux_obj; + struct faux_device *faux_dev; + int ret; + + faux_obj = kzalloc(sizeof(*faux_obj) + strlen(name) + 1, GFP_KERNEL); + if (!faux_obj) + return NULL; + + /* Save off the name of the object into local memory */ + strcpy(faux_obj->name, name); + + /* Initialize the driver portion and register it with the driver core */ + faux_obj->faux_ops = faux_ops; + drv = &faux_obj->driver; + + drv->owner = owner; + drv->name = faux_obj->name; + drv->bus = &faux_bus_type; + drv->probe_type = PROBE_PREFER_ASYNCHRONOUS; + + ret = driver_register(drv); + if (ret) { + pr_err("%s: driver_register for %s faux driver failed with %d\n", + __func__, name, ret); + kfree(faux_obj); + return NULL; + } + + /* Initialize the device portion and register it with the driver core */ + faux_dev = &faux_obj->faux_dev; + dev = &faux_dev->dev; + + device_initialize(dev); + dev->release = faux_device_release; + dev->parent = &faux_bus_root; + dev->bus = &faux_bus_type; + dev_set_name(dev, "%s", name); + + ret = device_add(dev); + if (ret) { + pr_err("%s: device_add for %s faux device failed with %d\n", + __func__, name, ret); + put_device(dev); + return NULL; + } + + return faux_dev; +} +EXPORT_SYMBOL_GPL(__faux_device_create); + +/** + * faux_device_destroy - destroy a faux device + * @faux_dev: faux device to destroy + * + * Unregister and free all memory associated with a faux device. + */ +void faux_device_destroy(struct faux_device *faux_dev) +{ + struct device *dev = &faux_dev->dev; + + if (IS_ERR_OR_NULL(faux_dev)) + return; + + device_del(dev); + + /* The final put_device() will clean up the driver we created for this device. */ + put_device(dev); +} +EXPORT_SYMBOL_GPL(faux_device_destroy); + +int __init faux_bus_init(void) +{ + int error; + + error = device_register(&faux_bus_root); + if (error) { + put_device(&faux_bus_root); + return error; + } + + error = bus_register(&faux_bus_type); + if (error) + device_unregister(&faux_bus_root); + + return error; +} diff --git a/drivers/base/init.c b/drivers/base/init.c index c4954835128c..9d2b06d65dfc 100644 --- a/drivers/base/init.c +++ b/drivers/base/init.c @@ -32,6 +32,7 @@ void __init driver_init(void) /* These are also core pieces, but must come after the * core core pieces. */ + faux_bus_init(); of_core_init(); platform_bus_init(); auxiliary_bus_init(); diff --git a/include/linux/device/faux.h b/include/linux/device/faux.h new file mode 100644 index 000000000000..b1a51fbb6f39 --- /dev/null +++ b/include/linux/device/faux.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2025 Greg Kroah-Hartman + * Copyright (c) 2025 The Linux Foundation + * + * A "simple" faux bus that allows devices to be created and added + * automatically to it. Whenever you need a device that is not "real", + * use this interface instead of even thinking of using a platform device. + * + */ +#ifndef _FAUX_DEVICE_H_ +#define _FAUX_DEVICE_H_ + +#include +#include + +struct faux_device { + struct device dev; +}; +#define to_faux_device(x) container_of_const((x), struct faux_device, dev) + +struct faux_driver_ops { + int (*probe)(struct faux_device *faux_dev); + void (*remove)(struct faux_device *faux_dev); +}; + +#define faux_device_create(name, faux_ops) __faux_device_create(name, faux_ops, THIS_MODULE) +struct faux_device *__faux_device_create(const char *name, + struct faux_driver_ops *faux_ops, + struct module *module); +void faux_device_destroy(struct faux_device *faux_dev); + +#endif /* _FAUX_DEVICE_H_ */ From patchwork Mon Feb 3 14:25:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 13957597 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 82CC120A5F4; Mon, 3 Feb 2025 14:25:44 +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=1738592745; cv=none; b=KhmO9Bb5cGVFHfYye3GdBCBcdSiMGCc2RrPMGZu32eE8BMB6GnlguV14ge/8LsYlCayVneX4Ohot5/WuPPO8LJw+X2eVYVgByT172FgKyUnXBtk3yOO3IoKRJN0KoFdqLAWTyPRez/EHySOE+B9CvjUpnKnpXGPr5BlUGM44yYs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738592745; c=relaxed/simple; bh=Jy/UuLrplKIVI/tO54ZXYvBNQ40sp50epS29rpK8sEE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gxxAhalfdcOO0TTBbDYjkd8RlulFSQ30YRVhG9T8vJc0jhQH9yD/WFEHPVHcOvXuo1psisFSev2XM3KuExj5XItRereZ5ipvsQe0wSjxgjtWWdrT8aBiuZ87PZ/PWy0qotdmwwJA8P45uFFpKmvuEswDyt40kRERNlMnVXSKF+Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=T2bSoA65; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="T2bSoA65" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 715FCC4CEE0; Mon, 3 Feb 2025 14:25:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738592744; bh=Jy/UuLrplKIVI/tO54ZXYvBNQ40sp50epS29rpK8sEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T2bSoA65FoY1SNYZgmMn3vU659519CflEgMJWMBgINVFI9KgPca8eKZAaFiB0Lx12 YuW40gDOd6ClrVgojFVSmuuW/AmdMY/PzYOeJspIgZcyppi0IrJNo3ufT85np0gha7 EawC8cOMcHPZ45TnGmQlACAM3gIEfL4ckGSg4Ny4= From: Greg Kroah-Hartman To: "Rafael J. Wysocki" , Danilo Krummrich , Lyude Paul Cc: Greg Kroah-Hartman , Alexander Lobakin , Andy Shevchenko , Bjorn Helgaas , Jonathan Cameron , Liam Girdwood , Lukas Wunner , Mark Brown , =?utf-8?q?Ma=C3=ADra_Canal?= , Robin Murphy , Simona Vetter , Zijun Hu , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, rust-for-linux@vger.kernel.org Subject: [PATCH 2/3] regulator: dummy: convert to use the faux bus Date: Mon, 3 Feb 2025 15:25:18 +0100 Message-ID: <2025020326-applicant-unwomanly-13df@gregkh> X-Mailer: git-send-email 2.48.1 In-Reply-To: <2025020324-thermal-quilt-1bae@gregkh> References: <2025020324-thermal-quilt-1bae@gregkh> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2672; i=gregkh@linuxfoundation.org; h=from:subject:message-id; bh=Jy/UuLrplKIVI/tO54ZXYvBNQ40sp50epS29rpK8sEE=; b=owGbwMvMwCRo6H6F97bub03G02pJDOkLLl6f2/CjVNMsYZnaUk9RKTmLPeF+M0/Hi185NNVQc r+QY/6fjlgWBkEmBlkxRZYv23iO7q84pOhlaHsaZg4rE8gQBi5OAZgI8yOGBTt9C/sP7ny7oDa6 +FmF9Abz9QV5TAzzTFLy1bNc/S/tTTv6bla9SqmgtPlrAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 The dummy regulator driver does not need to create a platform device, it only did so because it was simple to do. Change it over to use the faux bus instead as this is NOT a real platform device, and it makes the code even smaller than before. Signed-off-by: Greg Kroah-Hartman --- drivers/regulator/dummy.c | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/drivers/regulator/dummy.c b/drivers/regulator/dummy.c index 5b9b9e4e762d..163b47e25291 100644 --- a/drivers/regulator/dummy.c +++ b/drivers/regulator/dummy.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include @@ -37,15 +37,15 @@ static const struct regulator_desc dummy_desc = { .ops = &dummy_ops, }; -static int dummy_regulator_probe(struct platform_device *pdev) +static int dummy_regulator_probe(struct faux_device *vdev) { struct regulator_config config = { }; int ret; - config.dev = &pdev->dev; + config.dev = &vdev->dev; config.init_data = &dummy_initdata; - dummy_regulator_rdev = devm_regulator_register(&pdev->dev, &dummy_desc, + dummy_regulator_rdev = devm_regulator_register(&vdev->dev, &dummy_desc, &config); if (IS_ERR(dummy_regulator_rdev)) { ret = PTR_ERR(dummy_regulator_rdev); @@ -56,36 +56,17 @@ static int dummy_regulator_probe(struct platform_device *pdev) return 0; } -static struct platform_driver dummy_regulator_driver = { - .probe = dummy_regulator_probe, - .driver = { - .name = "reg-dummy", - .probe_type = PROBE_PREFER_ASYNCHRONOUS, - }, +struct faux_driver_ops dummy_regulator_driver = { + .probe = dummy_regulator_probe, }; -static struct platform_device *dummy_pdev; +static struct faux_device *dummy_fdev; void __init regulator_dummy_init(void) { - int ret; - - dummy_pdev = platform_device_alloc("reg-dummy", -1); - if (!dummy_pdev) { + dummy_fdev = faux_device_create("reg-dummy", &dummy_regulator_driver); + if (!dummy_fdev) { pr_err("Failed to allocate dummy regulator device\n"); return; } - - ret = platform_device_add(dummy_pdev); - if (ret != 0) { - pr_err("Failed to register dummy regulator device: %d\n", ret); - platform_device_put(dummy_pdev); - return; - } - - ret = platform_driver_register(&dummy_regulator_driver); - if (ret != 0) { - pr_err("Failed to register dummy regulator driver: %d\n", ret); - platform_device_unregister(dummy_pdev); - } } From patchwork Mon Feb 3 14:25:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 13957598 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 DE29420E717; Mon, 3 Feb 2025 14:25:47 +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=1738592748; cv=none; b=qJz4hBBMlOrCOVdCeWgkZyMl2wbvWzvzSfypsU1QMBtFh96gr42Sv6gH9J6hsf+5j4VTTKDhd1V9WspsnY2QgVqdF2Ej9nfbWuLZDFKmkEyr2Q7XIglRWWOwpZiIGeFV0oaGNTaBtNX8fzaPvngXh3LBsAZCKhOI9XBL7sOEYiQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738592748; c=relaxed/simple; bh=/S3kzd2hJTPvXKLO9fx2nBLWYyehy9tDu33amLOisb0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ISrF7gsWEcs1fGZ08EMzUJfpgPu0egdYxN8/NKKQIze8eb4H4v2SraMmggLm0VJWDkK0lGRR5GANpOlKc2d+4r/fsWEs7EpPc5pZREPRQf2mbEM7jnAuBtZTIEaHBBq1KT77XYRuYJz4eTvkYsJTyHBBICKkQW0ymZn9UWfovlQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LQco2YCw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LQco2YCw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97C29C4CEE7; Mon, 3 Feb 2025 14:25:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738592747; bh=/S3kzd2hJTPvXKLO9fx2nBLWYyehy9tDu33amLOisb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LQco2YCw7Dm7gvC5UPAVGLGv7fihMuWDvlVkbCjWkYSscI2W62JbttZhCbGNw765i +4186/Vdb8/zbltR1zDal8rw116IWETuIwai+7Xj9kfXkrBfITnHvdQOnrnCy1+QO3 6McBFe4AifBmW04Ya+mVZTsRkKr9HAK3I3FjyVlk= From: Greg Kroah-Hartman To: "Rafael J. Wysocki" , Danilo Krummrich , Lyude Paul Cc: Greg Kroah-Hartman , Alexander Lobakin , Andy Shevchenko , Bjorn Helgaas , Jonathan Cameron , Liam Girdwood , Lukas Wunner , Mark Brown , =?utf-8?q?Ma=C3=ADra_Canal?= , Robin Murphy , Simona Vetter , Zijun Hu , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, rust-for-linux@vger.kernel.org Subject: [PATCH 3/3] USB: phy: convert usb_phy_generic logic to use a faux device Date: Mon, 3 Feb 2025 15:25:19 +0100 Message-ID: <2025020327-economy-craftwork-8799@gregkh> X-Mailer: git-send-email 2.48.1 In-Reply-To: <2025020324-thermal-quilt-1bae@gregkh> References: <2025020324-thermal-quilt-1bae@gregkh> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5663; i=gregkh@linuxfoundation.org; h=from:subject:message-id; bh=/S3kzd2hJTPvXKLO9fx2nBLWYyehy9tDu33amLOisb0=; b=owGbwMvMwCRo6H6F97bub03G02pJDOkLLl53ehS1izlc6cS93BM/X2/91Z3RJ2Zf9K93ndplo Qce/hW7O2JZGASZGGTFFFm+bOM5ur/ikKKXoe1pmDmsTCBDGLg4BWAi31QZFuzwZrr6M89go/oX hRuRC+M8joT+zGWYwzs7T+Sjz91JEuVJvlEnVDrdp700AwA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 The usb_phy_generic code was creating a "fake" platform device to pass around in different places. Instead of doing that, use the faux bus instead as that is what is really wanted here. Site note, this fixes a bug in the mpfs driver where the incorrect pointer was being passed to usb_phy_generic_unregister(), odd that no one ever hit this in the past. Signed-off-by: Greg Kroah-Hartman --- drivers/usb/chipidea/ci_hdrc_pci.c | 2 +- drivers/usb/dwc2/pci.c | 4 ++-- drivers/usb/musb/mediatek.c | 4 ++-- drivers/usb/musb/mpfs.c | 4 ++-- drivers/usb/musb/tusb6010.c | 2 +- drivers/usb/phy/phy-generic.c | 9 ++++----- include/linux/usb/usb_phy_generic.h | 9 +++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/usb/chipidea/ci_hdrc_pci.c b/drivers/usb/chipidea/ci_hdrc_pci.c index d63479e1ad10..63511ea30d6e 100644 --- a/drivers/usb/chipidea/ci_hdrc_pci.c +++ b/drivers/usb/chipidea/ci_hdrc_pci.c @@ -20,7 +20,7 @@ struct ci_hdrc_pci { struct platform_device *ci; - struct platform_device *phy; + struct faux_device *phy; }; /****************************************************************************** diff --git a/drivers/usb/dwc2/pci.c b/drivers/usb/dwc2/pci.c index f3a1e4232a31..8cb50620aa55 100644 --- a/drivers/usb/dwc2/pci.c +++ b/drivers/usb/dwc2/pci.c @@ -30,7 +30,7 @@ static const char dwc2_driver_name[] = "dwc2-pci"; struct dwc2_pci_glue { struct platform_device *dwc2; - struct platform_device *phy; + struct faux_device *phy; }; /** @@ -53,7 +53,7 @@ static int dwc2_pci_probe(struct pci_dev *pci, { struct resource res[2]; struct platform_device *dwc2; - struct platform_device *phy; + struct faux_device *phy; int ret; struct device *dev = &pci->dev; struct dwc2_pci_glue *glue; diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c index aa988d74b58d..995bab88506a 100644 --- a/drivers/usb/musb/mediatek.c +++ b/drivers/usb/musb/mediatek.c @@ -43,7 +43,7 @@ struct mtk_glue { struct device *dev; struct musb *musb; struct platform_device *musb_pdev; - struct platform_device *usb_phy; + struct faux_device *usb_phy; struct phy *phy; struct usb_phy *xceiv; enum phy_mode phy_mode; @@ -507,7 +507,7 @@ static int mtk_musb_probe(struct platform_device *pdev) static void mtk_musb_remove(struct platform_device *pdev) { struct mtk_glue *glue = platform_get_drvdata(pdev); - struct platform_device *usb_phy = glue->usb_phy; + struct faux_device *usb_phy = glue->usb_phy; platform_device_unregister(glue->musb_pdev); usb_phy_generic_unregister(usb_phy); diff --git a/drivers/usb/musb/mpfs.c b/drivers/usb/musb/mpfs.c index 7edc8429b274..ef20794aee12 100644 --- a/drivers/usb/musb/mpfs.c +++ b/drivers/usb/musb/mpfs.c @@ -25,7 +25,7 @@ struct mpfs_glue { struct device *dev; struct platform_device *musb; - struct platform_device *phy; + struct faux_device *phy; struct clk *clk; }; @@ -356,7 +356,7 @@ static void mpfs_remove(struct platform_device *pdev) clk_disable_unprepare(glue->clk); platform_device_unregister(glue->musb); - usb_phy_generic_unregister(pdev); + usb_phy_generic_unregister(glue->phy); } #ifdef CONFIG_OF diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c index 90b760a95e4e..92609f9d20ff 100644 --- a/drivers/usb/musb/tusb6010.c +++ b/drivers/usb/musb/tusb6010.c @@ -32,7 +32,7 @@ struct tusb6010_glue { struct device *dev; struct platform_device *musb; - struct platform_device *phy; + struct faux_device *phy; struct gpio_desc *enable; struct gpio_desc *intpin; }; diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c index 6c3ececf9137..a6cece75d0f8 100644 --- a/drivers/usb/phy/phy-generic.c +++ b/drivers/usb/phy/phy-generic.c @@ -30,16 +30,15 @@ (IRQF_SHARED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | \ IRQF_ONESHOT) -struct platform_device *usb_phy_generic_register(void) +struct faux_device *usb_phy_generic_register(void) { - return platform_device_register_simple("usb_phy_generic", - PLATFORM_DEVID_AUTO, NULL, 0); + return faux_device_create("usb_phy_generic", NULL); } EXPORT_SYMBOL_GPL(usb_phy_generic_register); -void usb_phy_generic_unregister(struct platform_device *pdev) +void usb_phy_generic_unregister(struct faux_device *fdev) { - platform_device_unregister(pdev); + faux_device_destroy(fdev); } EXPORT_SYMBOL_GPL(usb_phy_generic_unregister); diff --git a/include/linux/usb/usb_phy_generic.h b/include/linux/usb/usb_phy_generic.h index cd9e70a552a0..856db2bacc07 100644 --- a/include/linux/usb/usb_phy_generic.h +++ b/include/linux/usb/usb_phy_generic.h @@ -3,18 +3,19 @@ #define __LINUX_USB_NOP_XCEIV_H #include +#include #if IS_ENABLED(CONFIG_NOP_USB_XCEIV) /* sometimes transceivers are accessed only through e.g. ULPI */ -extern struct platform_device *usb_phy_generic_register(void); -extern void usb_phy_generic_unregister(struct platform_device *); +struct faux_device *usb_phy_generic_register(void); +void usb_phy_generic_unregister(struct faux_device *); #else -static inline struct platform_device *usb_phy_generic_register(void) +static inline struct faux_device *usb_phy_generic_register(void) { return NULL; } -static inline void usb_phy_generic_unregister(struct platform_device *pdev) +static inline void usb_phy_generic_unregister(struct faux_device *fdev) { } #endif