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>

6 files changed, 35 insertions, 35 deletions

diff --git a/arch/arm/mach-omap/am33xx_generic.c b/arch/arm/mach-omap/am33xx_generic.c
index 7f9a2bcf37..94fe26b2b2 100644
--- a/arch/arm/mach-omap/am33xx_generic.c
+++ b/arch/arm/mach-omap/am33xx_generic.c
@@ -419,7 +419,7 @@ void am33xx_select_rmii2_crs_dv(void)
 
 int am33xx_of_register_bootdevice(void)
 {
-	struct device_d *dev;
+	struct device *dev;
 
 	switch (bootsource_get()) {
 	case BOOTSOURCE_MMC:
diff --git a/arch/arm/mach-omap/am33xx_scrm.c b/arch/arm/mach-omap/am33xx_scrm.c
index e10e80ce31..dfe6253086 100644
--- a/arch/arm/mach-omap/am33xx_scrm.c
+++ b/arch/arm/mach-omap/am33xx_scrm.c
@@ -23,7 +23,7 @@
 #include <mach/am33xx-silicon.h>
 #include <mach/emif4.h>
 
-static int am33xx_scrm_probe(struct device_d *dev)
+static int am33xx_scrm_probe(struct device *dev)
 {
 	return arm_add_mem_device("ram0", 0x80000000,
 				  emif4_sdram_size(IOMEM(AM33XX_EMIF4_BASE)));
diff --git a/arch/arm/mach-omap/include/mach/devices.h b/arch/arm/mach-omap/include/mach/devices.h
index 06fd2a8dd3..0549dbb2f1 100644
--- a/arch/arm/mach-omap/include/mach/devices.h
+++ b/arch/arm/mach-omap/include/mach/devices.h
@@ -10,8 +10,8 @@ void omap_add_ram0(resource_size_t size);
 
 void omap_add_sram0(resource_size_t base, resource_size_t size);
 
-struct device_d *omap_add_uart(int id, unsigned long base);
+struct device *omap_add_uart(int id, unsigned long base);
 
-struct device_d *omap_add_display(struct omapfb_platform_data *o_pdata);
+struct device *omap_add_display(struct omapfb_platform_data *o_pdata);
 
 #endif /* __MACH_OMAP_DEVICES_H */
diff --git a/arch/arm/mach-omap/include/mach/omap3-devices.h b/arch/arm/mach-omap/include/mach/omap3-devices.h
index 5d7bc8bf1e..16ef2184db 100644
--- a/arch/arm/mach-omap/include/mach/omap3-devices.h
+++ b/arch/arm/mach-omap/include/mach/omap3-devices.h
@@ -18,84 +18,84 @@ static inline void omap3_add_sram0(void)
 
 /* the device numbering is the same as in the device tree */
 
-static inline struct device_d *omap3_add_spi(int id, resource_size_t start)
+static inline struct device *omap3_add_spi(int id, resource_size_t start)
 {
 	return add_generic_device("omap3_spi", id, NULL, start, SZ_4K,
 				   IORESOURCE_MEM, NULL);
 }
 
-static inline struct device_d *omap3_add_spi1(void)
+static inline struct device *omap3_add_spi1(void)
 {
 	return omap3_add_spi(1, OMAP3_MCSPI1_BASE);
 }
 
-static inline struct device_d *omap3_add_spi2(void)
+static inline struct device *omap3_add_spi2(void)
 {
 	return omap3_add_spi(2, OMAP3_MCSPI2_BASE);
 }
 
-static inline struct device_d *omap3_add_spi3(void)
+static inline struct device *omap3_add_spi3(void)
 {
 	return omap3_add_spi(3, OMAP3_MCSPI3_BASE);
 }
 
-static inline struct device_d *omap3_add_spi4(void)
+static inline struct device *omap3_add_spi4(void)
 {
 	return omap3_add_spi(4, OMAP3_MCSPI4_BASE);
 }
 
-static inline struct device_d *omap3_add_uart1(void)
+static inline struct device *omap3_add_uart1(void)
 {
 	return omap_add_uart(0, OMAP3_UART1_BASE);
 }
 
-static inline struct device_d *omap3_add_uart2(void)
+static inline struct device *omap3_add_uart2(void)
 {
 	return omap_add_uart(1, OMAP3_UART2_BASE);
 }
 
-static inline struct device_d *omap3_add_uart3(void)
+static inline struct device *omap3_add_uart3(void)
 {
 	return omap_add_uart(2, OMAP3_UART3_BASE);
 }
 
-static inline struct device_d *omap3_add_mmc1(struct omap_hsmmc_platform_data *pdata)
+static inline struct device *omap3_add_mmc1(struct omap_hsmmc_platform_data *pdata)
 {
 	return add_generic_device("omap3-hsmmc", 0, NULL,
 			OMAP3_MMC1_BASE, SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap3_add_mmc2(struct omap_hsmmc_platform_data *pdata)
+static inline struct device *omap3_add_mmc2(struct omap_hsmmc_platform_data *pdata)
 {
 	return add_generic_device("omap3-hsmmc", 1, NULL,
 			OMAP3_MMC2_BASE, SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap3_add_mmc3(struct omap_hsmmc_platform_data *pdata)
+static inline struct device *omap3_add_mmc3(struct omap_hsmmc_platform_data *pdata)
 {
 	return add_generic_device("omap3-hsmmc", 2, NULL,
 			OMAP3_MMC3_BASE, SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap3_add_i2c1(void *pdata)
+static inline struct device *omap3_add_i2c1(void *pdata)
 {
 	return add_generic_device("i2c-omap3", 0, NULL, OMAP3_I2C1_BASE,
 			SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap3_add_i2c2(void *pdata)
+static inline struct device *omap3_add_i2c2(void *pdata)
 {
 	return add_generic_device("i2c-omap3", 1, NULL, OMAP3_I2C2_BASE,
 			SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap3_add_i2c3(void *pdata)
+static inline struct device *omap3_add_i2c3(void *pdata)
 {
 	return add_generic_device("i2c-omap3", 2, NULL, OMAP3_I2C3_BASE,
 			SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap3_add_ehci(void *pdata)
+static inline struct device *omap3_add_ehci(void *pdata)
 {
 	return add_usb_ehci_device(DEVICE_ID_DYNAMIC, OMAP3_EHCI_BASE,
 					OMAP3_EHCI_BASE + 0x10, pdata);
diff --git a/arch/arm/mach-omap/include/mach/omap4-devices.h b/arch/arm/mach-omap/include/mach/omap4-devices.h
index 22a1eb79fc..530132998c 100644
--- a/arch/arm/mach-omap/include/mach/omap4-devices.h
+++ b/arch/arm/mach-omap/include/mach/omap4-devices.h
@@ -15,76 +15,76 @@ static inline void omap44xx_add_sram0(void)
 	return omap_add_sram0(OMAP44XX_SRAM_BASE, 48 * SZ_1K);
 }
 
-static inline struct device_d *omap44xx_add_uart1(void)
+static inline struct device *omap44xx_add_uart1(void)
 {
 	return omap_add_uart(0, OMAP44XX_UART1_BASE);
 }
 
-static inline struct device_d *omap44xx_add_uart2(void)
+static inline struct device *omap44xx_add_uart2(void)
 {
 	return omap_add_uart(1, OMAP44XX_UART2_BASE);
 }
 
-static inline struct device_d *omap44xx_add_uart3(void)
+static inline struct device *omap44xx_add_uart3(void)
 {
 	return omap_add_uart(2, OMAP44XX_UART3_BASE);
 }
 
-static inline struct device_d *omap44xx_add_mmc1(struct omap_hsmmc_platform_data *pdata)
+static inline struct device *omap44xx_add_mmc1(struct omap_hsmmc_platform_data *pdata)
 {
 	return add_generic_device("omap4-hsmmc", 0, NULL,
 			OMAP44XX_MMC1_BASE, SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap44xx_add_mmc2(struct omap_hsmmc_platform_data *pdata)
+static inline struct device *omap44xx_add_mmc2(struct omap_hsmmc_platform_data *pdata)
 {
 	return add_generic_device("omap4-hsmmc", 1, NULL,
 			OMAP44XX_MMC2_BASE, SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap44xx_add_mmc3(struct omap_hsmmc_platform_data *pdata)
+static inline struct device *omap44xx_add_mmc3(struct omap_hsmmc_platform_data *pdata)
 {
 	return add_generic_device("omap4-hsmmc", 2, NULL,
 			OMAP44XX_MMC3_BASE, SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap44xx_add_mmc4(struct omap_hsmmc_platform_data *pdata)
+static inline struct device *omap44xx_add_mmc4(struct omap_hsmmc_platform_data *pdata)
 {
 	return add_generic_device("omap4-hsmmc", 3, NULL,
 			OMAP44XX_MMC4_BASE, SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap44xx_add_mmc5(struct omap_hsmmc_platform_data *pdata)
+static inline struct device *omap44xx_add_mmc5(struct omap_hsmmc_platform_data *pdata)
 {
 	return add_generic_device("omap4-hsmmc", 4, NULL,
 			OMAP44XX_MMC5_BASE, SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap44xx_add_i2c1(void *pdata)
+static inline struct device *omap44xx_add_i2c1(void *pdata)
 {
 	return add_generic_device("i2c-omap4", 0, NULL, OMAP44XX_I2C1_BASE,
 			SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap44xx_add_i2c2(void *pdata)
+static inline struct device *omap44xx_add_i2c2(void *pdata)
 {
 	return add_generic_device("i2c-omap4", 1, NULL, OMAP44XX_I2C2_BASE,
 			SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap44xx_add_i2c3(void *pdata)
+static inline struct device *omap44xx_add_i2c3(void *pdata)
 {
 	return add_generic_device("i2c-omap4", 2, NULL, OMAP44XX_I2C3_BASE,
 			SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap44xx_add_i2c4(void *pdata)
+static inline struct device *omap44xx_add_i2c4(void *pdata)
 {
 	return add_generic_device("i2c-omap4", 3, NULL, OMAP44XX_I2C4_BASE,
 			SZ_4K, IORESOURCE_MEM, pdata);
 }
 
-static inline struct device_d *omap44xx_add_ehci(void *pdata)
+static inline struct device *omap44xx_add_ehci(void *pdata)
 {
 	return add_usb_ehci_device(DEVICE_ID_DYNAMIC, OMAP44XX_EHCI_BASE,
 				OMAP44XX_EHCI_BASE + 0x10, pdata);
diff --git a/arch/arm/mach-omap/omap_devices.c b/arch/arm/mach-omap/omap_devices.c
index 022616ba54..15a4618931 100644
--- a/arch/arm/mach-omap/omap_devices.c
+++ b/arch/arm/mach-omap/omap_devices.c
@@ -15,7 +15,7 @@ void omap_add_sram0(resource_size_t base, resource_size_t size)
 	add_mem_device("sram0", base, size, IORESOURCE_MEM_WRITEABLE);
 }
 
-struct device_d *omap_add_uart(int id, unsigned long base)
+struct device *omap_add_uart(int id, unsigned long base)
 {
 	return add_generic_device("omap-uart", id, NULL, base, 1024,
 				  IORESOURCE_MEM | IORESOURCE_MEM_8BIT, NULL);
@@ -36,7 +36,7 @@ static struct resource omapfb_resources[] = {
 	},
 };
 
-struct device_d *omap_add_display(struct omapfb_platform_data *o_pdata)
+struct device *omap_add_display(struct omapfb_platform_data *o_pdata)
 {
 	return add_generic_device_res("omap_fb", -1,
 				      omapfb_resources,
@@ -44,7 +44,7 @@ struct device_d *omap_add_display(struct omapfb_platform_data *o_pdata)
 				      o_pdata);
 }
 #else
-struct device_d *omap_add_display(struct omapfb_platform_data *o_pdata)
+struct device *omap_add_display(struct omapfb_platform_data *o_pdata)
 {
 	return NULL;
 }