6 files changed, 12 insertions, 12 deletions
diff --git a/drivers/usb/musb/am35x-phy-control.h b/drivers/usb/musb/am35x-phy-control.h
index c10d595a9e..b4eb585e71 100644
--- a/drivers/usb/musb/am35x-phy-control.h
+++ b/drivers/usb/musb/am35x-phy-control.h
@@ -17,6 +17,6 @@ static inline void phy_ctrl_wkup(struct phy_control *phy_ctrl, u32 id, bool on)
 	phy_ctrl->phy_wkup(phy_ctrl, id, on);
 }
 
-struct phy_control *am335x_get_phy_control(struct device_d *dev);
+struct phy_control *am335x_get_phy_control(struct device *dev);
 
 #endif
diff --git a/drivers/usb/musb/musb_am335x.c b/drivers/usb/musb/musb_am335x.c
index 14307c95d5..0e0665c7b1 100644
--- a/drivers/usb/musb/musb_am335x.c
+++ b/drivers/usb/musb/musb_am335x.c
@@ -3,7 +3,7 @@
 #include <init.h>
 #include <linux/clk.h>
 
-static int am335x_child_probe(struct device_d *dev)
+static int am335x_child_probe(struct device *dev)
 {
 	int ret;
 
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 999ea5519f..a0467ff3c4 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -308,7 +308,7 @@ struct musb {
 
 	struct dma_controller	*dma_controller;
 
-	struct device_d		*controller;
+	struct device		*controller;
 	void __iomem		*ctrl_base;
 	void __iomem		*mregs;
 
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 397a5792e2..974601e4fb 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -99,7 +99,7 @@ struct dsps_musb_wrapper {
  * DSPS glue structure.
  */
 struct dsps_glue {
-	struct device_d *dev;
+	struct device *dev;
 	void __iomem *base;
 	unsigned long flags;
 	enum musb_mode mode;
@@ -108,7 +108,7 @@ struct dsps_glue {
 	const struct dsps_musb_wrapper *wrp; /* wrapper register offsets */
 	struct poller_async timer;	/* otg_workaround timer */
 	uint64_t last_timer;    /* last timer data for each instance */
-	struct device_d otg_dev;
+	struct device otg_dev;
 	uint32_t otgmode;
 	struct musb_hdrc_platform_data pdata;
 };
@@ -260,7 +260,7 @@ static int get_int_prop(struct device_node *dn, const char *s)
 	return val;
 }
 
-static int get_musb_port_mode(struct device_d *dev)
+static int get_musb_port_mode(struct device *dev)
 {
 	enum usb_dr_mode mode;
 
@@ -297,7 +297,7 @@ static int dsps_set_mode(void *ctx, enum usb_dr_mode mode)
 	return musb_init_controller(&glue->musb, &glue->pdata);
 }
 
-static int dsps_probe(struct device_d *dev)
+static int dsps_probe(struct device *dev)
 {
 	struct resource *iores[2];
 	struct musb_hdrc_platform_data *pdata;
@@ -305,7 +305,7 @@ static int dsps_probe(struct device_d *dev)
 	struct device_node *dn = dev->of_node;
 	const struct dsps_musb_wrapper *wrp;
 	struct device_node *phy_node;
-	struct device_d *phy_dev;
+	struct device *phy_dev;
 	struct dsps_glue *glue;
 	int ret;
 
diff --git a/drivers/usb/musb/phy-am335x-control.c b/drivers/usb/musb/phy-am335x-control.c
index 2cdf8a2105..4156a6d071 100644
--- a/drivers/usb/musb/phy-am335x-control.c
+++ b/drivers/usb/musb/phy-am335x-control.c
@@ -8,7 +8,7 @@
 #include "am35x-phy-control.h"
 
 struct am335x_control_usb {
-	struct device_d *dev;
+	struct device *dev;
 	void __iomem *phy_reg;
 	void __iomem *wkup;
 	spinlock_t lock;
@@ -103,7 +103,7 @@ static __maybe_unused struct of_device_id omap_control_usb_dt_ids[] = {
 	},
 };
 
-struct phy_control *am335x_get_phy_control(struct device_d *dev)
+struct phy_control *am335x_get_phy_control(struct device *dev)
 {
 	struct device_node *node;
 	struct am335x_control_usb *ctrl_usb;
@@ -125,7 +125,7 @@ struct phy_control *am335x_get_phy_control(struct device_d *dev)
 EXPORT_SYMBOL(am335x_get_phy_control);
 
 
-static int am335x_control_usb_probe(struct device_d *dev)
+static int am335x_control_usb_probe(struct device *dev)
 {
 	struct resource *iores;
 	/*struct resource	*res;*/
diff --git a/drivers/usb/musb/phy-am335x.c b/drivers/usb/musb/phy-am335x.c
index aa0aec70d4..3f34e202cc 100644
--- a/drivers/usb/musb/phy-am335x.c
+++ b/drivers/usb/musb/phy-am335x.c
@@ -22,7 +22,7 @@ static int am335x_init(struct usb_phy *phy)
 	return 0;
 }
 
-static int am335x_phy_probe(struct device_d *dev)
+static int am335x_phy_probe(struct device *dev)
 {
 	struct am335x_usbphy *am_usbphy;
 	struct resource *iores;