[PATCH] phy: tegra: xusb: Remove usb3 supply

Jon Hunter jonathanh at nvidia.com
Fri Oct 21 06:40:48 PDT 2022


On 05/10/2022 09:40, Haotien Hsu wrote:
> From: Wayne Chang <waynec at nvidia.com>
> 
> Remove redundant codes for getting the vbus supply of usb3 ports because
> we get and control the vbus supply by the companion usb2 ports
> 
> Signed-off-by: Wayne Chang <waynec at nvidia.com>
> Signed-off-by: Haotien Hsu <haotienh at nvidia.com>
> ---
>   drivers/phy/tegra/xusb-tegra124.c |  1 -
>   drivers/phy/tegra/xusb-tegra186.c |  1 -
>   drivers/phy/tegra/xusb-tegra210.c |  1 -
>   drivers/phy/tegra/xusb.c          | 10 +---------
>   drivers/phy/tegra/xusb.h          |  2 --
>   5 files changed, 1 insertion(+), 14 deletions(-)
> 
> diff --git a/drivers/phy/tegra/xusb-tegra124.c b/drivers/phy/tegra/xusb-tegra124.c
> index db56c7fbe60b..f4f75ea033b8 100644
> --- a/drivers/phy/tegra/xusb-tegra124.c
> +++ b/drivers/phy/tegra/xusb-tegra124.c
> @@ -1652,7 +1652,6 @@ tegra124_usb3_port_map(struct tegra_xusb_port *port)
>   
>   static const struct tegra_xusb_port_ops tegra124_usb3_port_ops = {
>   	.release = tegra_xusb_usb3_port_release,
> -	.remove = tegra_xusb_usb3_port_remove,
>   	.enable = tegra124_usb3_port_enable,
>   	.disable = tegra124_usb3_port_disable,
>   	.map = tegra124_usb3_port_map,
> diff --git a/drivers/phy/tegra/xusb-tegra186.c b/drivers/phy/tegra/xusb-tegra186.c
> index f6099609f154..25db49789f41 100644
> --- a/drivers/phy/tegra/xusb-tegra186.c
> +++ b/drivers/phy/tegra/xusb-tegra186.c
> @@ -1213,7 +1213,6 @@ tegra186_usb3_port_map(struct tegra_xusb_port *port)
>   
>   static const struct tegra_xusb_port_ops tegra186_usb3_port_ops = {
>   	.release = tegra_xusb_usb3_port_release,
> -	.remove = tegra_xusb_usb3_port_remove,
>   	.enable = tegra186_usb3_port_enable,
>   	.disable = tegra186_usb3_port_disable,
>   	.map = tegra186_usb3_port_map,
> diff --git a/drivers/phy/tegra/xusb-tegra210.c b/drivers/phy/tegra/xusb-tegra210.c
> index eedfc7c2cc05..ebc8a7e21a31 100644
> --- a/drivers/phy/tegra/xusb-tegra210.c
> +++ b/drivers/phy/tegra/xusb-tegra210.c
> @@ -3078,7 +3078,6 @@ tegra210_usb3_port_map(struct tegra_xusb_port *port)
>   
>   static const struct tegra_xusb_port_ops tegra210_usb3_port_ops = {
>   	.release = tegra_xusb_usb3_port_release,
> -	.remove = tegra_xusb_usb3_port_remove,
>   	.enable = tegra210_usb3_port_enable,
>   	.disable = tegra210_usb3_port_disable,
>   	.map = tegra210_usb3_port_map,
> diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
> index 46661a8d5bbc..0eaab6d846bf 100644
> --- a/drivers/phy/tegra/xusb.c
> +++ b/drivers/phy/tegra/xusb.c
> @@ -960,8 +960,7 @@ static int tegra_xusb_usb3_port_parse_dt(struct tegra_xusb_usb3_port *usb3)
>   			return -EINVAL;
>   	}
>   
> -	usb3->supply = regulator_get(&port->dev, "vbus");
> -	return PTR_ERR_OR_ZERO(usb3->supply);
> +	return 0;
>   }
>   
>   static int tegra_xusb_add_usb3_port(struct tegra_xusb_padctl *padctl,
> @@ -1018,13 +1017,6 @@ void tegra_xusb_usb3_port_release(struct tegra_xusb_port *port)
>   	kfree(usb3);
>   }
>   
> -void tegra_xusb_usb3_port_remove(struct tegra_xusb_port *port)
> -{
> -	struct tegra_xusb_usb3_port *usb3 = to_usb3_port(port);
> -
> -	regulator_put(usb3->supply);
> -}
> -
>   static void __tegra_xusb_remove_ports(struct tegra_xusb_padctl *padctl)
>   {
>   	struct tegra_xusb_port *port, *tmp;
> diff --git a/drivers/phy/tegra/xusb.h b/drivers/phy/tegra/xusb.h
> index d66b22bfeaa7..1b6b780efeec 100644
> --- a/drivers/phy/tegra/xusb.h
> +++ b/drivers/phy/tegra/xusb.h
> @@ -360,7 +360,6 @@ void tegra_xusb_hsic_port_release(struct tegra_xusb_port *port);
>   
>   struct tegra_xusb_usb3_port {
>   	struct tegra_xusb_port base;
> -	struct regulator *supply;
>   	bool context_saved;
>   	unsigned int port;
>   	bool internal;
> @@ -382,7 +381,6 @@ struct tegra_xusb_usb3_port *
>   tegra_xusb_find_usb3_port(struct tegra_xusb_padctl *padctl,
>   			  unsigned int index);
>   void tegra_xusb_usb3_port_release(struct tegra_xusb_port *port);
> -void tegra_xusb_usb3_port_remove(struct tegra_xusb_port *port);
>   
>   struct tegra_xusb_port_ops {
>   	void (*release)(struct tegra_xusb_port *port);


Reviewed-by: Jon Hunter <jonathanh at nvidia.com>

Thanks
Jon

-- 
nvpublic



More information about the linux-phy mailing list