diff options
Diffstat (limited to 'arch')
98 files changed, 343 insertions, 343 deletions
diff --git a/arch/arm/boards/animeo_ip/init.c b/arch/arm/boards/animeo_ip/init.c index 127bb31dbb..b854f254fb 100644 --- a/arch/arm/boards/animeo_ip/init.c +++ b/arch/arm/boards/animeo_ip/init.c @@ -55,7 +55,7 @@ static int animeo_ip_get_pio_revision(int gpio, char *name) static void animeo_ip_detect_version(void) { - struct device_d *dev = NULL; + struct device *dev = NULL; char *model, *version; int val; @@ -311,7 +311,7 @@ static int animeo_ip_devices_init(void) device_initcall(animeo_ip_devices_init); -static struct device_d *usart0, *usart1; +static struct device *usart0, *usart1; static void animeo_ip_shutdown_uart(void __iomem *base) { diff --git a/arch/arm/boards/at91sam9m10ihd/hw_version.c b/arch/arm/boards/at91sam9m10ihd/hw_version.c index 1387c13718..0b8b7cc884 100644 --- a/arch/arm/boards/at91sam9m10ihd/hw_version.c +++ b/arch/arm/boards/at91sam9m10ihd/hw_version.c @@ -133,7 +133,7 @@ static void at91sam9m10ihd_devices_detect_one(const char *name) struct one_wire_info info; struct board_info* binfo; struct vendor_info* vinfo; - struct device_d *dev = NULL; + struct device *dev = NULL; char str[16]; u8 vendor_id = 0; diff --git a/arch/arm/boards/at91sam9x5ek/hw_version.c b/arch/arm/boards/at91sam9x5ek/hw_version.c index 4038f42ec2..1224f4753c 100644 --- a/arch/arm/boards/at91sam9x5ek/hw_version.c +++ b/arch/arm/boards/at91sam9x5ek/hw_version.c @@ -149,7 +149,7 @@ static void at91sam9x5ek_devices_detect_one(const char *name) struct one_wire_info info; struct board_info* binfo; struct vendor_info* vinfo; - struct device_d *dev = NULL; + struct device *dev = NULL; char str[16]; u8 vendor_id = 0; diff --git a/arch/arm/boards/embest-marsboard/board.c b/arch/arm/boards/embest-marsboard/board.c index a11b7b6579..545934648c 100644 --- a/arch/arm/boards/embest-marsboard/board.c +++ b/arch/arm/boards/embest-marsboard/board.c @@ -33,7 +33,7 @@ static int ar8035_phy_fixup(struct phy_device *dev) return 0; } -static int marsboard_device_init(struct device_d *dev) +static int marsboard_device_init(struct device *dev) { barebox_set_hostname("marsboard"); diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c index 300a85839b..6b4c9d9f5a 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/board.c +++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c @@ -124,7 +124,7 @@ static void sabrelite_ehci_init(void) gpio_set_value(IMX_GPIO_NR(7, 12), 1); } -static int sabrelite_probe(struct device_d *dev) +static int sabrelite_probe(struct device *dev) { int ret; diff --git a/arch/arm/boards/grinn-liteboard/board.c b/arch/arm/boards/grinn-liteboard/board.c index 3e69ea520a..5b52c8de18 100644 --- a/arch/arm/boards/grinn-liteboard/board.c +++ b/arch/arm/boards/grinn-liteboard/board.c @@ -25,7 +25,7 @@ static void bbu_register_handler_emmc(bool is_boot_source) { int emmc_boot_flag = 0, emmc_flag = 0; const char *bootpart; - struct device_d *dev; + struct device *dev; int ret; if (!is_boot_source) diff --git a/arch/arm/boards/innocomm-imx8mm-wb15/board.c b/arch/arm/boards/innocomm-imx8mm-wb15/board.c index 8bc4dabb66..44941c5a31 100644 --- a/arch/arm/boards/innocomm-imx8mm-wb15/board.c +++ b/arch/arm/boards/innocomm-imx8mm-wb15/board.c @@ -7,7 +7,7 @@ #include <init.h> #include <mach/bbu.h> -static int innocomm_wb15_evk_probe(struct device_d *dev) +static int innocomm_wb15_evk_probe(struct device *dev) { int emmc_bbu_flag = 0; int sd_bbu_flag = 0; diff --git a/arch/arm/boards/kindle-mx50/board.c b/arch/arm/boards/kindle-mx50/board.c index 76472d71bb..7366047582 100644 --- a/arch/arm/boards/kindle-mx50/board.c +++ b/arch/arm/boards/kindle-mx50/board.c @@ -140,7 +140,7 @@ mem_initcall(kindle_mx50_mem_init); static int kindle_mx50_devices_init(void) { - struct device_d *dev; + struct device *dev; if (!is_mx50_kindle()) return 0; diff --git a/arch/arm/boards/lxa-mc1/board.c b/arch/arm/boards/lxa-mc1/board.c index f8a7a6bd1f..b50c1af0be 100644 --- a/arch/arm/boards/lxa-mc1/board.c +++ b/arch/arm/boards/lxa-mc1/board.c @@ -29,7 +29,7 @@ static int of_fixup_regulator_supply_disable(struct device_node *root, void *pat return 0; } -static int mc1_probe(struct device_d *dev) +static int mc1_probe(struct device *dev) { int flags; diff --git a/arch/arm/boards/mnt-reform/board.c b/arch/arm/boards/mnt-reform/board.c index 010690ecbd..f37798b995 100644 --- a/arch/arm/boards/mnt-reform/board.c +++ b/arch/arm/boards/mnt-reform/board.c @@ -9,7 +9,7 @@ #include <init.h> #include <mach/bbu.h> -static int mnt_reform_probe(struct device_d *dev) +static int mnt_reform_probe(struct device *dev) { int emmc_bbu_flag = 0; int sd_bbu_flag = 0; diff --git a/arch/arm/boards/nhk8815/setup.c b/arch/arm/boards/nhk8815/setup.c index d0ac9a0250..90ec33f710 100644 --- a/arch/arm/boards/nhk8815/setup.c +++ b/arch/arm/boards/nhk8815/setup.c @@ -52,7 +52,7 @@ static struct resource nhk8815_nand_resources[] = { } }; -static struct device_d nhk8815_nand_device = { +static struct device nhk8815_nand_device = { .id = DEVICE_ID_DYNAMIC, .name = "nomadik_nand", .num_resources = ARRAY_SIZE(nhk8815_nand_resources), diff --git a/arch/arm/boards/nxp-imx8mm-evk/board.c b/arch/arm/boards/nxp-imx8mm-evk/board.c index db694943e5..8655e39e9b 100644 --- a/arch/arm/boards/nxp-imx8mm-evk/board.c +++ b/arch/arm/boards/nxp-imx8mm-evk/board.c @@ -31,7 +31,7 @@ static int ar8031_phy_fixup(struct phy_device *phydev) return 0; } -static int imx8mm_evk_probe(struct device_d *dev) +static int imx8mm_evk_probe(struct device *dev) { int emmc_bbu_flag = 0; int sd_bbu_flag = 0; diff --git a/arch/arm/boards/nxp-imx8mn-evk/board.c b/arch/arm/boards/nxp-imx8mn-evk/board.c index 3606dabe9d..c7666e10a4 100644 --- a/arch/arm/boards/nxp-imx8mn-evk/board.c +++ b/arch/arm/boards/nxp-imx8mn-evk/board.c @@ -31,7 +31,7 @@ static int ar8031_phy_fixup(struct phy_device *phydev) return 0; } -static int imx8mn_evk_probe(struct device_d *dev) +static int imx8mn_evk_probe(struct device *dev) { int emmc_bbu_flag = 0; int sd_bbu_flag = 0; diff --git a/arch/arm/boards/nxp-imx8mp-evk/board.c b/arch/arm/boards/nxp-imx8mp-evk/board.c index 57c41aa8d8..d506f5d980 100644 --- a/arch/arm/boards/nxp-imx8mp-evk/board.c +++ b/arch/arm/boards/nxp-imx8mp-evk/board.c @@ -15,7 +15,7 @@ #include <gpio.h> #include <envfs.h> -static int nxp_imx8mp_evk_probe(struct device_d *dev) +static int nxp_imx8mp_evk_probe(struct device *dev) { int emmc_bbu_flag = 0; int sd_bbu_flag = 0; diff --git a/arch/arm/boards/phytec-phycore-imx27/pcm970.c b/arch/arm/boards/phytec-phycore-imx27/pcm970.c index b7fad6dcbc..479e5566a0 100644 --- a/arch/arm/boards/phytec-phycore-imx27/pcm970.c +++ b/arch/arm/boards/phytec-phycore-imx27/pcm970.c @@ -28,7 +28,7 @@ static struct ide_port_info pcm970_ide_pdata = { .reset = &pcm970_ide_reset, }; -static struct device_d pcm970_ide_device = { +static struct device pcm970_ide_device = { .id = DEVICE_ID_DYNAMIC, .name = "ide_intf", .num_resources = ARRAY_SIZE(pcm970_ide_resources), diff --git a/arch/arm/boards/phytec-phycore-stm32mp1/board.c b/arch/arm/boards/phytec-phycore-stm32mp1/board.c index eb6147785f..adb882f91d 100644 --- a/arch/arm/boards/phytec-phycore-stm32mp1/board.c +++ b/arch/arm/boards/phytec-phycore-stm32mp1/board.c @@ -3,7 +3,7 @@ #include <driver.h> #include <bootsource.h> -static int phycore_stm32mp1_probe(struct device_d *dev) +static int phycore_stm32mp1_probe(struct device *dev) { if (bootsource_get_instance() == 0) of_device_enable_path("/chosen/environment-sd"); diff --git a/arch/arm/boards/phytec-som-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c index c540aaeb3f..59868f35c8 100644 --- a/arch/arm/boards/phytec-som-imx6/board.c +++ b/arch/arm/boards/phytec-som-imx6/board.c @@ -157,7 +157,7 @@ struct board_data { unsigned flags; }; -static int physom_imx6_probe(struct device_d *dev) +static int physom_imx6_probe(struct device *dev) { int ret; char *environment_path, *default_environment_path; diff --git a/arch/arm/boards/pine64-quartz64/board.c b/arch/arm/boards/pine64-quartz64/board.c index 981de90dd7..cd48a61ab0 100644 --- a/arch/arm/boards/pine64-quartz64/board.c +++ b/arch/arm/boards/pine64-quartz64/board.c @@ -7,7 +7,7 @@ struct quartz64_model { const char *shortname; }; -static int quartz64_probe(struct device_d *dev) +static int quartz64_probe(struct device *dev) { const struct quartz64_model *model; diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c index a0dec5b1e2..d9ea721f55 100644 --- a/arch/arm/boards/protonic-imx6/board.c +++ b/arch/arm/boards/protonic-imx6/board.c @@ -84,7 +84,7 @@ struct prt_machine_data { }; struct prt_imx6_priv { - struct device_d *dev; + struct device *dev; const struct prt_machine_data *dcfg; unsigned int hw_id; unsigned int hw_rev; @@ -147,7 +147,7 @@ static int prt_imx6_read_rfid(struct prt_imx6_priv *priv, void *buf, size_t size) { const struct prt_machine_data *dcfg = priv->dcfg; - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; struct i2c_client cl; int ret; @@ -187,7 +187,7 @@ static u8 prt_imx6_calc_rfid_cs(void *buf, size_t size) static int prt_imx6_set_mac(struct prt_imx6_priv *priv, struct prti6q_rfid_contents *rfid) { - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; struct device_node *node; node = of_find_node_by_alias(of_get_root_node(), "ethernet0"); @@ -224,7 +224,7 @@ static int prt_imx6_set_serial(struct prt_imx6_priv *priv, char *serial) static int prt_imx6_read_i2c_mac_serial(struct prt_imx6_priv *priv) { - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; struct prti6q_rfid_contents rfid; int ret; @@ -294,7 +294,7 @@ static int prt_imx6_set_ocotp_serial(struct param_d *param, void *driver_priv) static int prt_imx6_usb_mount(struct prt_imx6_priv *priv) { - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; const char *path; struct stat s; int ret; @@ -333,7 +333,7 @@ exit_usb_mount: static int prt_imx6_usb_boot(struct bootentry *entry, int verbose, int dryrun) { struct prt_imx6_priv *priv = prt_priv; - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; char *second_word; char buf[sizeof("vicut1q recovery")] = {}; struct bootm_data bootm_data = {}; @@ -465,7 +465,7 @@ static int prt_imx6_bootentry_provider(struct bootentries *bootentries, static int prt_imx6_env_init(struct prt_imx6_priv *priv) { const struct prt_machine_data *dcfg = priv->dcfg; - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; char *delay, *bootsrc, *boot_targets; unsigned int autoboot_timeout; int ret; @@ -559,7 +559,7 @@ exit_bbu: static int prt_imx6_devices_init(void) { struct prt_imx6_priv *priv = prt_priv; - struct device_d *ocotp_dev; + struct device *ocotp_dev; struct param_d *p; if (!priv) @@ -615,7 +615,7 @@ static int prt_imx6_yaco_set_kvg_power_mode(struct prt_imx6_priv *priv, const char *serial) { static const char command[] = "{\"command\":\"mode\",\"value\":\"kvg\",\"on2\":true}"; - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; struct console_device *yccon; int ret; @@ -914,7 +914,7 @@ exit_get_dcfg: return ret; } -static int prt_imx6_probe(struct device_d *dev) +static int prt_imx6_probe(struct device *dev) { struct prt_imx6_priv *priv; struct param_d *p; diff --git a/arch/arm/boards/protonic-imx8m/board.c b/arch/arm/boards/protonic-imx8m/board.c index 87264f0c97..e7e5c529af 100644 --- a/arch/arm/boards/protonic-imx8m/board.c +++ b/arch/arm/boards/protonic-imx8m/board.c @@ -39,7 +39,7 @@ static int prt_prt8mm_init_power(void) return 0; } -static int prt_prt8mm_probe(struct device_d *dev) +static int prt_prt8mm_probe(struct device *dev) { int emmc_bbu_flag = 0; int sd_bbu_flag = 0; diff --git a/arch/arm/boards/protonic-stm32mp1/board.c b/arch/arm/boards/protonic-stm32mp1/board.c index 174454ed27..fe23bc3164 100644 --- a/arch/arm/boards/protonic-stm32mp1/board.c +++ b/arch/arm/boards/protonic-stm32mp1/board.c @@ -54,7 +54,7 @@ static const struct prt_stm32_boot_dev prt_stm32_boot_devs[] = { }, }; -static int prt_stm32_probe(struct device_d *dev) +static int prt_stm32_probe(struct device *dev) { const struct prt_stm32_machine_data *dcfg; char *env_path_back = NULL, *env_path = NULL; diff --git a/arch/arm/boards/radxa-rock3/board.c b/arch/arm/boards/radxa-rock3/board.c index cea00b9773..039d75f250 100644 --- a/arch/arm/boards/radxa-rock3/board.c +++ b/arch/arm/boards/radxa-rock3/board.c @@ -10,7 +10,7 @@ struct rock3_model { const char *shortname; }; -static int rock3_probe(struct device_d *dev) +static int rock3_probe(struct device *dev) { enum bootsource bootsource = bootsource_get(); int instance = bootsource_get_instance(); diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c index 77935e5c88..8d2be6e399 100644 --- a/arch/arm/boards/raspberry-pi/rpi-common.c +++ b/arch/arm/boards/raspberry-pi/rpi-common.c @@ -54,7 +54,7 @@ struct rpi_machine_data { }; struct rpi_priv { - struct device_d *dev; + struct device *dev; const struct rpi_machine_data *dcfg; unsigned int hw_id; const char *name; @@ -414,7 +414,7 @@ static const struct rpi_machine_data *rpi_get_dcfg(struct rpi_priv *priv) return ERR_PTR(-ENODEV); } -static int rpi_devices_probe(struct device_d *dev) +static int rpi_devices_probe(struct device *dev) { const struct rpi_machine_data *dcfg; struct regulator *reg; diff --git a/arch/arm/boards/rockchip-rk3568-bpi-r2pro/board.c b/arch/arm/boards/rockchip-rk3568-bpi-r2pro/board.c index b5d406576f..3b448fae86 100644 --- a/arch/arm/boards/rockchip-rk3568-bpi-r2pro/board.c +++ b/arch/arm/boards/rockchip-rk3568-bpi-r2pro/board.c @@ -14,7 +14,7 @@ static bool machine_is_bpi_r2pro = false; -static int rk3568_bpi_r2pro_probe(struct device_d *dev) +static int rk3568_bpi_r2pro_probe(struct device *dev) { enum bootsource bootsource = bootsource_get(); int instance = bootsource_get_instance(); diff --git a/arch/arm/boards/rockchip-rk3568-evb/board.c b/arch/arm/boards/rockchip-rk3568-evb/board.c index ef886e67ed..69acf0798c 100644 --- a/arch/arm/boards/rockchip-rk3568-evb/board.c +++ b/arch/arm/boards/rockchip-rk3568-evb/board.c @@ -14,7 +14,7 @@ static bool machine_is_rk3568_evb = false; -static int rk3568_evb_probe(struct device_d *dev) +static int rk3568_evb_probe(struct device *dev) { enum bootsource bootsource = bootsource_get(); int instance = bootsource_get_instance(); diff --git a/arch/arm/boards/sama5d3_xplained/board.c b/arch/arm/boards/sama5d3_xplained/board.c index 69357df0fb..4350d97425 100644 --- a/arch/arm/boards/sama5d3_xplained/board.c +++ b/arch/arm/boards/sama5d3_xplained/board.c @@ -35,7 +35,7 @@ static struct sam9_smc_config sama5d3_xplained_nand_smc_config = { .nfsel = 1 }; -static int sama5d3_xplained_probe(struct device_d *dev) +static int sama5d3_xplained_probe(struct device *dev) { struct clk *clk; diff --git a/arch/arm/boards/sama5d3xek/hw_version.c b/arch/arm/boards/sama5d3xek/hw_version.c index 03c8df2cad..c64d4566c6 100644 --- a/arch/arm/boards/sama5d3xek/hw_version.c +++ b/arch/arm/boards/sama5d3xek/hw_version.c @@ -151,7 +151,7 @@ static void at91sama5d3xek_devices_detect_one(const char *name) struct one_wire_info info; struct board_info* binfo; struct vendor_info* vinfo; - struct device_d *dev = NULL; + struct device *dev = NULL; char str[16]; char *bname, *vname; u8 vendor_id = 0; diff --git a/arch/arm/boards/seeed-odyssey/board.c b/arch/arm/boards/seeed-odyssey/board.c index 8c011898a3..f811127023 100644 --- a/arch/arm/boards/seeed-odyssey/board.c +++ b/arch/arm/boards/seeed-odyssey/board.c @@ -7,7 +7,7 @@ #include <bootsource.h> #include <of.h> -static int odyssey_som_probe(struct device_d *dev) +static int odyssey_som_probe(struct device *dev) { int flags; int instance = bootsource_get_instance(); diff --git a/arch/arm/boards/skov-arm9cpu/board.c b/arch/arm/boards/skov-arm9cpu/board.c index 8d5eadbb9a..1f092b37cc 100644 --- a/arch/arm/boards/skov-arm9cpu/board.c +++ b/arch/arm/boards/skov-arm9cpu/board.c @@ -45,7 +45,7 @@ static int mem; * But is required before we start the other drives. * Use device_initcall() to maintain this order. */ -static int skov_arm9_probe(struct device_d *dev) +static int skov_arm9_probe(struct device *dev) { unsigned long csa; diff --git a/arch/arm/boards/skov-imx6/board.c b/arch/arm/boards/skov-imx6/board.c index 19f91ab481..4ce0112a58 100644 --- a/arch/arm/boards/skov-imx6/board.c +++ b/arch/arm/boards/skov-imx6/board.c @@ -18,7 +18,7 @@ #include "version.h" struct skov_imx6_priv { - struct device_d *dev; + struct device *dev; }; static struct skov_imx6_priv *skov_priv; @@ -577,8 +577,8 @@ static int skov_set_switch_lan2_mac(struct skov_imx6_priv *priv) static int skov_switch_test(void) { - struct device_d *sw_dev; - struct device_d *eth0; + struct device *sw_dev; + struct device *eth0; int ret; if (skov_board_no < 0) @@ -618,7 +618,7 @@ no_switch: } late_initcall(skov_switch_test); -static int skov_imx6_probe(struct device_d *dev) +static int skov_imx6_probe(struct device *dev) { struct skov_imx6_priv *priv; unsigned v = 0; diff --git a/arch/arm/boards/stm32mp15x-ev1/board.c b/arch/arm/boards/stm32mp15x-ev1/board.c index b8e26cd37b..e05caf3a46 100644 --- a/arch/arm/boards/stm32mp15x-ev1/board.c +++ b/arch/arm/boards/stm32mp15x-ev1/board.c @@ -5,7 +5,7 @@ #include <init.h> #include <mach/bbu.h> -static int ed1_probe(struct device_d *dev) +static int ed1_probe(struct device *dev) { int flags; diff --git a/arch/arm/boards/stm32mp15xx-dkx/board.c b/arch/arm/boards/stm32mp15xx-dkx/board.c index 1ddfee698d..42ff4aa4d2 100644 --- a/arch/arm/boards/stm32mp15xx-dkx/board.c +++ b/arch/arm/boards/stm32mp15xx-dkx/board.c @@ -3,7 +3,7 @@ #include <init.h> #include <mach/bbu.h> -static int dkx_probe(struct device_d *dev) +static int dkx_probe(struct device *dev) { const void *model; diff --git a/arch/arm/boards/tqma6ulx/board.c b/arch/arm/boards/tqma6ulx/board.c index 06b5e1322c..6ede15b498 100644 --- a/arch/arm/boards/tqma6ulx/board.c +++ b/arch/arm/boards/tqma6ulx/board.c @@ -11,7 +11,7 @@ #include <of.h> #include <string.h> -static int mba6ulx_probe(struct device_d *dev) +static int mba6ulx_probe(struct device *dev) { int flags; diff --git a/arch/arm/boards/tqma8mpxl/board.c b/arch/arm/boards/tqma8mpxl/board.c index 648286d3b2..70f5e387a0 100644 --- a/arch/arm/boards/tqma8mpxl/board.c +++ b/arch/arm/boards/tqma8mpxl/board.c @@ -15,7 +15,7 @@ #include <gpio.h> #include <envfs.h> -static int tqma8mpxl_probe(struct device_d *dev) +static int tqma8mpxl_probe(struct device *dev) { int emmc_bbu_flag = 0; int sd_bbu_flag = 0; diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c index 010e094587..a4c55b6236 100644 --- a/arch/arm/boards/usb-a926x/init.c +++ b/arch/arm/boards/usb-a926x/init.c @@ -395,7 +395,7 @@ device_initcall(usb_a9260_devices_init); #ifndef CONFIG_CONSOLE_NONE static int usb_a9260_console_init(void) { - struct device_d *dev; + struct device *dev; if (machine_is_usb_a9260()) { barebox_set_model("Calao USB-A9260"); diff --git a/arch/arm/boards/vexpress/init.c b/arch/arm/boards/vexpress/init.c index 6ba23bbb62..e3577ec2e4 100644 --- a/arch/arm/boards/vexpress/init.c +++ b/arch/arm/boards/vexpress/init.c @@ -42,7 +42,7 @@ static int of_fixup_virtio_mmio(struct device_node *root, void *unused) return 0; } -static int vexpress_probe(struct device_d *dev) +static int vexpress_probe(struct device *dev) { char *hostname = "vexpress-unknown"; int ret = 0; diff --git a/arch/arm/boards/webasto-ccbv2/board.c b/arch/arm/boards/webasto-ccbv2/board.c index fd6ea6f406..dbd83a682b 100644 --- a/arch/arm/boards/webasto-ccbv2/board.c +++ b/arch/arm/boards/webasto-ccbv2/board.c @@ -12,7 +12,7 @@ #include "ccbv2.h" -static int ccbv2_probe(struct device_d *dev) +static int ccbv2_probe(struct device *dev) { struct device_node *overlay; struct fdt_header *fdt; diff --git a/arch/arm/boards/zii-common/board.c b/arch/arm/boards/zii-common/board.c index 5d81bd51e9..96f9243591 100644 --- a/arch/arm/boards/zii-common/board.c +++ b/arch/arm/boards/zii-common/board.c @@ -68,7 +68,7 @@ late_initcall(rdu_ethernet_init); static int rdu_networkconfig(void) { static char *rdu_netconfig; - struct device_d *sp_dev; + struct device *sp_dev; if (!of_machine_is_compatible("zii,imx8mq-ultra") && !of_machine_is_compatible("zii,imx6q-zii-rdu2") && diff --git a/arch/arm/boards/zii-common/switch-cmd.c b/arch/arm/boards/zii-common/switch-cmd.c index df6ed66b23..6aa1c391f4 100644 --- a/arch/arm/boards/zii-common/switch-cmd.c +++ b/arch/arm/boards/zii-common/switch-cmd.c @@ -61,7 +61,7 @@ static int do_rdu2_switch_reset(void) static int do_rdu1_switch_reset(void) { - struct device_d *sp_dev = get_device_by_name("sp"); + struct device *sp_dev = get_device_by_name("sp"); struct rave_sp *sp = sp_dev->parent->priv; u8 cmd[] = { [0] = RAVE_SP_CMD_RESET_ETH_SWITCH, diff --git a/arch/arm/boards/zii-imx8mq-dev/board.c b/arch/arm/boards/zii-imx8mq-dev/board.c index 02e257f35f..a56ebbc669 100644 --- a/arch/arm/boards/zii-imx8mq-dev/board.c +++ b/arch/arm/boards/zii-imx8mq-dev/board.c @@ -81,7 +81,7 @@ static int zii_imx8mq_dev_fixup_egalax_ts(struct device_node *root, void *ctx) static int zii_imx8mq_dev_fixup_deb_internal(void) { struct device_node *np, *aliases; - struct device_d *dev; + struct device *dev; /* * In the internal DT remove the complete FEC hierarchy and move the diff --git a/arch/arm/cpu/psci-client.c b/arch/arm/cpu/psci-client.c index 917e06d560..0df7f7e171 100644 --- a/arch/arm/cpu/psci-client.c +++ b/arch/arm/cpu/psci-client.c @@ -113,7 +113,7 @@ static int of_psci_do_fixup(struct device_node *root, void *method) return of_psci_fixup(root, version, (const void *)method); } -static int __init psci_probe(struct device_d *dev) +static int __init psci_probe(struct device *dev) { const char *method; ulong of_version, actual_version; diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 5ebe21c88a..4fc7f2fcbd 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -342,7 +342,7 @@ resource_size_t __init at91_configure_usart5(unsigned pins) /* Consider only one slot : slot 0 */ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) { - struct device_d *dev; + struct device *dev; if (!data) return; diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index dfde848aa3..0c7ef6dade 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -309,7 +309,7 @@ resource_size_t __init at91_configure_usart2(unsigned pins) /* Consider only one slot : slot 0 */ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) { - struct device_d *dev; + struct device *dev; if (!data) return; diff --git a/arch/arm/mach-at91/at91sam9_rst.c b/arch/arm/mach-at91/at91sam9_rst.c index a61a26936f..cb3ee37f3e 100644 --- a/arch/arm/mach-at91/at91sam9_rst.c +++ b/arch/arm/mach-at91/at91sam9_rst.c @@ -25,7 +25,7 @@ static int reasons[] = { RESET_EXT, /* USER NRST pin detected low */ }; -static void at91sam9x_set_reset_reason(struct device_d *dev, +static void at91sam9x_set_reset_reason(struct device *dev, void __iomem *base) { enum reset_src_type type = RESET_UKWN; @@ -56,7 +56,7 @@ static void __noreturn at91sam9x_restart_soc(struct restart_handler *rst) hang(); } -static int at91sam9x_rst_probe(struct device_d *dev) +static int at91sam9x_rst_probe(struct device *dev) { struct at91sam9x_rst *priv; struct resource *iores; diff --git a/arch/arm/mach-at91/ddramc.c b/arch/arm/mach-at91/ddramc.c index 8f70b4ada2..c7222e686f 100644 --- a/arch/arm/mach-at91/ddramc.c +++ b/arch/arm/mach-at91/ddramc.c @@ -34,7 +34,7 @@ void __noreturn sama5d3_barebox_entry(unsigned int r4, void *boarddata) boarddata); } -static int sama5_ddr_probe(struct device_d *dev) +static int sama5_ddr_probe(struct device *dev) { struct resource *iores; void __iomem *base; diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index cdc1b7598a..4ea9779d34 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h @@ -13,25 +13,25 @@ static inline int __init at91_clock_init(void) { return 0; } extern int __init at91_clock_init(void); #endif -static inline struct device_d *at91_add_rm9200_gpio(int id, resource_size_t start) +static inline struct device *at91_add_rm9200_gpio(int id, resource_size_t start) { return add_generic_device("at91rm9200-gpio", id, NULL, start, 512, IORESOURCE_MEM, NULL); } -static inline struct device_d *at91_add_sam9x5_gpio(int id, resource_size_t start) +static inline struct device *at91_add_sam9x5_gpio(int id, resource_size_t start) { return add_generic_device("at91sam9x5-gpio", id, NULL, start, 512, IORESOURCE_MEM, NULL); } -static inline struct device_d *at91_add_pit(resource_size_t start) +static inline struct device *at91_add_pit(resource_size_t start) { return add_generic_device("at91-pit", DEVICE_ID_SINGLE, NULL, start, 16, IORESOURCE_MEM, NULL); } -static inline struct device_d *at91_add_sam9_smc(int id, resource_size_t start, +static inline struct device *at91_add_sam9_smc(int id, resource_size_t start, resource_size_t size) { return add_generic_device("at91sam9-smc", id, NULL, start, size, diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h index 754a6b7c5e..e426e0b3f5 100644 --- a/arch/arm/mach-at91/include/mach/board.h +++ b/arch/arm/mach-at91/include/mach/board.h @@ -93,7 +93,7 @@ resource_size_t __init at91_configure_usart5(unsigned pins); resource_size_t __init at91_configure_usart6(unsigned pins); #if defined(CONFIG_DRIVER_SERIAL_ATMEL) -static inline struct device_d * at91_register_uart(unsigned id, unsigned pins) +static inline struct device * at91_register_uart(unsigned id, unsigned pins) { resource_size_t start; resource_size_t size = SZ_16K; @@ -129,7 +129,7 @@ static inline struct device_d * at91_register_uart(unsigned id, unsigned pins) IORESOURCE_MEM, NULL); } #else -static inline struct device_d * at91_register_uart(unsigned id, unsigned pins) +static inline struct device * at91_register_uart(unsigned id, unsigned pins) { return NULL; } diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c index 77d62012df..165fd1d28a 100644 --- a/arch/arm/mach-at91/sam9_smc.c +++ b/arch/arm/mach-at91/sam9_smc.c @@ -168,7 +168,7 @@ void sama5_smc_configure(int id, int cs, struct sam9_smc_config *config) sam9_smc_cs_write_timings(AT91_SMC_CS(id, cs), config); } -static int at91sam9_smc_probe(struct device_d *dev) +static int at91sam9_smc_probe(struct device *dev) { struct resource *iores; int id = dev->id; diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 47247dc97c..8a21d8debc 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -371,7 +371,7 @@ postcore_initcall(at91_detect); static int at91_soc_device(void) { - struct device_d *dev; + struct device *dev; dev = add_generic_device_res("soc", DEVICE_ID_SINGLE, NULL, 0, NULL); dev_add_param_fixed(dev, "name", (char*)at91_get_soc_type(&at91_soc_initdata)); diff --git a/arch/arm/mach-clps711x/clock.c b/arch/arm/mach-clps711x/clock.c index 573867e415..7ad43842f6 100644 --- a/arch/arm/mach-clps711x/clock.c +++ b/arch/arm/mach-clps711x/clock.c @@ -23,7 +23,7 @@ static const struct clk_div_table tdiv_tbl[] = { { } }; -static int clps711x_clk_probe(struct device_d *dev) +static int clps711x_clk_probe(struct device *dev) { unsigned int f_cpu, f_bus, f_uart, f_timer_ref, pll; u32 tmp; diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c index dcb97ad236..a185110213 100644 --- a/arch/arm/mach-clps711x/common.c +++ b/arch/arm/mach-clps711x/common.c @@ -110,7 +110,7 @@ static int clps711x_bus_fixup(struct device_node *root, void *context) return 0; } -static int clps711x_bus_probe(struct device_d *dev) +static int clps711x_bus_probe(struct device *dev) { u32 mcfg; diff --git a/arch/arm/mach-imx/devices.c b/arch/arm/mach-imx/devices.c index 58c0a8aff3..ae2769d259 100644 --- a/arch/arm/mach-imx/devices.c +++ b/arch/arm/mach-imx/devices.c @@ -4,93 +4,93 @@ #include <driver.h> #include <mach/devices.h> -static inline struct device_d *imx_add_device(char *name, int id, void *base, int size, void *pdata) +static inline struct device *imx_add_device(char *name, int id, void *base, int size, void *pdata) { return add_generic_device(name, id, NULL, (resource_size_t)base, size, IORESOURCE_MEM, pdata); } -struct device_d *imx_add_fec_imx27(void *base, struct fec_platform_data *pdata) +struct device *imx_add_fec_imx27(void *base, struct fec_platform_data *pdata) { return imx_add_device("imx27-fec", -1, base, 0x1000, pdata); } -struct device_d *imx_add_fec_imx6(void *base, struct fec_platform_data *pdata) +struct device *imx_add_fec_imx6(void *base, struct fec_platform_data *pdata) { return imx_add_device("imx6-fec", -1, base, 0x1000, pdata); } -struct device_d *imx_add_spi_imx27(void *base, int id, struct spi_imx_master *pdata) +struct device *imx_add_spi_imx27(void *base, int id, struct spi_imx_master *pdata) { return imx_add_device("imx27-spi", id, base, 0x1000, pdata); } -struct device_d *imx_add_spi_imx35(void *base, int id, struct spi_imx_master *pdata) +struct device *imx_add_spi_imx35(void *base, int id, struct spi_imx_master *pdata) { return imx_add_device("imx35-spi", id, base, 0x1000, pdata); } -struct device_d *imx_add_spi_imx51(void *base, int id, struct spi_imx_master *pdata) +struct device *imx_add_spi_imx51(void *base, int id, struct spi_imx_master *pdata) { return imx_add_device("imx51-spi", id, base, 0x1000, pdata); } -struct device_d *imx_add_i2c(void *base, int id, struct i2c_platform_data *pdata) +struct device *imx_add_i2c(void *base, int id, struct i2c_platform_data *pdata) { return imx_add_device("i2c-fsl", id, base, 0x1000, pdata); } -struct device_d *imx_add_uart_imx1(void *base, int id) +struct device *imx_add_uart_imx1(void *base, int id) { return imx_add_device("imx1-uart", id, base, 0x1000, NULL); } -struct device_d *imx_add_uart_imx21(void *base, int id) +struct device *imx_add_uart_imx21(void *base, int id) { return imx_add_device("imx21-uart", id, base, 0x1000, NULL); } -struct device_d *imx_add_nand(void *base, struct imx_nand_platform_data *pdata) +struct device *imx_add_nand(void *base, struct imx_nand_platform_data *pdata) { return imx_add_device("imx_nand", -1, base, 0x1000, pdata); } -struct device_d *imx_add_fb(void *base, struct imx_fb_platform_data *pdata) +struct device *imx_add_fb(void *base, struct imx_fb_platform_data *pdata) { return imx_add_device("imxfb", -1, base, 0x1000, pdata); } -struct device_d *imx_add_ipufb(void *base, struct imx_ipu_fb_platform_data *pdata) +struct device *imx_add_ipufb(void *base, struct imx_ipu_fb_platform_data *pdata) { return imx_add_device("imx-ipu-fb", -1, base, 0x1000, pdata); } -struct device_d *imx_add_mmc(void *base, int id, void *pdata) +struct device *imx_add_mmc(void *base, int id, void *pdata) { return imx_add_device("imx-mmc", id, base, 0x1000, pdata); } -struct device_d *imx_add_esdhc_imx25(void *base, int id, struct esdhc_platform_data *pdata) +struct device *imx_add_esdhc_imx25(void *base, int id, struct esdhc_platform_data *pdata) { return imx_add_device("imx25-esdhc", id, base, 0x1000, pdata); } -struct device_d *imx_add_esdhc_imx5(void *base, int id, struct esdhc_platform_data *pdata) +struct device *imx_add_esdhc_imx5(void *base, int id, struct esdhc_platform_data *pdata) { return imx_add_device("imx5-esdhc", id, base, 0x1000, pdata); } -struct device_d *imx_add_kpp(void *base, struct matrix_keymap_data *pdata) +struct device *imx_add_kpp(void *base, struct matrix_keymap_data *pdata) { return imx_add_device("imx-kpp", -1, base, 0x1000, pdata); } -struct device_d *imx_add_pata(void *base) +struct device *imx_add_pata(void *base) { return imx_add_device("imx-pata", -1, base, 0x1000, NULL); } -struct device_d *imx_add_usb(void *base, int id, struct imxusb_platformdata *pdata) +struct device *imx_add_usb(void *base, int id, struct imxusb_platformdata *pdata) { return imx_add_device("imx-usb", id, base, 0x200, pdata); } diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c index 8de20ed423..e5698f438b 100644 --- a/arch/arm/mach-imx/esdctl.c +++ b/arch/arm/mach-imx/esdctl.c @@ -568,7 +568,7 @@ static int imx7d_ddrc_add_mem(void *mmdcbase, struct imx_esdctl_data *data) imx7d_ddrc_sdram_size(mmdcbase)); } -static int imx_esdctl_probe(struct device_d *dev) +static int imx_esdctl_probe(struct device *dev) { struct resource *iores; struct imx_esdctl_data *data; diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c index 638f329c37..cab60aac7f 100644 --- a/arch/arm/mach-imx/iim.c +++ b/arch/arm/mach-imx/iim.c @@ -43,7 +43,7 @@ struct iim_bank { }; struct iim_priv { - struct device_d dev; + struct device dev; void __iomem *base; void __iomem *bankbase; struct iim_bank *bank[IIM_NUM_BANKS]; @@ -404,7 +404,7 @@ static void imx_iim_add_mac_param(struct iim_priv *iim, int macnum, int bank, in */ #define MAC_ADDRESS_PROPLEN (3 * sizeof(__be32)) -static void imx_iim_init_dt(struct device_d *dev, struct iim_priv *iim) +static void imx_iim_init_dt(struct device *dev, struct iim_priv *iim) { char mac[6]; const __be32 *prop; @@ -442,12 +442,12 @@ static void imx_iim_init_dt(struct device_d *dev, struct iim_priv *iim) } } #else -static inline void imx_iim_init_dt(struct device_d *dev, struct iim_priv *iim) +static inline void imx_iim_init_dt(struct device *dev, struct iim_priv *iim) { } #endif -static int imx_iim_probe(struct device_d *dev) +static int imx_iim_probe(struct device *dev) { struct resource *iores; struct iim_priv *iim; 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); diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c index 8272d5b720..fbbea6bd47 100644 --- a/arch/arm/mach-imx/src.c +++ b/arch/arm/mach-imx/src.c @@ -10,7 +10,7 @@ #define SCR_WARM_RESET_ENABLE BIT(0) -static int imx_src_reset_probe(struct device_d *dev) +static int imx_src_reset_probe(struct device *dev) { struct resource *res; u32 val; diff --git a/arch/arm/mach-mxs/include/mach/devices.h b/arch/arm/mach-mxs/include/mach/devices.h index 4743a4a8c0..c23f484973 100644 --- a/arch/arm/mach-mxs/include/mach/devices.h +++ b/arch/arm/mach-mxs/include/mach/devices.h @@ -9,7 +9,7 @@ #include <driver.h> #include <mach/imx-regs.h> -static inline struct device_d *mxs_add_nand(unsigned long gpmi_base, unsigned long bch_base) +static inline struct device *mxs_add_nand(unsigned long gpmi_base, unsigned long bch_base) { struct resource res[] = { { @@ -23,7 +23,7 @@ static inline struct device_d *mxs_add_nand(unsigned long gpmi_base, unsigned lo }, }; - 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)); @@ -36,12 +36,12 @@ static inline struct device_d *mxs_add_nand(unsigned long gpmi_base, unsigned lo return dev; }; -static inline struct device_d *imx23_add_nand(void) +static inline struct device *imx23_add_nand(void) { return mxs_add_nand(MXS_GPMI_BASE, MXS_BCH_BASE); } -static inline struct device_d *imx28_add_nand(void) +static inline struct device *imx28_add_nand(void) { return mxs_add_nand(MXS_GPMI_BASE, MXS_BCH_BASE); } diff --git a/arch/arm/mach-mxs/ocotp.c b/arch/arm/mach-mxs/ocotp.c index 9bcd913cc1..1a094c6f98 100644 --- a/arch/arm/mach-mxs/ocotp.c +++ b/arch/arm/mach-mxs/ocotp.c @@ -36,7 +36,7 @@ #define OCOTP_WORD_OFFSET 0x20 struct ocotp_priv { - struct device_d dev; + struct device dev; struct cdev cdev; void __iomem *base; unsigned int write_enable; @@ -169,7 +169,7 @@ static struct cdev_operations mxs_ocotp_ops = { .read = mxs_ocotp_cdev_read, }; -static int mxs_ocotp_probe(struct device_d *dev) +static int mxs_ocotp_probe(struct device *dev) { struct resource *iores; int err; 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; } diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 16f45273af..4c43f6374e 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c @@ -17,35 +17,35 @@ #include <mach/devices.h> #include <mach/pxafb.h> -static inline struct device_d *pxa_add_device(char *name, int id, void *base, +static inline struct device *pxa_add_device(char *name, int id, void *base, int size, void *pdata) { return add_generic_device(name, id, NULL, (resource_size_t)base, size, IORESOURCE_MEM, pdata); } -struct device_d *pxa_add_i2c(void *base, int id, +struct device *pxa_add_i2c(void *base, int id, struct i2c_platform_data *pdata) { return pxa_add_device("i2c-pxa", id, base, 0x1000, pdata); } -struct device_d *pxa_add_uart(void *base, int id) +struct device *pxa_add_uart(void *base, int id) { return pxa_add_device("pxa_serial", id, base, 0x1000, NULL); } -struct device_d *pxa_add_fb(void *base, struct pxafb_platform_data *pdata) +struct device *pxa_add_fb(void *base, struct pxafb_platform_data *pdata) { return pxa_add_device("pxafb", -1, base, 0x1000, pdata); } -struct device_d *pxa_add_mmc(void *base, int id, void *pdata) +struct device *pxa_add_mmc(void *base, int id, void *pdata) { return pxa_add_device("pxa-mmc", id, base, 0x1000, pdata); } -struct device_d *pxa_add_pwm(void *base, int id) +struct device *pxa_add_pwm(void *base, int id) { return pxa_add_device("pxa_pwm", id, base, 0x10, NULL); } diff --git a/arch/arm/mach-pxa/include/mach/devices.h b/arch/arm/mach-pxa/include/mach/devices.h index 0f2e38dbae..a50a1862d0 100644 --- a/arch/arm/mach-pxa/include/mach/devices.h +++ b/arch/arm/mach-pxa/include/mach/devices.h @@ -15,9 +15,9 @@ #include <i2c/i2c.h> #include <mach/pxafb.h> -struct device_d *pxa_add_i2c(void *base, int id, +struct device *pxa_add_i2c(void *base, int id, struct i2c_platform_data *pdata); -struct device_d *pxa_add_uart(void *base, int id); -struct device_d *pxa_add_fb(void *base, struct pxafb_platform_data *pdata); -struct device_d *pxa_add_mmc(void *base, int id, void *pdata); -struct device_d *pxa_add_pwm(void *base, int id); +struct device *pxa_add_uart(void *base, int id); +struct device *pxa_add_fb(void *base, struct pxafb_platform_data *pdata); +struct device *pxa_add_mmc(void *base, int id, void *pdata); +struct device *pxa_add_pwm(void *base, int id); diff --git a/arch/arm/mach-pxa/include/mach/mci_pxa2xx.h b/arch/arm/mach-pxa/include/mach/mci_pxa2xx.h index e5bc211ea8..299e543479 100644 --- a/arch/arm/mach-pxa/include/mach/mci_pxa2xx.h +++ b/arch/arm/mach-pxa/include/mach/mci_pxa2xx.h @@ -2,11 +2,11 @@ struct mci_host; -struct device_d; +struct device; struct pxamci_platform_data { int gpio_power; int gpio_power_invert; - int (*init)(struct mci_host*, struct device_d*); + int (*init)(struct mci_host*, struct device*); int (*setpower)(struct mci_host*, int on); }; diff --git a/arch/arm/mach-socfpga/cyclone5-generic.c b/arch/arm/mach-socfpga/cyclone5-generic.c index c494f048ec..5931653a63 100644 --- a/arch/arm/mach-socfpga/cyclone5-generic.c +++ b/arch/arm/mach-socfpga/cyclone5-generic.c @@ -62,7 +62,7 @@ static struct cadence_qspi_platform_data qspi_pdata = { static void add_cadence_qspi_device(int id, resource_size_t ctrl, resource_size_t data, void *pdata) { - struct device_d *dev; + struct device *dev; struct resource *res; res = xzalloc(sizeof(struct resource) * 2); @@ -102,7 +102,7 @@ static struct NS16550_plat uart_pdata = { void socfpga_cyclone5_uart_init(void) { - struct device_d *dev; + struct device *dev; clks[uart] = clk_fixed("uart", 100000000); clkdev_add_physbase(clks[uart], CYCLONE5_UART0_ADDRESS, NULL); @@ -115,7 +115,7 @@ void socfpga_cyclone5_uart_init(void) void socfpga_cyclone5_timer_init(void) { - struct device_d *dev; + struct device *dev; clks[timer] = clk_fixed("timer", 200000000); clkdev_add_physbase(clks[timer], CYCLONE5_SMP_TWD_ADDRESS, NULL); diff --git a/arch/arm/mach-stm32mp/ddrctrl.c b/arch/arm/mach-stm32mp/ddrctrl.c index 31bddba764..ce45155420 100644 --- a/arch/arm/mach-stm32mp/ddrctrl.c +++ b/arch/arm/mach-stm32mp/ddrctrl.c @@ -129,7 +129,7 @@ void __noreturn stm32mp1_barebox_entry(void *boarddata) } -static int stm32mp1_ddr_probe(struct device_d *dev) +static int stm32mp1_ddr_probe(struct device *dev) { struct resource *iores; void __iomem *base; diff --git a/arch/arm/mach-tegra/tegra20-pmc.c b/arch/arm/mach-tegra/tegra20-pmc.c index a252c995ea..5c6327047f 100644 --- a/arch/arm/mach-tegra/tegra20-pmc.c +++ b/arch/arm/mach-tegra/tegra20-pmc.c @@ -200,7 +200,7 @@ static void tegra20_pmc_detect_reset_cause(void) } } -static int tegra20_pmc_probe(struct device_d *dev) +static int tegra20_pmc_probe(struct device *dev) { struct resource *iores; iores = dev_request_mem_resource(dev, 0); diff --git a/arch/arm/mach-tegra/tegra20-timer.c b/arch/arm/mach-tegra/tegra20-timer.c index 8ca8cb24fa..287c83aa9c 100644 --- a/arch/arm/mach-tegra/tegra20-timer.c +++ b/arch/arm/mach-tegra/tegra20-timer.c @@ -44,7 +44,7 @@ static struct clocksource cs = { .priority = 80, }; -static int tegra20_timer_probe(struct device_d *dev) +static int tegra20_timer_probe(struct device *dev) { struct resource *iores; u32 reg; diff --git a/arch/arm/mach-zynqmp/firmware-zynqmp.c b/arch/arm/mach-zynqmp/firmware-zynqmp.c index 0d1eb5b137..5e1017fa8f 100644 --- a/arch/arm/mach-zynqmp/firmware-zynqmp.c +++ b/arch/arm/mach-zynqmp/firmware-zynqmp.c @@ -577,7 +577,7 @@ const struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void) EXPORT_SYMBOL_GPL(zynqmp_pm_get_eemi_ops); -static int zynqmp_firmware_probe(struct device_d *dev) +static int zynqmp_firmware_probe(struct device *dev) { int ret; diff --git a/arch/kvx/lib/poweroff.c b/arch/kvx/lib/poweroff.c index f2683a5835..bcdb43d82c 100644 --- a/arch/kvx/lib/poweroff.c +++ b/arch/kvx/lib/poweroff.c @@ -20,7 +20,7 @@ static void __noreturn kvx_poweroff(struct poweroff_handler *handler) hang(); } -static int kvx_scall_poweroff_probe(struct device_d *dev) +static int kvx_scall_poweroff_probe(struct device *dev) { poweroff_handler_register_fn(kvx_poweroff); diff --git a/arch/mips/mach-ar231x/ar231x_reset.c b/arch/mips/mach-ar231x/ar231x_reset.c index 91414edd26..bdaceb65b2 100644 --- a/arch/mips/mach-ar231x/ar231x_reset.c +++ b/arch/mips/mach-ar231x/ar231x_reset.c @@ -48,7 +48,7 @@ void ar231x_reset_bit(u32 val, enum reset_state state) } EXPORT_SYMBOL(ar231x_reset_bit); -static int ar231x_reset_probe(struct device_d *dev) +static int ar231x_reset_probe(struct device *dev) { struct resource *iores; iores = dev_request_mem_resource(dev, 0); diff --git a/arch/mips/mach-ath79/art.c b/arch/mips/mach-ath79/art.c index de9f638e1c..c1a9263559 100644 --- a/arch/mips/mach-ath79/art.c +++ b/arch/mips/mach-ath79/art.c @@ -18,7 +18,7 @@ struct ar9300_eeprom { u8 mac_addr[6]; }; -static int art_set_mac(struct device_d *dev, struct ar9300_eeprom *eeprom) +static int art_set_mac(struct device *dev, struct ar9300_eeprom *eeprom) { struct device_node *node = dev->of_node; struct device_node *rnode; @@ -36,7 +36,7 @@ static int art_set_mac(struct device_d *dev, struct ar9300_eeprom *eeprom) return 0; } -static int art_read_mac(struct device_d *dev, const char *file) +static int art_read_mac(struct device *dev, const char *file) { int fd, rbytes; struct ar9300_eeprom eeprom; @@ -73,7 +73,7 @@ static int art_read_mac(struct device_d *dev, const char *file) return art_set_mac(dev, &eeprom); } -static int art_probe(struct device_d *dev) +static int art_probe(struct device *dev) { char *path; int ret; diff --git a/arch/mips/mach-xburst/include/mach/devices.h b/arch/mips/mach-xburst/include/mach/devices.h index 1e5e9476aa..ea567a3161 100644 --- a/arch/mips/mach-xburst/include/mach/devices.h +++ b/arch/mips/mach-xburst/include/mach/devices.h @@ -5,6 +5,6 @@ #include <driver.h> -struct device_d *jz_add_uart(int id, unsigned long base, unsigned int clock); +struct device *jz_add_uart(int id, unsigned long base, unsigned int clock); #endif /* __MACH_XBURST_DEVICES_H */ diff --git a/arch/riscv/boards/beaglev/board.c b/arch/riscv/boards/beaglev/board.c index 110754ea95..b8606410f1 100644 --- a/arch/riscv/boards/beaglev/board.c +++ b/arch/riscv/boards/beaglev/board.c @@ -8,7 +8,7 @@ #include <bbu.h> #include <envfs.h> -static int beaglev_probe(struct device_d *dev) +static int beaglev_probe(struct device *dev) { barebox_set_hostname("beaglev-starlight"); diff --git a/arch/riscv/boards/riscvemu/board.c b/arch/riscv/boards/riscvemu/board.c index e735d7e05e..0eb68cdbf4 100644 --- a/arch/riscv/boards/riscvemu/board.c +++ b/arch/riscv/boards/riscvemu/board.c @@ -35,7 +35,7 @@ static void __noreturn riscvemu_restart(struct restart_handler *rst) extern char __dtb_overlay_of_sram_start[]; -static int riscvemu_probe(struct device_d *dev) +static int riscvemu_probe(struct device *dev) { struct device_node *of_chosen; struct device_node *overlay; diff --git a/arch/riscv/cpu/core.c b/arch/riscv/cpu/core.c index 02b13ada4b..ce073af307 100644 --- a/arch/riscv/cpu/core.c +++ b/arch/riscv/cpu/core.c @@ -32,8 +32,8 @@ static int riscv_request_stack(void) } coredevice_initcall(riscv_request_stack); -static struct device_d timer_dev; -static struct device_d serial_sbi_dev; +static struct device timer_dev; +static struct device serial_sbi_dev; static s64 hartid; @@ -60,7 +60,7 @@ static int riscv_fixup_cpus(struct device_node *root, void *context) return 0; } -static int riscv_probe(struct device_d *parent) +static int riscv_probe(struct device *parent) { int ret; diff --git a/arch/sandbox/board/board.c b/arch/sandbox/board/board.c index 43e355afe8..7857ede5c6 100644 --- a/arch/sandbox/board/board.c +++ b/arch/sandbox/board/board.c @@ -29,23 +29,23 @@ struct fb_videomode mode = { .yres = 480, }; -static struct device_d tap_device = { +static struct device tap_device = { .id = DEVICE_ID_DYNAMIC, .name = "tap", }; -static struct device_d sdl_device = { +static struct device sdl_device = { .id = DEVICE_ID_DYNAMIC, .name = "sdlfb", .platform_data = &mode, }; -static struct device_d devrandom_device = { +static struct device devrandom_device = { .id = DEVICE_ID_DYNAMIC, .name = "devrandom", }; -static int devices_init(struct device_d *dev) +static int devices_init(struct device *dev) { platform_device_register(&tap_device); diff --git a/arch/sandbox/board/console.c b/arch/sandbox/board/console.c index cea62d57b1..274ef67aef 100644 --- a/arch/sandbox/board/console.c +++ b/arch/sandbox/board/console.c @@ -21,10 +21,10 @@ int barebox_register_console(int stdinfd, int stdoutfd) { - struct device_d *dev; + struct device *dev; struct linux_console_data *data; - dev = xzalloc(sizeof(struct device_d) + sizeof(struct linux_console_data)); + dev = xzalloc(sizeof(struct device) + sizeof(struct linux_console_data)); data = (struct linux_console_data *)(dev + 1); diff --git a/arch/sandbox/board/devices.c b/arch/sandbox/board/devices.c index f7305a8ead..ecd24e9207 100644 --- a/arch/sandbox/board/devices.c +++ b/arch/sandbox/board/devices.c @@ -14,7 +14,7 @@ unsigned char __pci_iobase[IO_SPACE_LIMIT]; static LIST_HEAD(sandbox_device_list); -int sandbox_add_device(struct device_d *dev) +int sandbox_add_device(struct device *dev) { list_add(&dev->list, &sandbox_device_list); @@ -23,7 +23,7 @@ int sandbox_add_device(struct device_d *dev) static int sandbox_device_init(void) { - struct device_d *dev, *tmp; + struct device *dev, *tmp; list_for_each_entry_safe(dev, tmp, &sandbox_device_list, list) { /* reset the list_head before registering for real */ diff --git a/arch/sandbox/board/hostfile.c b/arch/sandbox/board/hostfile.c index d04925d6d4..a6273664d3 100644 --- a/arch/sandbox/board/hostfile.c +++ b/arch/sandbox/board/hostfile.c @@ -89,14 +89,14 @@ static struct block_device_ops hf_blk_ops = { .write = hf_blk_write, }; -static void hf_info(struct device_d *dev) +static void hf_info(struct device *dev) { struct hf_priv *priv = dev->priv; printf("file: %s\n", priv->filename); } -static int hf_probe(struct device_d *dev) +static int hf_probe(struct device *dev) { struct device_node *np = dev->of_node; struct hf_priv *priv = xzalloc(sizeof(*priv)); diff --git a/arch/sandbox/board/led.c b/arch/sandbox/board/led.c index a4d5b3e89a..02f181b382 100644 --- a/arch/sandbox/board/led.c +++ b/arch/sandbox/board/led.c @@ -26,7 +26,7 @@ static void sandbox_led_set(struct led *led, unsigned int brightness) sandbox_led.active = true; } -static int sandbox_led_of_probe(struct device_d *dev) +static int sandbox_led_of_probe(struct device *dev) { struct device_node *np = dev->of_node; int ret; @@ -47,7 +47,7 @@ static int sandbox_led_of_probe(struct device_d *dev) return 0; } -static void sandbox_led_of_remove(struct device_d *dev) +static void sandbox_led_of_remove(struct device *dev) { if (sandbox_led.active) sandbox_led_set(NULL, 0); diff --git a/arch/sandbox/board/power.c b/arch/sandbox/board/power.c index 071a7fd907..ba5ab88a81 100644 --- a/arch/sandbox/board/power.c +++ b/arch/sandbox/board/power.c @@ -38,7 +38,7 @@ static void sandbox_rst_reexec(struct restart_handler *rst) linux_reexec(); } -static int sandbox_power_probe(struct device_d *dev) +static int sandbox_power_probe(struct device *dev) { struct sandbox_power *power = xzalloc(sizeof(*power)); size_t len; diff --git a/arch/sandbox/board/watchdog.c b/arch/sandbox/board/watchdog.c index 24e556a918..d54661018d 100644 --- a/arch/sandbox/board/watchdog.c +++ b/arch/sandbox/board/watchdog.c @@ -36,7 +36,7 @@ static int sandbox_watchdog_set_timeout(struct watchdog *wdd, unsigned int timeo return 0; } -static int sandbox_watchdog_probe(struct device_d *dev) +static int sandbox_watchdog_probe(struct device *dev) { struct device_node *np = dev->of_node; struct sandbox_watchdog *wd; diff --git a/arch/sandbox/mach-sandbox/include/mach/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h index 1584d8065c..028bc2fa90 100644 --- a/arch/sandbox/mach-sandbox/include/mach/linux.h +++ b/arch/sandbox/mach-sandbox/include/mach/linux.h @@ -5,9 +5,9 @@ struct hf_info; -struct device_d; +struct device; -int sandbox_add_device(struct device_d *dev); +int sandbox_add_device(struct device *dev); struct fb_bitfield; diff --git a/arch/x86/mach-efi/clocksource.c b/arch/x86/mach-efi/clocksource.c index 3d01ff9d1e..c7e557d7a2 100644 --- a/arch/x86/mach-efi/clocksource.c +++ b/arch/x86/mach-efi/clocksource.c @@ -6,7 +6,7 @@ static int efi_x86_pure_init(void) { - struct device_d *dev = device_alloc("efi-cs-x86", DEVICE_ID_SINGLE); + struct device *dev = device_alloc("efi-cs-x86", DEVICE_ID_SINGLE); return platform_device_register(dev); } |