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