usb: hcd: Remove USB phy if needed
PATCH 2/9 usb: hcd: Remove USB phy if needed
From: Valentine Barshak <[email protected]>
This adds remove_phy flag to the HCD structure. If the flag is set and if hcd->phy is valid, the phy is shutdown and released whenever usb_add_hcd fails or usb_hcd_remove is called. This can be used by the HCD drivers to auto-remove the external USB phy when it is no longer needed.
Signed-off-by Valentine Barshak <[email protected]>
Acked-by Alan Stern <[email protected]>
--- drivers/usb/core/hcd.c | 14 +++++++++++++- include/linux/usb/hcd.h | 1 + 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/usb/core/hcd.c +13 -1
@@ -43,6 +43,7 @@#include <linux/usb.h> #include <linux/usb/hcd.h> +#include <linux/usb/phy.h> #include "usb.h"
@@ -2611,7 +2612,7 @@ int usb_add_hcd(struct usb_hcd *hcd,*/ if ((retval =hcd_buffer_create (hcd)) !=0 ) {dev_dbg (hcd->self.controller,"pool alloc failed\n" ); -return retval; + goto err_remove_phy; }if ((retval =usb_register_bus (&hcd->self)) <0 )
@@ -2742,6 +2743,12 @@ err_allocate_root_hub:usb_deregister_bus (&hcd->self); err_register_bus:hcd_buffer_destroy (hcd); +err_remove_phy: +if (hcd->remove_phy && hcd->phy) { +usb_phy_shutdown (hcd->phy); +usb_put_phy (hcd->phy); + hcd->phy =NULL ; + }return retval; }EXPORT_SYMBOL_GPL (usb_add_hcd);
@@ -2814,6 +2821,11 @@ void usb_remove_hcd(struct usb_hcd *hcd)usb_put_dev (hcd->self.root_hub);usb_deregister_bus (&hcd->self);hcd_buffer_destroy (hcd); +if (hcd->remove_phy && hcd->phy) { +usb_phy_shutdown (hcd->phy); +usb_put_phy (hcd->phy); + hcd->phy =NULL ; + } }EXPORT_SYMBOL_GPL (usb_remove_hcd);
include/linux/usb/hcd.h +1 -0
@@ -133,6 +133,7 @@ struct usb_hcd { unsigned rh_registered:1;/* is root hub registered? */ unsigned rh_pollable:1; /* may we poll the root hub? */ unsigned msix_enabled:1; /* driver has MSI-X enabled? */ + unsigned remove_phy:1; /* auto-remove USB phy *//* The next flag is a stopgap, to be removed when all the HCDs * support the new root-hub polling mechanism. */
Signature · 1 line
1.8.4