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>

11 files changed, 160 insertions, 160 deletions

diff --git a/arch/arm/mach-imx/include/mach/devices-imx1.h b/arch/arm/mach-imx/include/mach/devices-imx1.h
index 2b5cb8bcbd..795149c92f 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx1.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx1.h
@@ -3,12 +3,12 @@
 #include <mach/devices.h>
 #include <mach/imx1-regs.h>
 
-static inline struct device_d *imx1_add_uart0(void)
+static inline struct device *imx1_add_uart0(void)
 {
 	return imx_add_uart_imx1((void *)MX1_UART1_BASE_ADDR, 0);
 }
 
-static inline struct device_d *imx1_add_uart1(void)
+static inline struct device *imx1_add_uart1(void)
 {
 	return imx_add_uart_imx1((void *)MX1_UART2_BASE_ADDR, 1);
 }
diff --git a/arch/arm/mach-imx/include/mach/devices-imx21.h b/arch/arm/mach-imx/include/mach/devices-imx21.h
index 429b01165e..c4951f7fd9 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx21.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx21.h
@@ -3,32 +3,32 @@
 #include <mach/devices.h>
 #include <mach/imx21-regs.h>
 
-static inline struct device_d *imx21_add_uart0(void)
+static inline struct device *imx21_add_uart0(void)
 {
 	return imx_add_uart_imx21((void *)MX21_UART1_BASE_ADDR, 0);
 }
 
-static inline struct device_d *imx21_add_uart1(void)
+static inline struct device *imx21_add_uart1(void)
 {
 	return imx_add_uart_imx21((void *)MX21_UART2_BASE_ADDR, 1);
 }
 
-static inline struct device_d *imx21_add_uart2(void)
+static inline struct device *imx21_add_uart2(void)
 {
 	return imx_add_uart_imx21((void *)MX21_UART2_BASE_ADDR, 2);
 }
 
-static inline struct device_d *imx21_add_uart3(void)
+static inline struct device *imx21_add_uart3(void)
 {
 	return imx_add_uart_imx21((void *)MX21_UART2_BASE_ADDR, 3);
 }
 
-static inline struct device_d *imx21_add_nand(struct imx_nand_platform_data *pdata)
+static inline struct device *imx21_add_nand(struct imx_nand_platform_data *pdata)
 {
 	return imx_add_nand((void *)0xDF003000, pdata);
 }
 
-static inline struct device_d *imx21_add_fb(struct imx_fb_platform_data *pdata)
+static inline struct device *imx21_add_fb(struct imx_fb_platform_data *pdata)
 {
 	return imx_add_fb((void *)0x10021000, pdata);
 }
diff --git a/arch/arm/mach-imx/include/mach/devices-imx25.h b/arch/arm/mach-imx/include/mach/devices-imx25.h
index ec358fbbfa..6c768218c4 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx25.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx25.h
@@ -3,82 +3,82 @@
 #include <mach/devices.h>
 #include <mach/imx25-regs.h>
 
-static inline struct device_d *imx25_add_i2c0(struct i2c_platform_data *pdata)
+static inline struct device *imx25_add_i2c0(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX25_I2C1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx25_add_i2c1(struct i2c_platform_data *pdata)
+static inline struct device *imx25_add_i2c1(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX25_I2C2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx25_add_i2c2(struct i2c_platform_data *pdata)
+static inline struct device *imx25_add_i2c2(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX25_I2C3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx25_add_spi0(struct spi_imx_master *pdata)
+static inline struct device *imx25_add_spi0(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx35((void *)MX25_CSPI1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx25_add_spi1(struct spi_imx_master *pdata)
+static inline struct device *imx25_add_spi1(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx35((void *)MX25_CSPI2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx25_add_spi2(struct spi_imx_master *pdata)
+static inline struct device *imx25_add_spi2(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx35((void *)MX25_CSPI3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx25_add_uart0(void)
+static inline struct device *imx25_add_uart0(void)
 {
 	return imx_add_uart_imx21((void *)MX25_UART1_BASE_ADDR, 0);
 }
 
-static inline struct device_d *imx25_add_uart1(void)
+static inline struct device *imx25_add_uart1(void)
 {
 	return imx_add_uart_imx21((void *)MX25_UART2_BASE_ADDR, 1);
 }
 
-static inline struct device_d *imx25_add_uart2(void)
+static inline struct device *imx25_add_uart2(void)
 {
 	return imx_add_uart_imx21((void *)MX25_UART3_BASE_ADDR, 2);
 }
 
-static inline struct device_d *imx25_add_uart3(void)
+static inline struct device *imx25_add_uart3(void)
 {
 	return imx_add_uart_imx21((void *)MX25_UART4_BASE_ADDR, 3);
 }
 
-static inline struct device_d *imx25_add_uart4(void)
+static inline struct device *imx25_add_uart4(void)
 {
 	return imx_add_uart_imx21((void *)MX25_UART5_BASE_ADDR, 4);
 }
 
-static inline struct device_d *imx25_add_nand(struct imx_nand_platform_data *pdata)
+static inline struct device *imx25_add_nand(struct imx_nand_platform_data *pdata)
 {
 	return imx_add_nand((void *)MX25_NFC_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx25_add_fb(struct imx_fb_platform_data *pdata)
+static inline struct device *imx25_add_fb(struct imx_fb_platform_data *pdata)
 {
 	return imx_add_fb((void *)MX25_LCDC_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx25_add_fec(struct fec_platform_data *pdata)
+static inline struct device *imx25_add_fec(struct fec_platform_data *pdata)
 {
 	return imx_add_fec_imx27((void *)MX25_FEC_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx25_add_mmc0(struct esdhc_platform_data *pdata)
+static inline struct device *imx25_add_mmc0(struct esdhc_platform_data *pdata)
 {
 	return imx_add_esdhc_imx25((void *)MX25_ESDHC1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx25_add_mmc1(struct esdhc_platform_data *pdata)
+static inline struct device *imx25_add_mmc1(struct esdhc_platform_data *pdata)
 {
 	return imx_add_esdhc_imx25((void *)MX25_ESDHC2_BASE_ADDR, 1, pdata);
 }
diff --git a/arch/arm/mach-imx/include/mach/devices-imx27.h b/arch/arm/mach-imx/include/mach/devices-imx27.h
index 8ea7ea7eb3..0e1c90e697 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx27.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx27.h
@@ -3,87 +3,87 @@
 #include <mach/devices.h>
 #include <mach/imx27-regs.h>
 
-static inline struct device_d *imx27_add_spi0(struct spi_imx_master *pdata)
+static inline struct device *imx27_add_spi0(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx27((void *)MX27_CSPI1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx27_add_spi1(struct spi_imx_master *pdata)
+static inline struct device *imx27_add_spi1(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx27((void *)MX27_CSPI2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx27_add_i2c0(struct i2c_platform_data *pdata)
+static inline struct device *imx27_add_i2c0(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX27_I2C1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx27_add_i2c1(struct i2c_platform_data *pdata)
+static inline struct device *imx27_add_i2c1(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX27_I2C2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx27_add_uart0(void)
+static inline struct device *imx27_add_uart0(void)
 {
 	return imx_add_uart_imx21((void *)MX27_UART1_BASE_ADDR, 0);
 }
 
-static inline struct device_d *imx27_add_uart1(void)
+static inline struct device *imx27_add_uart1(void)
 {
 	return imx_add_uart_imx21((void *)MX27_UART2_BASE_ADDR, 1);
 }
 
-static inline struct device_d *imx27_add_uart2(void)
+static inline struct device *imx27_add_uart2(void)
 {
 	return imx_add_uart_imx21((void *)MX27_UART3_BASE_ADDR, 2);
 }
 
-static inline struct device_d *imx27_add_uart3(void)
+static inline struct device *imx27_add_uart3(void)
 {
 	return imx_add_uart_imx21((void *)MX27_UART4_BASE_ADDR, 3);
 }
 
-static inline struct device_d *imx27_add_nand(struct imx_nand_platform_data *pdata)
+static inline struct device *imx27_add_nand(struct imx_nand_platform_data *pdata)
 {
 	return imx_add_nand((void *)MX27_NFC_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx27_add_fb(struct imx_fb_platform_data *pdata)
+static inline struct device *imx27_add_fb(struct imx_fb_platform_data *pdata)
 {
 	return imx_add_fb((void *)MX27_LCDC_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx27_add_fec(struct fec_platform_data *pdata)
+static inline struct device *imx27_add_fec(struct fec_platform_data *pdata)
 {
 	return imx_add_fec_imx27((void *)MX27_FEC_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx27_add_mmc0(void *pdata)
+static inline struct device *imx27_add_mmc0(void *pdata)
 {
 	return imx_add_mmc((void *)MX27_SDHC1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx27_add_mmc1(void *pdata)
+static inline struct device *imx27_add_mmc1(void *pdata)
 {
 	return imx_add_mmc((void *)MX27_SDHC2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx27_add_mmc2(void *pdata)
+static inline struct device *imx27_add_mmc2(void *pdata)
 {
 	return imx_add_mmc((void *)MX27_SDHC3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx27_add_usbotg(void *pdata)
+static inline struct device *imx27_add_usbotg(void *pdata)
 {
 	return imx_add_usb((void *)MX27_USB_OTG_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx27_add_usbh1(void *pdata)
+static inline struct device *imx27_add_usbh1(void *pdata)
 {
 	return imx_add_usb((void *)MX27_USB_OTG_BASE_ADDR + 0x200, 1, pdata);
 }
 
-static inline struct device_d *imx27_add_usbh2(void *pdata)
+static inline struct device *imx27_add_usbh2(void *pdata)
 {
 	return imx_add_usb((void *)MX27_USB_OTG_BASE_ADDR + 0x400, 2, pdata);
 }
diff --git a/arch/arm/mach-imx/include/mach/devices-imx31.h b/arch/arm/mach-imx/include/mach/devices-imx31.h
index 37eacb0436..b926a6ac33 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx31.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx31.h
@@ -3,92 +3,92 @@
 #include <mach/imx31-regs.h>
 #include <mach/devices.h>
 
-static inline struct device_d *imx31_add_i2c0(void *pdata)
+static inline struct device *imx31_add_i2c0(void *pdata)
 {
 	return imx_add_i2c((void *)MX31_I2C1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx31_add_i2c1(void *pdata)
+static inline struct device *imx31_add_i2c1(void *pdata)
 {
 	return imx_add_i2c((void *)MX31_I2C2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx31_add_i2c2(void *pdata)
+static inline struct device *imx31_add_i2c2(void *pdata)
 {
 	return imx_add_i2c((void *)MX31_I2C3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx31_add_spi0(struct spi_imx_master *pdata)
+static inline struct device *imx31_add_spi0(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx35((void *)MX31_CSPI1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx31_add_spi1(struct spi_imx_master *pdata)
+static inline struct device *imx31_add_spi1(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx35((void *)MX31_CSPI2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx31_add_spi2(struct spi_imx_master *pdata)
+static inline struct device *imx31_add_spi2(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx35((void *)MX31_CSPI3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx31_add_uart0(void)
+static inline struct device *imx31_add_uart0(void)
 {
 	return imx_add_uart_imx21((void *)MX31_UART1_BASE_ADDR, 0);
 }
 
-static inline struct device_d *imx31_add_uart1(void)
+static inline struct device *imx31_add_uart1(void)
 {
 	return imx_add_uart_imx21((void *)MX31_UART2_BASE_ADDR, 1);
 }
 
-static inline struct device_d *imx31_add_uart2(void)
+static inline struct device *imx31_add_uart2(void)
 {
 	return imx_add_uart_imx21((void *)MX31_UART3_BASE_ADDR, 2);
 }
 
-static inline struct device_d *imx31_add_uart3(void)
+static inline struct device *imx31_add_uart3(void)
 {
 	return imx_add_uart_imx21((void *)MX31_UART4_BASE_ADDR, 3);
 }
 
-static inline struct device_d *imx31_add_uart4(void)
+static inline struct device *imx31_add_uart4(void)
 {
 	return imx_add_uart_imx21((void *)MX31_UART5_BASE_ADDR, 4);
 }
 
-static inline struct device_d *imx31_add_nand(struct imx_nand_platform_data *pdata)
+static inline struct device *imx31_add_nand(struct imx_nand_platform_data *pdata)
 {
 	return imx_add_nand((void *)MX31_NFC_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx31_add_fb(struct imx_ipu_fb_platform_data *pdata)
+static inline struct device *imx31_add_fb(struct imx_ipu_fb_platform_data *pdata)
 {
 	return imx_add_ipufb((void *)MX31_IPU_CTRL_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx31_add_mmc0(void *pdata)
+static inline struct device *imx31_add_mmc0(void *pdata)
 {
 	return imx_add_mmc((void *)MX31_SDHC1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx31_add_mmc1(void *pdata)
+static inline struct device *imx31_add_mmc1(void *pdata)
 {
 	return imx_add_mmc((void *)MX31_SDHC2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx31_add_usbotg(void *pdata)
+static inline struct device *imx31_add_usbotg(void *pdata)
 {
 	return imx_add_usb((void *)MX31_USB_OTG_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx31_add_usbh1(void *pdata)
+static inline struct device *imx31_add_usbh1(void *pdata)
 {
 	return imx_add_usb((void *)MX31_USB_OTG_BASE_ADDR + 0x200, 1, pdata);
 }
 
-static inline struct device_d *imx31_add_usbh2(void *pdata)
+static inline struct device *imx31_add_usbh2(void *pdata)
 {
 	return imx_add_usb((void *)MX31_USB_OTG_BASE_ADDR + 0x400, 2, pdata);
 }
diff --git a/arch/arm/mach-imx/include/mach/devices-imx35.h b/arch/arm/mach-imx/include/mach/devices-imx35.h
index 04aa7775dd..a48641bdbb 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx35.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx35.h
@@ -3,72 +3,72 @@
 #include <mach/devices.h>
 #include <mach/imx35-regs.h>
 
-static inline struct device_d *imx35_add_i2c0(struct i2c_platform_data *pdata)
+static inline struct device *imx35_add_i2c0(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX35_I2C1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx35_add_i2c1(struct i2c_platform_data *pdata)
+static inline struct device *imx35_add_i2c1(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX35_I2C2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx35_add_i2c2(struct i2c_platform_data *pdata)
+static inline struct device *imx35_add_i2c2(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX35_I2C3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx35_add_spi0(struct spi_imx_master *pdata)
+static inline struct device *imx35_add_spi0(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx35((void *)MX35_CSPI1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx35_add_spi(struct spi_imx_master *pdata)
+static inline struct device *imx35_add_spi(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx35((void *)MX35_CSPI2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx35_add_uart0(void)
+static inline struct device *imx35_add_uart0(void)
 {
 	return imx_add_uart_imx21((void *)MX35_UART1_BASE_ADDR, 0);
 }
 
-static inline struct device_d *imx35_add_uart1(void)
+static inline struct device *imx35_add_uart1(void)
 {
 	return imx_add_uart_imx21((void *)MX35_UART2_BASE_ADDR, 1);
 }
 
-static inline struct device_d *imx35_add_uart2(void)
+static inline struct device *imx35_add_uart2(void)
 {
 	return imx_add_uart_imx21((void *)MX35_UART3_BASE_ADDR, 2);
 }
 
-static inline struct device_d *imx35_add_nand(struct imx_nand_platform_data *pdata)
+static inline struct device *imx35_add_nand(struct imx_nand_platform_data *pdata)
 {
 	return imx_add_nand((void *)MX35_NFC_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx35_add_fb(struct imx_ipu_fb_platform_data *pdata)
+static inline struct device *imx35_add_fb(struct imx_ipu_fb_platform_data *pdata)
 {
 	return imx_add_ipufb((void *)MX35_IPU_CTRL_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx35_add_fec(struct fec_platform_data *pdata)
+static inline struct device *imx35_add_fec(struct fec_platform_data *pdata)
 {
 	return imx_add_fec_imx27((void *)MX35_FEC_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx35_add_mmc0(struct esdhc_platform_data *pdata)
+static inline struct device *imx35_add_mmc0(struct esdhc_platform_data *pdata)
 {
 	return imx_add_esdhc_imx25((void *)MX35_ESDHC1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx35_add_mmc1(struct esdhc_platform_data *pdata)
+static inline struct device *imx35_add_mmc1(struct esdhc_platform_data *pdata)
 {
 	return imx_add_esdhc_imx25((void *)MX35_ESDHC2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx35_add_mmc2(struct esdhc_platform_data *pdata)
+static inline struct device *imx35_add_mmc2(struct esdhc_platform_data *pdata)
 {
 	return imx_add_esdhc_imx25((void *)MX35_ESDHC3_BASE_ADDR, 2, pdata);
 }
diff --git a/arch/arm/mach-imx/include/mach/devices-imx50.h b/arch/arm/mach-imx/include/mach/devices-imx50.h
index 5f534d4aec..ebfc9c07c1 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx50.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx50.h
@@ -3,82 +3,82 @@
 #include <mach/devices.h>
 #include <mach/imx50-regs.h>
 
-static inline struct device_d *imx50_add_spi0(struct spi_imx_master *pdata)
+static inline struct device *imx50_add_spi0(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx51((void *)MX50_ECSPI1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx50_add_spi1(struct spi_imx_master *pdata)
+static inline struct device *imx50_add_spi1(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx51((void *)MX50_ECSPI2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx50_add_cspi(struct spi_imx_master *pdata)
+static inline struct device *imx50_add_cspi(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx35((void *)MX50_CSPI_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx50_add_i2c0(struct i2c_platform_data *pdata)
+static inline struct device *imx50_add_i2c0(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX50_I2C1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx50_add_i2c1(struct i2c_platform_data *pdata)
+static inline struct device *imx50_add_i2c1(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX50_I2C2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx50_add_i2c2(struct i2c_platform_data *pdata)
+static inline struct device *imx50_add_i2c2(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX50_I2C3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx50_add_uart0(void)
+static inline struct device *imx50_add_uart0(void)
 {
 	return imx_add_uart_imx21((void *)MX50_UART1_BASE_ADDR, 0);
 }
 
-static inline struct device_d *imx50_add_uart1(void)
+static inline struct device *imx50_add_uart1(void)
 {
 	return imx_add_uart_imx21((void *)MX50_UART2_BASE_ADDR, 1);
 }
 
-static inline struct device_d *imx50_add_uart2(void)
+static inline struct device *imx50_add_uart2(void)
 {
 	return imx_add_uart_imx21((void *)MX50_UART3_BASE_ADDR, 2);
 }
 
-static inline struct device_d *imx50_add_uart3(void)
+static inline struct device *imx50_add_uart3(void)
 {
 	return imx_add_uart_imx21((void *)MX50_UART4_BASE_ADDR, 3);
 }
 
-static inline struct device_d *imx50_add_fec(struct fec_platform_data *pdata)
+static inline struct device *imx50_add_fec(struct fec_platform_data *pdata)
 {
 	return imx_add_fec_imx27((void *)MX50_FEC_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx50_add_mmc0(struct esdhc_platform_data *pdata)
+static inline struct device *imx50_add_mmc0(struct esdhc_platform_data *pdata)
 {
 	return imx5_add_esdhc((void *)MX50_ESDHC1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx50_add_mmc1(struct esdhc_platform_data *pdata)
+static inline struct device *imx50_add_mmc1(struct esdhc_platform_data *pdata)
 {
 	return imx5_add_esdhc((void *)MX50_ESDHC2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx50_add_mmc2(struct esdhc_platform_data *pdata)
+static inline struct device *imx50_add_mmc2(struct esdhc_platform_data *pdata)
 {
 	return imx5_add_esdhc((void *)MX50_ESDHC3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx50_add_mmc3(struct esdhc_platform_data *pdata)
+static inline struct device *imx50_add_mmc3(struct esdhc_platform_data *pdata)
 {
 	return imx5_add_esdhc((void *)MX50_ESDHC4_BASE_ADDR, 3, pdata);
 }
 
-static inline struct device_d *imx50_add_kpp(struct matrix_keymap_data *pdata)
+static inline struct device *imx50_add_kpp(struct matrix_keymap_data *pdata)
 {
 	return imx_add_kpp((void *)MX50_KPP_BASE_ADDR, pdata);
 }
diff --git a/arch/arm/mach-imx/include/mach/devices-imx51.h b/arch/arm/mach-imx/include/mach/devices-imx51.h
index 1a23632491..453ae9a0aa 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx51.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx51.h
@@ -4,67 +4,67 @@
 #include <mach/devices.h>
 #include <mach/imx51-regs.h>
 
-static inline struct device_d *imx51_add_spi0(struct spi_imx_master *pdata)
+static inline struct device *imx51_add_spi0(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx51((void *)MX51_ECSPI1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx51_add_spi1(struct spi_imx_master *pdata)
+static inline struct device *imx51_add_spi1(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx51((void *)MX51_ECSPI2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx51_add_cspi(struct spi_imx_master *pdata)
+static inline struct device *imx51_add_cspi(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx35((void *)MX51_CSPI_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx51_add_i2c0(struct i2c_platform_data *pdata)
+static inline struct device *imx51_add_i2c0(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX51_I2C1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx51_add_i2c1(struct i2c_platform_data *pdata)
+static inline struct device *imx51_add_i2c1(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX51_I2C2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx51_add_uart0(void)
+static inline struct device *imx51_add_uart0(void)
 {
 	return imx_add_uart_imx21((void *)MX51_UART1_BASE_ADDR, 0);
 }
 
-static inline struct device_d *imx51_add_uart1(void)
+static inline struct device *imx51_add_uart1(void)
 {
 	return imx_add_uart_imx21((void *)MX51_UART2_BASE_ADDR, 1);
 }
 
-static inline struct device_d *imx51_add_uart2(void)
+static inline struct device *imx51_add_uart2(void)
 {
 	return imx_add_uart_imx21((void *)MX51_UART3_BASE_ADDR, 2);
 }
 
-static inline struct device_d *imx51_add_fec(struct fec_platform_data *pdata)
+static inline struct device *imx51_add_fec(struct fec_platform_data *pdata)
 {
 	return imx_add_fec_imx27((void *)MX51_MXC_FEC_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx51_add_mmc0(struct esdhc_platform_data *pdata)
+static inline struct device *imx51_add_mmc0(struct esdhc_platform_data *pdata)
 {
 	return imx_add_esdhc_imx5((void *)MX51_MMC_SDHC1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx51_add_mmc1(struct esdhc_platform_data *pdata)
+static inline struct device *imx51_add_mmc1(struct esdhc_platform_data *pdata)
 {
 	return imx_add_esdhc_imx5((void *)MX51_MMC_SDHC2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx51_add_mmc2(struct esdhc_platform_data *pdata)
+static inline struct device *imx51_add_mmc2(struct esdhc_platform_data *pdata)
 {
 	return imx_add_esdhc_imx5((void *)MX51_MMC_SDHC3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx51_add_nand(struct imx_nand_platform_data *pdata)
+static inline struct device *imx51_add_nand(struct imx_nand_platform_data *pdata)
 {
 	struct resource res[] = {
 		{
@@ -77,7 +77,7 @@ static inline struct device_d *imx51_add_nand(struct imx_nand_platform_data *pda
 			.flags = IORESOURCE_MEM,
 		},
 	};
-	struct device_d *dev = xzalloc(sizeof(*dev));
+	struct device *dev = xzalloc(sizeof(*dev));
 
 	dev->resource = xzalloc(sizeof(struct resource) * ARRAY_SIZE(res));
 	memcpy(dev->resource, res, sizeof(struct resource) * ARRAY_SIZE(res));
@@ -91,27 +91,27 @@ static inline struct device_d *imx51_add_nand(struct imx_nand_platform_data *pda
 	return dev;
 }
 
-static inline struct device_d *imx51_add_kpp(struct matrix_keymap_data *pdata)
+static inline struct device *imx51_add_kpp(struct matrix_keymap_data *pdata)
 {
 	return imx_add_kpp((void *)MX51_KPP_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx51_add_pata(void)
+static inline struct device *imx51_add_pata(void)
 {
 	return imx_add_pata((void *)MX51_ATA_BASE_ADDR);
 }
 
-static inline struct device_d *imx51_add_usbotg(void *pdata)
+static inline struct device *imx51_add_usbotg(void *pdata)
 {
 	return imx_add_usb((void *)MX51_OTG_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx51_add_usbh1(void *pdata)
+static inline struct device *imx51_add_usbh1(void *pdata)
 {
 	return imx_add_usb((void *)MX51_OTG_BASE_ADDR + 0x200, 1, pdata);
 }
 
-static inline struct device_d *imx51_add_usbh2(void *pdata)
+static inline struct device *imx51_add_usbh2(void *pdata)
 {
 	return imx_add_usb((void *)MX51_OTG_BASE_ADDR + 0x400, 2, pdata);
 }
diff --git a/arch/arm/mach-imx/include/mach/devices-imx53.h b/arch/arm/mach-imx/include/mach/devices-imx53.h
index 7b96fb3e27..392687a191 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx53.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx53.h
@@ -3,87 +3,87 @@
 #include <mach/devices.h>
 #include <mach/imx53-regs.h>
 
-static inline struct device_d *imx53_add_cspi(struct spi_imx_master *pdata)
+static inline struct device *imx53_add_cspi(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx35((void *)MX53_CSPI_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx53_add_spi0(struct spi_imx_master *pdata)
+static inline struct device *imx53_add_spi0(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx51((void *)MX53_ECSPI1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx53_add_spi1(struct spi_imx_master *pdata)
+static inline struct device *imx53_add_spi1(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx51((void *)MX53_ECSPI2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx53_add_i2c0(struct i2c_platform_data *pdata)
+static inline struct device *imx53_add_i2c0(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX53_I2C1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx53_add_i2c1(struct i2c_platform_data *pdata)
+static inline struct device *imx53_add_i2c1(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX53_I2C2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx53_add_i2c2(struct i2c_platform_data *pdata)
+static inline struct device *imx53_add_i2c2(struct i2c_platform_data *pdata)
 {
        return imx_add_i2c((void *)MX53_I2C3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx53_add_uart0(void)
+static inline struct device *imx53_add_uart0(void)
 {
 	return imx_add_uart_imx21((void *)MX53_UART1_BASE_ADDR, 0);
 }
 
-static inline struct device_d *imx53_add_uart1(void)
+static inline struct device *imx53_add_uart1(void)
 {
 	return imx_add_uart_imx21((void *)MX53_UART2_BASE_ADDR, 1);
 }
 
-static inline struct device_d *imx53_add_uart2(void)
+static inline struct device *imx53_add_uart2(void)
 {
 	return imx_add_uart_imx21((void *)MX53_UART3_BASE_ADDR, 2);
 }
 
-static inline struct device_d *imx53_add_uart3(void)
+static inline struct device *imx53_add_uart3(void)
 {
 	return imx_add_uart_imx21((void *)MX53_UART4_BASE_ADDR, 3);
 }
 
-static inline struct device_d *imx53_add_fec(struct fec_platform_data *pdata)
+static inline struct device *imx53_add_fec(struct fec_platform_data *pdata)
 {
 	return imx_add_fec_imx27((void *)MX53_FEC_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx53_add_mmc0(struct esdhc_platform_data *pdata)
+static inline struct device *imx53_add_mmc0(struct esdhc_platform_data *pdata)
 {
 	return imx_add_esdhc_imx5((void *)MX53_ESDHC1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx53_add_mmc1(struct esdhc_platform_data *pdata)
+static inline struct device *imx53_add_mmc1(struct esdhc_platform_data *pdata)
 {
 	return imx_add_esdhc_imx5((void *)MX53_ESDHC2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx53_add_mmc2(struct esdhc_platform_data *pdata)
+static inline struct device *imx53_add_mmc2(struct esdhc_platform_data *pdata)
 {
 	return imx_add_esdhc_imx5((void *)MX53_ESDHC3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx53_add_mmc3(struct esdhc_platform_data *pdata)
+static inline struct device *imx53_add_mmc3(struct esdhc_platform_data *pdata)
 {
 	return imx_add_esdhc_imx5((void *)MX53_ESDHC4_BASE_ADDR, 3, pdata);
 }
 
-static inline struct device_d *imx53_add_kpp(struct matrix_keymap_data *pdata)
+static inline struct device *imx53_add_kpp(struct matrix_keymap_data *pdata)
 {
 	return imx_add_kpp((void *)MX53_KPP_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx53_add_sata(void)
+static inline struct device *imx53_add_sata(void)
 {
 	return add_generic_device("imx53-sata", 0, NULL, MX53_SATA_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
 }
diff --git a/arch/arm/mach-imx/include/mach/devices-imx6.h b/arch/arm/mach-imx/include/mach/devices-imx6.h
index 981dd1c7ca..38a940391e 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx6.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx6.h
@@ -3,77 +3,77 @@
 #include <mach/devices.h>
 #include <mach/imx6-regs.h>
 
-static inline struct device_d *imx6_add_uart0(void)
+static inline struct device *imx6_add_uart0(void)
 {
 	return imx_add_uart_imx21((void *)MX6_UART1_BASE_ADDR, 0);
 }
 
-static inline struct device_d *imx6_add_uart1(void)
+static inline struct device *imx6_add_uart1(void)
 {
 	return imx_add_uart_imx21((void *)MX6_UART2_BASE_ADDR, 1);
 }
 
-static inline struct device_d *imx6_add_uart2(void)
+static inline struct device *imx6_add_uart2(void)
 {
 	return imx_add_uart_imx21((void *)MX6_UART3_BASE_ADDR, 2);
 }
 
-static inline struct device_d *imx6_add_uart3(void)
+static inline struct device *imx6_add_uart3(void)
 {
 	return imx_add_uart_imx21((void *)MX6_UART4_BASE_ADDR, 3);
 }
 
-static inline struct device_d *imx6_add_fec(struct fec_platform_data *pdata)
+static inline struct device *imx6_add_fec(struct fec_platform_data *pdata)
 {
 	return imx_add_fec_imx6((void *)MX6_ENET_BASE_ADDR, pdata);
 }
 
-static inline struct device_d *imx6_add_spi0(struct spi_imx_master *pdata)
+static inline struct device *imx6_add_spi0(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx51((void *)MX6_ECSPI1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx6_add_spi1(struct spi_imx_master *pdata)
+static inline struct device *imx6_add_spi1(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx51((void *)MX6_ECSPI2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx6_add_spi2(struct spi_imx_master *pdata)
+static inline struct device *imx6_add_spi2(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx51((void *)MX6_ECSPI3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx6_add_spi3(struct spi_imx_master *pdata)
+static inline struct device *imx6_add_spi3(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx51((void *)MX6_ECSPI4_BASE_ADDR, 3, pdata);
 }
 
-static inline struct device_d *imx6_add_spi4(struct spi_imx_master *pdata)
+static inline struct device *imx6_add_spi4(struct spi_imx_master *pdata)
 {
 	return imx_add_spi_imx51((void *)MX6_ECSPI5_BASE_ADDR, 4, pdata);
 }
 
-static inline struct device_d *imx6_add_i2c0(struct i2c_platform_data *pdata)
+static inline struct device *imx6_add_i2c0(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX6_I2C1_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx6_add_i2c1(struct i2c_platform_data *pdata)
+static inline struct device *imx6_add_i2c1(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX6_I2C2_BASE_ADDR, 1, pdata);
 }
 
-static inline struct device_d *imx6_add_i2c2(struct i2c_platform_data *pdata)
+static inline struct device *imx6_add_i2c2(struct i2c_platform_data *pdata)
 {
 	return imx_add_i2c((void *)MX6_I2C3_BASE_ADDR, 2, pdata);
 }
 
-static inline struct device_d *imx6_add_sata(void)
+static inline struct device *imx6_add_sata(void)
 {
 	return add_generic_device("imx6-sata", 0, NULL, MX6_SATA_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
 }
 
-static inline struct device_d *imx6_add_usbotg(void *pdata)
+static inline struct device *imx6_add_usbotg(void *pdata)
 {
 	add_generic_device("imx-usb-phy", 0, NULL, MX6_USBPHY1_BASE_ADDR, 0x1000,
 			IORESOURCE_MEM, NULL);
@@ -81,7 +81,7 @@ static inline struct device_d *imx6_add_usbotg(void *pdata)
 	return imx_add_usb((void *)MX6_USBOH3_USB_BASE_ADDR, 0, pdata);
 }
 
-static inline struct device_d *imx6_add_usbh1(void *pdata)
+static inline struct device *imx6_add_usbh1(void *pdata)
 {
 	add_generic_device("imx-usb-phy", 1, NULL, MX6_USBPHY2_BASE_ADDR, 0x1000,
 			IORESOURCE_MEM, NULL);
@@ -89,12 +89,12 @@ static inline struct device_d *imx6_add_usbh1(void *pdata)
 	return imx_add_usb((void *)MX6_USBOH3_USB_BASE_ADDR + 0x200, 1, pdata);
 }
 
-static inline struct device_d *imx6_add_usbh2(void *pdata)
+static inline struct device *imx6_add_usbh2(void *pdata)
 {
 	return imx_add_usb((void *)MX6_USBOH3_USB_BASE_ADDR + 0x400, 2, pdata);
 }
 
-static inline struct device_d *imx6_add_usbh3(void *pdata)
+static inline struct device *imx6_add_usbh3(void *pdata)
 {
 	return imx_add_usb((void *)MX6_USBOH3_USB_BASE_ADDR + 0x600, 2, pdata);
 }
diff --git a/arch/arm/mach-imx/include/mach/devices.h b/arch/arm/mach-imx/include/mach/devices.h
index 45da5bb6cc..3f785548ff 100644
--- a/arch/arm/mach-imx/include/mach/devices.h
+++ b/arch/arm/mach-imx/include/mach/devices.h
@@ -10,20 +10,20 @@
 #include <platform_data/mmc-esdhc-imx.h>
 #include <usb/chipidea-imx.h>
 
-struct device_d *imx_add_fec_imx27(void *base, struct fec_platform_data *pdata);
-struct device_d *imx_add_fec_imx6(void *base, struct fec_platform_data *pdata);
-struct device_d *imx_add_spi_imx27(void *base, int id, struct spi_imx_master *pdata);
-struct device_d *imx_add_spi_imx35(void *base, int id, struct spi_imx_master *pdata);
-struct device_d *imx_add_spi_imx51(void *base, int id, struct spi_imx_master *pdata);
-struct device_d *imx_add_i2c(void *base, int id, struct i2c_platform_data *pdata);
-struct device_d *imx_add_uart_imx1(void *base, int id);
-struct device_d *imx_add_uart_imx21(void *base, int id);
-struct device_d *imx_add_nand(void *base, struct imx_nand_platform_data *pdata);
-struct device_d *imx_add_fb(void *base, struct imx_fb_platform_data *pdata);
-struct device_d *imx_add_ipufb(void *base, struct imx_ipu_fb_platform_data *pdata);
-struct device_d *imx_add_mmc(void *base, int id, void *pdata);
-struct device_d *imx_add_esdhc_imx25(void *base, int id, struct esdhc_platform_data *pdata);
-struct device_d *imx_add_esdhc_imx5(void *base, int id, struct esdhc_platform_data *pdata);
-struct device_d *imx_add_kpp(void *base, struct matrix_keymap_data *pdata);
-struct device_d *imx_add_pata(void *base);
-struct device_d *imx_add_usb(void *base, int id, struct imxusb_platformdata *pdata);
+struct device *imx_add_fec_imx27(void *base, struct fec_platform_data *pdata);
+struct device *imx_add_fec_imx6(void *base, struct fec_platform_data *pdata);
+struct device *imx_add_spi_imx27(void *base, int id, struct spi_imx_master *pdata);
+struct device *imx_add_spi_imx35(void *base, int id, struct spi_imx_master *pdata);
+struct device *imx_add_spi_imx51(void *base, int id, struct spi_imx_master *pdata);
+struct device *imx_add_i2c(void *base, int id, struct i2c_platform_data *pdata);
+struct device *imx_add_uart_imx1(void *base, int id);
+struct device *imx_add_uart_imx21(void *base, int id);
+struct device *imx_add_nand(void *base, struct imx_nand_platform_data *pdata);
+struct device *imx_add_fb(void *base, struct imx_fb_platform_data *pdata);
+struct device *imx_add_ipufb(void *base, struct imx_ipu_fb_platform_data *pdata);
+struct device *imx_add_mmc(void *base, int id, void *pdata);
+struct device *imx_add_esdhc_imx25(void *base, int id, struct esdhc_platform_data *pdata);
+struct device *imx_add_esdhc_imx5(void *base, int id, struct esdhc_platform_data *pdata);
+struct device *imx_add_kpp(void *base, struct matrix_keymap_data *pdata);
+struct device *imx_add_pata(void *base);
+struct device *imx_add_usb(void *base, int id, struct imxusb_platformdata *pdata);