Rename struct device_d to device

The '_d' suffix was originally introduced in case we want to import
Linux struct device as a separate struct into barebox. Over time it
became clear that this won't happen, instead barebox struct device_d
is basically the same as Linux struct device. Rename the struct name
accordingly to make porting Linux code easier.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.barebox.org/20221214123512.189688-3-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

38 files changed, 91 insertions, 88 deletions

diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 4c05ac5821..0ca3dce8d9 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -260,7 +260,7 @@ struct atmel_lcdfb_devdata atmel_hlcdfb_data = {
 	.dma_desc_size = sizeof(struct atmel_hlcd_dma_desc),
 };
 
-static int atmel_hlcdc_probe(struct device_d *dev)
+static int atmel_hlcdc_probe(struct device *dev)
 {
 	return atmel_lcdc_register(dev, &atmel_hlcdfb_data);
 }
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 38b4b8df39..f65b1797b3 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -223,7 +223,7 @@ struct atmel_lcdfb_devdata atmel_lcdfb_data = {
 	.limit_screeninfo = atmel_lcdfb_limit_screeninfo,
 };
 
-static int atmel_lcdc_probe(struct device_d *dev)
+static int atmel_lcdc_probe(struct device *dev)
 {
 	return atmel_lcdc_register(dev, &atmel_lcdfb_data);
 }
diff --git a/drivers/video/atmel_lcdfb.h b/drivers/video/atmel_lcdfb.h
index 110c71bdb2..7aa058e198 100644
--- a/drivers/video/atmel_lcdfb.h
+++ b/drivers/video/atmel_lcdfb.h
@@ -24,7 +24,7 @@ struct atmel_lcdfb_devdata {
 struct atmel_lcdfb_info {
 	struct fb_info		info;
 	void __iomem		*mmio;
-	struct device_d		*device;
+	struct device		*device;
 
 	unsigned int		guard_time;
 	unsigned int		smem_len;
@@ -49,4 +49,4 @@ struct atmel_lcdfb_info {
 
 #define ATMEL_LCDC_STOP_NOWAIT (1 << 0)
 
-int atmel_lcdc_register(struct device_d *dev, struct atmel_lcdfb_devdata *data);
+int atmel_lcdc_register(struct device *dev, struct atmel_lcdfb_devdata *data);
diff --git a/drivers/video/atmel_lcdfb_core.c b/drivers/video/atmel_lcdfb_core.c
index f6ff9ab8fa..158fe8bbf9 100644
--- a/drivers/video/atmel_lcdfb_core.c
+++ b/drivers/video/atmel_lcdfb_core.c
@@ -62,7 +62,7 @@ static void atmel_lcdc_disable_controller(struct fb_info *fb_info)
 
 static int atmel_lcdfb_check_var(struct fb_info *info)
 {
-	struct device_d *dev = &info->dev;
+	struct device *dev = &info->dev;
 	struct atmel_lcdfb_info *sinfo = info->priv;
 	struct fb_videomode *mode = info->mode;
 	unsigned long clk_value_khz;
@@ -237,7 +237,7 @@ static struct fb_ops atmel_lcdc_ops = {
 	.fb_disable = atmel_lcdc_disable_controller,
 };
 
-static int power_control_init(struct device_d *dev,
+static int power_control_init(struct device *dev,
 			      struct atmel_lcdfb_info *sinfo,
 			      int gpio,
 			      bool active_low)
@@ -294,7 +294,7 @@ static int of_get_wiring_mode(struct device_node *np,
 	return 0;
 }
 
-static int of_get_power_control(struct device_d *dev,
+static int of_get_power_control(struct device *dev,
 				struct device_node *np,
 				struct atmel_lcdfb_info *sinfo)
 {
@@ -311,7 +311,7 @@ static int of_get_power_control(struct device_d *dev,
 	return power_control_init(dev, sinfo, gpio, active_low);
 }
 
-static int lcdfb_of_init(struct device_d *dev, struct atmel_lcdfb_info *sinfo)
+static int lcdfb_of_init(struct device *dev, struct atmel_lcdfb_info *sinfo)
 {
 	struct fb_info *info = &sinfo->info;
 	struct display_timings *modes;
@@ -378,7 +378,8 @@ err:
 	return ret;
 }
 
-static int lcdfb_pdata_init(struct device_d *dev, struct atmel_lcdfb_info *sinfo)
+static int lcdfb_pdata_init(struct device *dev,
+			    struct atmel_lcdfb_info *sinfo)
 {
 	struct atmel_lcdfb_platform_data *pdata;
 	struct fb_info *info;
@@ -422,7 +423,7 @@ err:
 	return ret;
 }
 
-int atmel_lcdc_register(struct device_d *dev, struct atmel_lcdfb_devdata *data)
+int atmel_lcdc_register(struct device *dev, struct atmel_lcdfb_devdata *data)
 {
 	struct atmel_lcdfb_info *sinfo;
 	const char *bus_clk_name;
diff --git a/drivers/video/backlight-pwm.c b/drivers/video/backlight-pwm.c
index bbacddec87..65a621015d 100644
--- a/drivers/video/backlight-pwm.c
+++ b/drivers/video/backlight-pwm.c
@@ -101,8 +101,8 @@ static int backlight_pwm_set(struct backlight_device *backlight,
 		return backlight_pwm_disable(pwm_backlight);
 }
 
-static int pwm_backlight_parse_dt(struct device_d *dev,
-		struct pwm_backlight *pwm_backlight)
+static int pwm_backlight_parse_dt(struct device *dev,
+				  struct pwm_backlight *pwm_backlight)
 {
 	struct device_node *node = dev->of_node;
 	struct property *prop;
@@ -164,7 +164,7 @@ static int pwm_backlight_parse_dt(struct device_d *dev,
 	return 0;
 }
 
-static int backlight_pwm_of_probe(struct device_d *dev)
+static int backlight_pwm_of_probe(struct device *dev)
 {
 	int ret;
 	struct pwm_backlight *pwm_backlight;
diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
index 14735fe465..d0b15782a7 100644
--- a/drivers/video/bcm2835.c
+++ b/drivers/video/bcm2835.c
@@ -54,7 +54,7 @@ static struct fb_ops bcm2835fb_ops = {
 	.fb_disable		= bcm2835fb_disable,
 };
 
-static int bcm2835fb_probe(struct device_d *dev)
+static int bcm2835fb_probe(struct device *dev)
 {
 	BCM2835_MBOX_STACK_ALIGN(struct msg_fb_query, msg_query);
 	BCM2835_MBOX_STACK_ALIGN(struct msg_fb_setup, msg_setup);
diff --git a/drivers/video/bochs/bochs_hw.c b/drivers/video/bochs/bochs_hw.c
index debdd36941..f31020acd4 100644
--- a/drivers/video/bochs/bochs_hw.c
+++ b/drivers/video/bochs/bochs_hw.c
@@ -149,7 +149,8 @@ static int bochs_hw_read_version(struct bochs *bochs)
 	return ver & 0xF;
 }
 
-int bochs_hw_probe(struct device_d *dev, void __iomem *fb_map, void __iomem *mmio)
+int bochs_hw_probe(struct device *dev, void __iomem *fb_map,
+		   void __iomem *mmio)
 {
 	struct bochs *bochs;
 	struct fb_info *fb;
diff --git a/drivers/video/bochs/bochs_hw.h b/drivers/video/bochs/bochs_hw.h
index 420b58f4da..e01ef13d47 100644
--- a/drivers/video/bochs/bochs_hw.h
+++ b/drivers/video/bochs/bochs_hw.h
@@ -8,8 +8,8 @@
 #define VBE_DISPI_IOPORT_INDEX           0x01CE
 #define VBE_DISPI_IOPORT_DATA            0x01CF
 
-struct device_d;
+struct device;
 
-int bochs_hw_probe(struct device_d *dev, void *fb_map, void __iomem *mmio);
+int bochs_hw_probe(struct device *dev, void *fb_map, void __iomem *mmio);
 
 #endif
diff --git a/drivers/video/bochs/bochs_isa.c b/drivers/video/bochs/bochs_isa.c
index f273ac5f74..3cedb5c345 100644
--- a/drivers/video/bochs/bochs_isa.c
+++ b/drivers/video/bochs/bochs_isa.c
@@ -11,7 +11,7 @@
 
 static int bochs_isa_detect(void)
 {
-	struct device_d *dev;
+	struct device *dev;
 	int ret;
 
 	outw(0, VBE_DISPI_IOPORT_INDEX);
diff --git a/drivers/video/efi_gop.c b/drivers/video/efi_gop.c
index 5e9bc406e1..cd2506c04b 100644
--- a/drivers/video/efi_gop.c
+++ b/drivers/video/efi_gop.c
@@ -63,7 +63,7 @@ struct efi_graphics_output_protocol {
 };
 
 struct efi_gop_priv {
-	struct device_d *dev;
+	struct device *dev;
 	struct fb_info fb;
 
 	uint32_t mode;
diff --git a/drivers/video/fb.c b/drivers/video/fb.c
index 1c93dafbc9..44754065e7 100644
--- a/drivers/video/fb.c
+++ b/drivers/video/fb.c
@@ -158,7 +158,7 @@ static struct fb_videomode *fb_num_to_mode(struct fb_info *info, int num)
 
 static int fb_setup_mode(struct fb_info *info)
 {
-	struct device_d *dev = &info->dev;
+	struct device *dev = &info->dev;
 	int ret;
 	struct fb_videomode *mode;
 
@@ -251,7 +251,7 @@ static void fb_print_modes(struct display_timings *modes)
 		fb_print_mode(&modes->modes[i]);
 }
 
-static void fb_info(struct device_d *dev)
+static void fb_info(struct device *dev)
 {
 	struct fb_info *info = dev->priv;
 
@@ -279,7 +279,7 @@ static int fb_set_shadowfb(struct param_d *p, void *priv)
 int register_framebuffer(struct fb_info *info)
 {
 	int id = get_free_deviceid("fb");
-	struct device_d *dev;
+	struct device *dev;
 	int ret, num_modes, i;
 	const char **names;
 
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c
index d158c68c25..a525032873 100644
--- a/drivers/video/imx-ipu-fb.c
+++ b/drivers/video/imx-ipu-fb.c
@@ -29,7 +29,7 @@ struct ipu_fb_info {
 
 	struct fb_info		info;
 	struct fb_info		overlay;
-	struct device_d		*dev;
+	struct device		*dev;
 
 	unsigned int		alpha;
 	int			disable_fractional_divider;
@@ -974,7 +974,7 @@ static int sdc_fb_register_overlay(struct ipu_fb_info *fbi, void *fb)
 
 #endif
 
-static int imxfb_probe(struct device_d *dev)
+static int imxfb_probe(struct device *dev)
 {
 	struct resource *iores;
 	struct ipu_fb_info *fbi;
diff --git a/drivers/video/imx-ipu-v3/imx-hdmi.c b/drivers/video/imx-ipu-v3/imx-hdmi.c
index 285034270d..21dfc929d8 100644
--- a/drivers/video/imx-ipu-v3/imx-hdmi.c
+++ b/drivers/video/imx-ipu-v3/imx-hdmi.c
@@ -113,7 +113,7 @@ struct hdmi_data_info {
 
 struct dw_hdmi {
 	enum dw_hdmi_devtype dev_type;
-	struct device_d *dev;
+	struct device *dev;
 	struct clk *isfr_clk;
 	struct clk *iahb_clk;
 
@@ -1248,7 +1248,7 @@ static int dw_hdmi_ioctl(struct vpl *vpl, unsigned int port,
 	return 0;
 }
 
-static int dw_hdmi_probe(struct device_d *dev)
+static int dw_hdmi_probe(struct device *dev)
 {
 	struct resource *iores;
 	struct device_node *np = dev->of_node;
diff --git a/drivers/video/imx-ipu-v3/imx-ldb.c b/drivers/video/imx-ipu-v3/imx-ldb.c
index 08b5e5950c..01aa7f3683 100644
--- a/drivers/video/imx-ipu-v3/imx-ldb.c
+++ b/drivers/video/imx-ipu-v3/imx-ldb.c
@@ -61,7 +61,7 @@ struct imx_ldb_data {
 };
 
 struct imx_ldb {
-	struct device_d *dev;
+	struct device *dev;
 	u32 bus_format;
 	int mode_valid;
 	struct imx_ldb_channel channel[2];
@@ -302,7 +302,7 @@ static int imx_ldb_ioctl(struct vpl *vpl, unsigned int port,
 	return 0;
 }
 
-static int imx_ldb_probe(struct device_d *dev)
+static int imx_ldb_probe(struct device *dev)
 {
 	struct device_node *np = dev->of_node;
 	struct device_node *child;
diff --git a/drivers/video/imx-ipu-v3/imx-pd.c b/drivers/video/imx-ipu-v3/imx-pd.c
index ee30d3b57d..e5b6d9122b 100644
--- a/drivers/video/imx-ipu-v3/imx-pd.c
+++ b/drivers/video/imx-ipu-v3/imx-pd.c
@@ -22,7 +22,7 @@
 #define IMX_PD_OUTPUT_PORT	1
 
 struct imx_pd {
-	struct device_d *dev;
+	struct device *dev;
 	struct display_timings *timings;
 	u32 bus_format;
 	struct vpl vpl;
@@ -61,7 +61,7 @@ static int imx_pd_ioctl(struct vpl *vpl, unsigned int port,
 	return 0;
 }
 
-static int imx_pd_probe(struct device_d *dev)
+static int imx_pd_probe(struct device *dev)
 {
 	struct device_node *node = dev->of_node;
 	struct imx_pd *imx_pd;
diff --git a/drivers/video/imx-ipu-v3/ipu-common.c b/drivers/video/imx-ipu-v3/ipu-common.c
index 556f737fc5..095f1d3564 100644
--- a/drivers/video/imx-ipu-v3/ipu-common.c
+++ b/drivers/video/imx-ipu-v3/ipu-common.c
@@ -611,7 +611,7 @@ static struct of_device_id imx_ipu_dt_ids[] = {
 };
 
 static int ipu_submodules_init(struct ipu_soc *ipu,
-		struct device_d *dev, void __iomem *ipu_base,
+		struct device *dev, void __iomem *ipu_base,
 		struct clk *ipu_clk)
 {
 	char *unit;
@@ -705,10 +705,10 @@ static struct ipu_platform_reg client_reg[] = {
 
 static int ipu_client_id;
 
-static int ipu_add_subdevice_pdata(struct device_d *ipu_dev,
-		struct ipu_platform_reg *reg)
+static int ipu_add_subdevice_pdata(struct device *ipu_dev,
+				   struct ipu_platform_reg *reg)
 {
-	struct device_d *dev;
+	struct device *dev;
 	int ret;
 
 	dev = device_alloc(reg->name, ipu_client_id++);
@@ -740,7 +740,7 @@ err_register:
 	return ret;
 }
 
-static int ipu_probe(struct device_d *dev)
+static int ipu_probe(struct device *dev)
 {
 	struct resource *iores;
 	struct ipu_soc *ipu;
diff --git a/drivers/video/imx-ipu-v3/ipu-dc.c b/drivers/video/imx-ipu-v3/ipu-dc.c
index d069d78ab3..a0292fc4a1 100644
--- a/drivers/video/imx-ipu-v3/ipu-dc.c
+++ b/drivers/video/imx-ipu-v3/ipu-dc.c
@@ -96,7 +96,7 @@ struct ipu_dc_priv {
 	void __iomem		*dc_reg;
 	void __iomem		*dc_tmpl_reg;
 	struct ipu_soc		*ipu;
-	struct device_d		*dev;
+	struct device		*dev;
 	struct ipu_dc		channels[IPU_DC_NUM_CHANNELS];
 };
 
@@ -312,7 +312,7 @@ void ipu_dc_put(struct ipu_dc *dc)
 }
 EXPORT_SYMBOL_GPL(ipu_dc_put);
 
-int ipu_dc_init(struct ipu_soc *ipu, struct device_d *dev,
+int ipu_dc_init(struct ipu_soc *ipu, struct device *dev,
 		void __iomem *base, void __iomem *template_base)
 {
 	struct ipu_dc_priv *priv;
diff --git a/drivers/video/imx-ipu-v3/ipu-di.c b/drivers/video/imx-ipu-v3/ipu-di.c
index d63613c842..6156911bfc 100644
--- a/drivers/video/imx-ipu-v3/ipu-di.c
+++ b/drivers/video/imx-ipu-v3/ipu-di.c
@@ -700,7 +700,7 @@ void ipu_di_put(struct ipu_di *di)
 }
 EXPORT_SYMBOL_GPL(ipu_di_put);
 
-int ipu_di_init(struct ipu_soc *ipu, struct device_d *dev, int id,
+int ipu_di_init(struct ipu_soc *ipu, struct device *dev, int id,
 		void __iomem *base,
 		u32 module, struct clk *clk_ipu)
 {
diff --git a/drivers/video/imx-ipu-v3/ipu-dmfc.c b/drivers/video/imx-ipu-v3/ipu-dmfc.c
index e879f97a33..4be6a15eef 100644
--- a/drivers/video/imx-ipu-v3/ipu-dmfc.c
+++ b/drivers/video/imx-ipu-v3/ipu-dmfc.c
@@ -100,7 +100,7 @@ struct dmfc_channel {
 
 struct ipu_dmfc_priv {
 	struct ipu_soc *ipu;
-	struct device_d *dev;
+	struct device *dev;
 	struct dmfc_channel channels[DMFC_NUM_CHANNELS];
 	unsigned long bandwidth_per_slot;
 	void __iomem *base;
@@ -340,8 +340,8 @@ void ipu_dmfc_put(struct dmfc_channel *dmfc)
 }
 EXPORT_SYMBOL_GPL(ipu_dmfc_put);
 
-int ipu_dmfc_init(struct ipu_soc *ipu, struct device_d *dev, void __iomem *base,
-		struct clk *ipu_clk)
+int ipu_dmfc_init(struct ipu_soc *ipu, struct device *dev, void __iomem *base,
+		  struct clk *ipu_clk)
 {
 	struct ipu_dmfc_priv *priv;
 	int i;
diff --git a/drivers/video/imx-ipu-v3/ipu-dp.c b/drivers/video/imx-ipu-v3/ipu-dp.c
index 67f93c0d55..68b45c11c7 100644
--- a/drivers/video/imx-ipu-v3/ipu-dp.c
+++ b/drivers/video/imx-ipu-v3/ipu-dp.c
@@ -56,7 +56,7 @@ struct ipu_flow {
 
 struct ipu_dp_priv {
 	struct ipu_soc *ipu;
-	struct device_d *dev;
+	struct device *dev;
 	void __iomem *base;
 	struct ipu_flow flow[IPUV3_NUM_FLOWS];
 	int use_count;
@@ -277,7 +277,7 @@ void ipu_dp_put(struct ipu_dp *dp)
 }
 EXPORT_SYMBOL_GPL(ipu_dp_put);
 
-int ipu_dp_init(struct ipu_soc *ipu, struct device_d *dev, void __iomem *base)
+int ipu_dp_init(struct ipu_soc *ipu, struct device *dev, void __iomem *base)
 {
 	struct ipu_dp_priv *priv;
 	int i;
diff --git a/drivers/video/imx-ipu-v3/ipu-prv.h b/drivers/video/imx-ipu-v3/ipu-prv.h
index 15aed7a943..4465711ee4 100644
--- a/drivers/video/imx-ipu-v3/ipu-prv.h
+++ b/drivers/video/imx-ipu-v3/ipu-prv.h
@@ -140,7 +140,7 @@ struct ipu_di;
 struct ipu_devtype;
 
 struct ipu_soc {
-	struct device_d		*dev;
+	struct device		*dev;
 	const struct ipu_devtype	*devtype;
 	enum ipuv3_type		ipu_type;
 	spinlock_t		lock;
@@ -172,22 +172,23 @@ void ipu_srm_dp_sync_update(struct ipu_soc *ipu);
 int ipu_module_enable(struct ipu_soc *ipu, u32 mask);
 int ipu_module_disable(struct ipu_soc *ipu, u32 mask);
 
-int ipu_di_init(struct ipu_soc *ipu, struct device_d *dev, int id,
+int ipu_di_init(struct ipu_soc *ipu, struct device *dev, int id,
 		void __iomem *base, u32 module, struct clk *ipu_clk);
 void ipu_di_exit(struct ipu_soc *ipu, int id);
 
-int ipu_dmfc_init(struct ipu_soc *ipu, struct device_d *dev, void __iomem *base,
-		struct clk *ipu_clk);
+int ipu_dmfc_init(struct ipu_soc *ipu, struct device *dev, void __iomem *base,
+		  struct clk *ipu_clk);
 void ipu_dmfc_exit(struct ipu_soc *ipu);
 
-int ipu_dp_init(struct ipu_soc *ipu, struct device_d *dev, void __iomem *base);
+int ipu_dp_init(struct ipu_soc *ipu, struct device *dev, void __iomem *base);
 void ipu_dp_exit(struct ipu_soc *ipu);
 
-int ipu_dc_init(struct ipu_soc *ipu, struct device_d *dev, void __iomem *base,
+int ipu_dc_init(struct ipu_soc *ipu, struct device *dev, void __iomem *base,
 		void __iomem *template_base);
 void ipu_dc_exit(struct ipu_soc *ipu);
 
-int ipu_cpmem_init(struct ipu_soc *ipu, struct device_d *dev, void __iomem *base);
+int ipu_cpmem_init(struct ipu_soc *ipu, struct device *dev,
+		   void __iomem *base);
 void ipu_cpmem_exit(struct ipu_soc *ipu);
 
 #endif				/* __IPU_PRV_H__ */
diff --git a/drivers/video/imx-ipu-v3/ipufb.c b/drivers/video/imx-ipu-v3/ipufb.c
index f880622787..27e1edb48c 100644
--- a/drivers/video/imx-ipu-v3/ipufb.c
+++ b/drivers/video/imx-ipu-v3/ipufb.c
@@ -45,7 +45,7 @@ struct ipufb_info {
 	struct fb_videomode	*mode;
 
 	struct fb_info		info;
-	struct device_d		*dev;
+	struct device		*dev;
 
 	/* plane[0] is the full plane, plane[1] is the partial plane */
 	struct ipu_plane	*plane[2];
@@ -269,7 +269,7 @@ err_out:
 	return ret;
 }
 
-static int ipufb_probe(struct device_d *dev)
+static int ipufb_probe(struct device *dev)
 {
 	struct ipufb_info *fbi;
 	struct fb_info *info;
@@ -342,7 +342,7 @@ static int ipufb_probe(struct device_d *dev)
 	return ret;
 }
 
-static void ipufb_remove(struct device_d *dev)
+static void ipufb_remove(struct device *dev)
 {
 }
 
diff --git a/drivers/video/imx-ipu-v3/ipuv3-plane.c b/drivers/video/imx-ipu-v3/ipuv3-plane.c
index a54bdab78b..aed7a46963 100644
--- a/drivers/video/imx-ipu-v3/ipuv3-plane.c
+++ b/drivers/video/imx-ipu-v3/ipuv3-plane.c
@@ -55,7 +55,7 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane,
 		       uint32_t src_w, uint32_t src_h)
 {
 	struct ipu_ch_param __iomem *cpmem;
-	struct device_d *dev = &info->dev;
+	struct device *dev = &info->dev;
 	int ret;
 
 	/* no scaling */
diff --git a/drivers/video/imx.c b/drivers/video/imx.c
index 615836d47e..43198ad5ce 100644
--- a/drivers/video/imx.c
+++ b/drivers/video/imx.c
@@ -150,7 +150,7 @@ struct imxfb_info {
 				unused:30;
 
 	struct fb_info		info;
-	struct device_d		*dev;
+	struct device		*dev;
 
 	void			(*enable)(int enable);
 
@@ -378,7 +378,7 @@ static struct fb_ops imxfb_ops = {
 	.fb_activate_var = imxfb_activate_var,
 };
 
-static int imxfb_allocate_fbbuffer(const struct device_d *dev,
+static int imxfb_allocate_fbbuffer(const struct device *dev,
 				   struct fb_info *info, void *forcefb)
 {
 	size_t fbsize = info->xres * info->yres * (info->bits_per_pixel >> 3);
@@ -525,7 +525,7 @@ static int imxfb_register_overlay(struct imxfb_info *fbi, void *fb)
 }
 #endif
 
-static int imxfb_probe(struct device_d *dev)
+static int imxfb_probe(struct device *dev)
 {
 	struct resource *iores;
 	struct imxfb_info *fbi;
diff --git a/drivers/video/mipi_dbi.c b/drivers/video/mipi_dbi.c
index 48b1110f72..50d2fc4b29 100644
--- a/drivers/video/mipi_dbi.c
+++ b/drivers/video/mipi_dbi.c
@@ -394,7 +394,7 @@ static int mipi_dbi_typec3_command(struct mipi_dbi *dbi, u8 *cmd,
 int mipi_dbi_spi_init(struct spi_device *spi, struct mipi_dbi *dbi,
 		      int dc)
 {
-	struct device_d *dev = &spi->dev;
+	struct device *dev = &spi->dev;
 
 	dbi->spi = spi;
 	dbi->read_commands = mipi_dbi_dcs_read_commands;
diff --git a/drivers/video/mtl017.c b/drivers/video/mtl017.c
index f5b6178967..8d0c5da7f8 100644
--- a/drivers/video/mtl017.c
+++ b/drivers/video/mtl017.c
@@ -16,7 +16,7 @@
 
 struct mtl017 {
 	struct vpl vpl;
-	struct device_d *dev;
+	struct device *dev;
 	struct i2c_client *client;
 	u8 *regs;
 	int enable_gpio;
@@ -218,7 +218,7 @@ forward:
 	return vpl_ioctl(&mtl017->vpl, 1, cmd, ptr);
 }
 
-static int mtl017_probe(struct device_d *dev)
+static int mtl017_probe(struct device *dev)
 {
 	struct mtl017 *mtl017;
 	int ret;
diff --git a/drivers/video/omap.c b/drivers/video/omap.c
index 189b95d241..c959285a62 100644
--- a/drivers/video/omap.c
+++ b/drivers/video/omap.c
@@ -27,7 +27,7 @@
 
 struct omapfb_device {
 	struct fb_info info;
-	struct device_d *dev;
+	struct device *dev;
 
 	struct omapfb_display const *cur_display;
 
@@ -410,7 +410,7 @@ static struct fb_ops omapfb_ops = {
 	.fb_activate_var	= omapfb_activate_var,
 };
 
-static int omapfb_probe(struct device_d *dev)
+static int omapfb_probe(struct device *dev)
 {
 	struct omapfb_platform_data const *pdata = dev->platform_data;
 	struct omapfb_device *fbi;
diff --git a/drivers/video/panel-ilitek-ili9341.c b/drivers/video/panel-ilitek-ili9341.c
index dde9a61d59..b3cb6389be 100644
--- a/drivers/video/panel-ilitek-ili9341.c
+++ b/drivers/video/panel-ilitek-ili9341.c
@@ -159,7 +159,7 @@ struct ili9341_config {
 };
 
 struct ili9341 {
-	struct device_d *dev;
+	struct device *dev;
 	struct vpl vpl;
 	const struct ili9341_config *conf;
 	int reset_gpio;
@@ -280,7 +280,7 @@ static inline struct ili9341 *vpl_to_ili9341(struct vpl *vpl)
 
 static void ili9341_dpi_init(struct ili9341 *ili)
 {
-	struct device_d *dev = ili->dev;
+	struct device *dev = ili->dev;
 	struct mipi_dbi *dbi = ili->dbi;
 	struct ili9341_config *cfg = (struct ili9341_config *)ili->conf;
 
@@ -344,7 +344,7 @@ static void ili9341_dpi_init(struct ili9341 *ili)
 
 static int ili9341_dpi_power_on(struct ili9341 *ili)
 {
-	struct device_d *dev = ili->dev;
+	struct device *dev = ili->dev;
 	int ret = 0;
 
 	/* Assert RESET */
@@ -460,7 +460,7 @@ static int ili9341_ioctl(struct vpl *vpl, unsigned int port,
 
 static int ili9341_dpi_probe(struct spi_device *spi, int dc, int reset)
 {
-	struct device_d *dev = &spi->dev;
+	struct device *dev = &spi->dev;
 	struct ili9341 *ili;
 	int ret;
 
@@ -505,7 +505,7 @@ static int ili9341_dpi_probe(struct spi_device *spi, int dc, int reset)
 	return vpl_register(&ili->vpl);
 }
 
-static int ili9341_probe(struct device_d *dev)
+static int ili9341_probe(struct device *dev)
 {
 	struct spi_device *spi = to_spi_device(dev);
 	int dc, reset;
diff --git a/drivers/video/pxa.c b/drivers/video/pxa.c
index 7e2905f279..784a3d2c85 100644
--- a/drivers/video/pxa.c
+++ b/drivers/video/pxa.c
@@ -74,7 +74,7 @@ struct pxafb_info {
 
 	struct pxafb_videomode	*mode;
 	struct fb_info		info;
-	struct device_d		*dev;
+	struct device		*dev;
 
 	void			(*lcd_power)(int);
 	void			(*backlight_power)(int);
@@ -476,7 +476,7 @@ static struct fb_ops pxafb_ops = {
 	.fb_disable	= pxafb_disable_controller,
 };
 
-static int pxafb_probe(struct device_d *dev)
+static int pxafb_probe(struct device *dev)
 {
 	struct resource *iores;
 	struct pxafb_platform_data *pdata = dev->platform_data;
diff --git a/drivers/video/rave-sp-backlight.c b/drivers/video/rave-sp-backlight.c
index ca6c5aa3e3..7a074b3a83 100644
--- a/drivers/video/rave-sp-backlight.c
+++ b/drivers/video/rave-sp-backlight.c
@@ -27,7 +27,7 @@ static int rave_sp_backlight_set(struct backlight_device *bd, int brightness)
 	return rave_sp_exec(sp, cmd, sizeof(cmd), NULL, 0);
 }
 
-static int rave_sp_backlight_probe(struct device_d *dev)
+static int rave_sp_backlight_probe(struct device *dev)
 {
 	struct backlight_device *bd;
 	int ret;
diff --git a/drivers/video/s3c24xx.c b/drivers/video/s3c24xx.c
index 6de2d7be98..151b0f769a 100644
--- a/drivers/video/s3c24xx.c
+++ b/drivers/video/s3c24xx.c
@@ -96,7 +96,7 @@ struct s3cfb_info {
 	void __iomem *base;
 	unsigned memory_size;
 	struct fb_info info;
-	struct device_d *hw_dev;
+	struct device *hw_dev;
 	int passive_display;
 	void (*enable)(int enable);
 };
@@ -310,7 +310,7 @@ static int s3cfb_activate_var(struct fb_info *fb_info)
  * Print some information about the current hardware state
  * @param hw_dev S3C video device
  */
-static void s3cfb_info(struct device_d *hw_dev)
+static void s3cfb_info(struct device *hw_dev)
 {
 	uint32_t con1, addr1, addr2, addr3;
 	struct s3cfb_info *fbi = hw_dev->priv;
@@ -345,7 +345,7 @@ static struct s3cfb_info fbi = {
 	},
 };
 
-static int s3cfb_probe(struct device_d *hw_dev)
+static int s3cfb_probe(struct device *hw_dev)
 {
 	struct resource *iores;
 	struct s3c_fb_platform_data *pdata = hw_dev->platform_data;
diff --git a/drivers/video/sdl.c b/drivers/video/sdl.c
index 28a41916eb..c4d09e59dd 100644
--- a/drivers/video/sdl.c
+++ b/drivers/video/sdl.c
@@ -38,7 +38,7 @@ static struct fb_ops sdlfb_ops = {
 	.fb_disable	= sdlfb_disable,
 };
 
-static int sdlfb_probe(struct device_d *dev)
+static int sdlfb_probe(struct device *dev)
 {
 	struct fb_info *fb;
 	int ret = -EIO;
@@ -81,7 +81,7 @@ static int sdlfb_probe(struct device_d *dev)
 	return ret;
 }
 
-static void sdlfb_remove(struct device_d *dev)
+static void sdlfb_remove(struct device *dev)
 {
 	struct fb_info *fb = dev->priv;
 
diff --git a/drivers/video/simple-panel.c b/drivers/video/simple-panel.c
index ffbfa067d2..27b42dcd25 100644
--- a/drivers/video/simple-panel.c
+++ b/drivers/video/simple-panel.c
@@ -17,7 +17,7 @@
 #include <i2c/i2c.h>
 
 struct simple_panel {
-	struct device_d *dev;
+	struct device *dev;
 	struct vpl vpl;
 	int enable_gpio;
 	int enable_active_high;
@@ -129,7 +129,7 @@ static int simple_panel_ioctl(struct vpl *vpl, unsigned int port,
 	}
 }
 
-static int simple_panel_probe(struct device_d *dev)
+static int simple_panel_probe(struct device *dev)
 {
 	struct simple_panel *panel;
 	struct device_node *node = dev->of_node;
diff --git a/drivers/video/simplefb-client.c b/drivers/video/simplefb-client.c
index e89bf22681..6bb160a97f 100644
--- a/drivers/video/simplefb-client.c
+++ b/drivers/video/simplefb-client.c
@@ -35,8 +35,8 @@ struct simplefb {
 	struct fb_videomode mode;
 };
 
-static int simplefb_parse_dt(struct device_d *dev,
-			   struct simplefb_params *params)
+static int simplefb_parse_dt(struct device *dev,
+			     struct simplefb_params *params)
 {
 	struct device_node *np = dev->of_node;
 	int ret;
@@ -81,7 +81,7 @@ static int simplefb_parse_dt(struct device_d *dev,
 	return 0;
 }
 
-static int simplefb_probe(struct device_d *dev)
+static int simplefb_probe(struct device *dev)
 {
 	int ret;
 	struct simplefb_params params;
diff --git a/drivers/video/ssd1307fb.c b/drivers/video/ssd1307fb.c
index 4e98b4277b..d2dd67c634 100644
--- a/drivers/video/ssd1307fb.c
+++ b/drivers/video/ssd1307fb.c
@@ -424,7 +424,7 @@ static const struct of_device_id ssd1307fb_of_match[] = {
 	{},
 };
 
-static int ssd1307fb_probe(struct device_d *dev)
+static int ssd1307fb_probe(struct device *dev)
 {
 	struct fb_info *info;
 	struct device_node *node = dev->of_node;
diff --git a/drivers/video/stm.c b/drivers/video/stm.c
index 154145bd1d..3ece96c09d 100644
--- a/drivers/video/stm.c
+++ b/drivers/video/stm.c
@@ -139,7 +139,7 @@ struct imxfb_info {
 	void __iomem *base;
 	unsigned memory_size;
 	struct fb_info info;
-	struct device_d *hw_dev;
+	struct device *hw_dev;
 	struct clk *clk;
 	void *fixed_screen;
 	unsigned fixed_screen_size;
@@ -494,7 +494,7 @@ static struct imxfb_info fbi = {
 	},
 };
 
-static int stmfb_probe(struct device_d *hw_dev)
+static int stmfb_probe(struct device *hw_dev)
 {
 	struct resource *iores;
 	struct imx_fb_platformdata *pdata = hw_dev->platform_data;
diff --git a/drivers/video/stm32_ltdc.c b/drivers/video/stm32_ltdc.c
index 5bbf9c1093..e5064503ba 100644
--- a/drivers/video/stm32_ltdc.c
+++ b/drivers/video/stm32_ltdc.c
@@ -21,7 +21,7 @@
 
 struct ltdc_hw {
 	void __iomem *regs;
-	struct device_d *dev;
+	struct device *dev;
 	struct clk *pclk;
 	bool claimed;
 };
@@ -252,7 +252,7 @@ static struct fb_ops ltdc_ops = {
 	.fb_disable		= ltdc_disable,
 };
 
-static int ltdc_probe(struct device_d *dev)
+static int ltdc_probe(struct device *dev)
 {
 	struct device_node *np;
 	struct resource *iores;
diff --git a/drivers/video/tc358767.c b/drivers/video/tc358767.c
index ad0d753235..8e473f607f 100644
--- a/drivers/video/tc358767.c
+++ b/drivers/video/tc358767.c
@@ -204,7 +204,7 @@ struct tc_edp_link {
 
 struct tc_data {
 	struct i2c_client	*client;
-	struct device_d		*dev;
+	struct device		*dev;
 	/* DP AUX channel */
 	struct i2c_adapter	adapter;
 	struct vpl		vpl;
@@ -880,7 +880,7 @@ err:
 
 static int tc_main_link_setup(struct tc_data *tc)
 {
-	struct device_d *dev = tc->dev;
+	struct device *dev = tc->dev;
 	unsigned int rate;
 	u32 dp_phy_ctrl;
 	int timeout;
@@ -1334,7 +1334,7 @@ static int tc_ioctl(struct vpl *vpl, unsigned int port,
 	return ret;
 }
 
-static int tc_probe(struct device_d *dev)
+static int tc_probe(struct device *dev)
 {
 	struct i2c_client *client = to_i2c_client(dev);
 	struct tc_data *tc;