usb: phy: rename usb_nop_xceiv to usb_phy_generic

no functional changes, just renaming the function
in order to make it slightly clearer what it should
be used for, also matching the driver name.

Signed-off-by: Felipe Balbi <balbi@ti.com>

5 files changed, 12 insertions, 12 deletions

diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index b3aa0184af9a..77ed66427969 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -360,7 +360,7 @@ static int am35x_musb_init(struct musb *musb)
         if (!rev)
                 return -ENODEV;
 
-        usb_nop_xceiv_register();
+        usb_phy_generic_register();
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
         if (IS_ERR_OR_NULL(musb->xceiv))
                 return -EPROBE_DEFER;
@@ -402,7 +402,7 @@ static int am35x_musb_exit(struct musb *musb)
                 data->set_phy_power(0);
 
         usb_put_phy(musb->xceiv);
-        usb_nop_xceiv_unregister();
+        usb_phy_generic_unregister();
 
         return 0;
 }
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 796677fa9a15..607f3ae04591 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -401,7 +401,7 @@ static int bfin_musb_init(struct musb *musb)
         }
         gpio_direction_output(musb->config->gpio_vrsel, 0);
 
-        usb_nop_xceiv_register();
+        usb_phy_generic_register();
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
         if (IS_ERR_OR_NULL(musb->xceiv)) {
                 gpio_free(musb->config->gpio_vrsel);
@@ -426,7 +426,7 @@ static int bfin_musb_exit(struct musb *musb)
         gpio_free(musb->config->gpio_vrsel);
 
         usb_put_phy(musb->xceiv);
-        usb_nop_xceiv_unregister();
+        usb_phy_generic_unregister();
         return 0;
 }
 
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index e3486de71995..bcdce8e64670 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -418,7 +418,7 @@ static int da8xx_musb_init(struct musb *musb)
         if (!rev)
                 goto fail;
 
-        usb_nop_xceiv_register();
+        usb_phy_generic_register();
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
         if (IS_ERR_OR_NULL(musb->xceiv)) {
                 ret = -EPROBE_DEFER;
@@ -453,7 +453,7 @@ static int da8xx_musb_exit(struct musb *musb)
         phy_off();
 
         usb_put_phy(musb->xceiv);
-        usb_nop_xceiv_unregister();
+        usb_phy_generic_unregister();
 
         return 0;
 }
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index c259dac9d056..c0e07eddb079 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -381,7 +381,7 @@ static int davinci_musb_init(struct musb *musb)
         u32             revision;
         int             ret = -ENODEV;
 
-        usb_nop_xceiv_register();
+        usb_phy_generic_register();
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
         if (IS_ERR_OR_NULL(musb->xceiv)) {
                 ret = -EPROBE_DEFER;
@@ -439,7 +439,7 @@ static int davinci_musb_init(struct musb *musb)
 fail:
         usb_put_phy(musb->xceiv);
 unregister:
-        usb_nop_xceiv_unregister();
+        usb_phy_generic_unregister();
         return ret;
 }
 
@@ -487,7 +487,7 @@ static int davinci_musb_exit(struct musb *musb)
         phy_off();
 
         usb_put_phy(musb->xceiv);
-        usb_nop_xceiv_unregister();
+        usb_phy_generic_unregister();
 
         return 0;
 }
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 4e9fb1d08698..0c0f5ee1e3f1 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -1065,7 +1065,7 @@ static int tusb_musb_init(struct musb *musb)
         void __iomem            *sync = NULL;
         int                     ret;
 
-        usb_nop_xceiv_register();
+        usb_phy_generic_register();
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
         if (IS_ERR_OR_NULL(musb->xceiv))
                 return -EPROBE_DEFER;
@@ -1117,7 +1117,7 @@ done:
                         iounmap(sync);
 
                 usb_put_phy(musb->xceiv);
-                usb_nop_xceiv_unregister();
+                usb_phy_generic_unregister();
         }
         return ret;
 }
@@ -1133,7 +1133,7 @@ static int tusb_musb_exit(struct musb *musb)
         iounmap(musb->sync_va);
 
         usb_put_phy(musb->xceiv);
-        usb_nop_xceiv_unregister();
+        usb_phy_generic_unregister();
         return 0;
 }