* [PATCH 0/5] Rename some structs
@ 2022-12-14 12:35 Sascha Hauer
2022-12-14 12:35 ` [PATCH 1/5] Rename device_d::device_node to device_d::of_node Sascha Hauer
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Sascha Hauer @ 2022-12-14 12:35 UTC (permalink / raw)
To: Barebox List
Several barebox struct names have a '_d' suffix. The suffix was
originally added to struct device_d in case we may want to import
Linux struct device as a separate struct. That never happened, instead
barebox struct device_d basically is the same as Linux struct device,
so rename it accordingly. While at it remove the unnecessary '_d'
suffixes from other struct names as well.
Also, Linux uses 'of_node' for the device_node * inside struct device.
Rename this in barebox to match the Linux name to make porting code
from Linux easier.
Sascha
Sascha Hauer (5):
Rename device_d::device_node to device_d::of_node
Rename struct device_d to device
Rename struct driver_d to driver
Rename struct fs_device_d to fs_device
Rename struct fs_driver_d to fs_driver
Documentation/devel/porting.rst | 3 +-
arch/arm/boards/animeo_ip/init.c | 4 +-
arch/arm/boards/at91sam9m10ihd/hw_version.c | 2 +-
arch/arm/boards/at91sam9x5ek/hw_version.c | 2 +-
arch/arm/boards/embest-marsboard/board.c | 4 +-
.../boards/freescale-mx6-sabrelite/board.c | 4 +-
arch/arm/boards/grinn-liteboard/board.c | 2 +-
arch/arm/boards/innocomm-imx8mm-wb15/board.c | 4 +-
arch/arm/boards/kindle-mx50/board.c | 2 +-
arch/arm/boards/lxa-mc1/board.c | 4 +-
arch/arm/boards/mnt-reform/board.c | 4 +-
arch/arm/boards/nhk8815/setup.c | 2 +-
arch/arm/boards/nxp-imx8mm-evk/board.c | 4 +-
arch/arm/boards/nxp-imx8mn-evk/board.c | 4 +-
arch/arm/boards/nxp-imx8mp-evk/board.c | 4 +-
arch/arm/boards/phytec-phycore-imx27/pcm970.c | 2 +-
.../boards/phytec-phycore-stm32mp1/board.c | 4 +-
arch/arm/boards/phytec-som-imx6/board.c | 4 +-
arch/arm/boards/pine64-quartz64/board.c | 4 +-
arch/arm/boards/protonic-imx6/board.c | 22 +-
arch/arm/boards/protonic-imx8m/board.c | 4 +-
arch/arm/boards/protonic-stm32mp1/board.c | 4 +-
arch/arm/boards/radxa-rock3/board.c | 4 +-
arch/arm/boards/raspberry-pi/rpi-common.c | 6 +-
.../boards/rockchip-rk3568-bpi-r2pro/board.c | 4 +-
arch/arm/boards/rockchip-rk3568-evb/board.c | 4 +-
arch/arm/boards/sama5d3_xplained/board.c | 4 +-
arch/arm/boards/sama5d3xek/hw_version.c | 2 +-
arch/arm/boards/seeed-odyssey/board.c | 4 +-
arch/arm/boards/skov-arm9cpu/board.c | 4 +-
arch/arm/boards/skov-imx6/board.c | 10 +-
arch/arm/boards/stm32mp15x-ev1/board.c | 4 +-
arch/arm/boards/stm32mp15xx-dkx/board.c | 4 +-
arch/arm/boards/tqma6ulx/board.c | 4 +-
arch/arm/boards/tqma8mpxl/board.c | 4 +-
arch/arm/boards/usb-a926x/init.c | 2 +-
arch/arm/boards/vexpress/init.c | 4 +-
arch/arm/boards/webasto-ccbv2/board.c | 4 +-
arch/arm/boards/zii-common/board.c | 2 +-
arch/arm/boards/zii-common/switch-cmd.c | 2 +-
arch/arm/boards/zii-imx8mq-dev/board.c | 2 +-
arch/arm/cpu/psci-client.c | 6 +-
arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
arch/arm/mach-at91/at91sam9_rst.c | 6 +-
arch/arm/mach-at91/ddramc.c | 4 +-
arch/arm/mach-at91/generic.h | 8 +-
arch/arm/mach-at91/include/mach/board.h | 4 +-
arch/arm/mach-at91/sam9_smc.c | 4 +-
arch/arm/mach-at91/setup.c | 2 +-
arch/arm/mach-clps711x/clock.c | 6 +-
arch/arm/mach-clps711x/common.c | 14 +-
arch/arm/mach-imx/devices.c | 36 +--
arch/arm/mach-imx/esdctl.c | 4 +-
arch/arm/mach-imx/iim.c | 12 +-
arch/arm/mach-imx/include/mach/devices-imx1.h | 4 +-
.../arm/mach-imx/include/mach/devices-imx21.h | 12 +-
.../arm/mach-imx/include/mach/devices-imx25.h | 32 +-
.../arm/mach-imx/include/mach/devices-imx27.h | 34 +--
.../arm/mach-imx/include/mach/devices-imx31.h | 36 +--
.../arm/mach-imx/include/mach/devices-imx35.h | 28 +-
.../arm/mach-imx/include/mach/devices-imx50.h | 32 +-
.../arm/mach-imx/include/mach/devices-imx51.h | 38 +--
.../arm/mach-imx/include/mach/devices-imx53.h | 34 +--
arch/arm/mach-imx/include/mach/devices-imx6.h | 36 +--
arch/arm/mach-imx/include/mach/devices.h | 34 +--
arch/arm/mach-imx/src.c | 4 +-
arch/arm/mach-mxs/include/mach/devices.h | 8 +-
arch/arm/mach-mxs/ocotp.c | 6 +-
arch/arm/mach-omap/am33xx_generic.c | 2 +-
arch/arm/mach-omap/am33xx_scrm.c | 4 +-
arch/arm/mach-omap/include/mach/devices.h | 4 +-
.../mach-omap/include/mach/omap3-devices.h | 30 +-
.../mach-omap/include/mach/omap4-devices.h | 26 +-
arch/arm/mach-omap/omap_devices.c | 6 +-
arch/arm/mach-pxa/devices.c | 12 +-
arch/arm/mach-pxa/include/mach/devices.h | 10 +-
arch/arm/mach-pxa/include/mach/mci_pxa2xx.h | 4 +-
arch/arm/mach-socfpga/cyclone5-generic.c | 6 +-
arch/arm/mach-stm32mp/ddrctrl.c | 4 +-
arch/arm/mach-tegra/tegra20-pmc.c | 4 +-
arch/arm/mach-tegra/tegra20-timer.c | 4 +-
arch/arm/mach-zynqmp/firmware-zynqmp.c | 8 +-
arch/kvx/lib/poweroff.c | 4 +-
arch/mips/mach-ar231x/ar231x_reset.c | 4 +-
arch/mips/mach-ath79/art.c | 12 +-
arch/mips/mach-xburst/include/mach/devices.h | 2 +-
arch/riscv/boards/beaglev/board.c | 4 +-
arch/riscv/boards/riscvemu/board.c | 6 +-
arch/riscv/cpu/core.c | 12 +-
arch/sandbox/board/board.c | 10 +-
arch/sandbox/board/console.c | 4 +-
arch/sandbox/board/devices.c | 4 +-
arch/sandbox/board/hostfile.c | 8 +-
arch/sandbox/board/led.c | 8 +-
arch/sandbox/board/power.c | 7 +-
arch/sandbox/board/watchdog.c | 9 +-
.../sandbox/mach-sandbox/include/mach/linux.h | 4 +-
arch/x86/mach-efi/clocksource.c | 2 +-
commands/detect.c | 2 +-
commands/devinfo.c | 12 +-
commands/devunbind.c | 2 +-
commands/drvinfo.c | 4 +-
commands/gpio.c | 2 +-
commands/miitool.c | 2 +-
commands/mount.c | 6 +-
common/blspec.c | 12 +-
common/boards/qemu-virt/board.c | 6 +-
common/complete.c | 6 +-
common/console.c | 6 +-
common/console_common.c | 6 +-
common/efi/payload/init.c | 2 +-
common/env.c | 4 +-
common/globalvar.c | 32 +-
common/oftree.c | 6 +-
common/partitions/efi.c | 3 +-
common/reset_source.c | 10 +-
common/serdev.c | 4 +-
common/state/backend_bucket_circular.c | 4 +-
common/state/backend_bucket_direct.c | 4 +-
common/state/backend_format_dtb.c | 4 +-
common/state/backend_format_raw.c | 4 +-
common/state/state.h | 14 +-
common/usbgadget.c | 2 +-
drivers/aiodev/am335x_adc.c | 6 +-
drivers/aiodev/core.c | 12 +-
drivers/aiodev/imx7d_adc.c | 14 +-
drivers/aiodev/imx_thermal.c | 8 +-
drivers/aiodev/lm75.c | 6 +-
drivers/aiodev/mc13xxx_adc.c | 2 +-
drivers/aiodev/qoriq_thermal.c | 10 +-
drivers/aiodev/rockchip_saradc.c | 4 +-
drivers/aiodev/st_gyro.c | 4 +-
drivers/aiodev/stm32-adc-core.c | 8 +-
drivers/aiodev/stm32-adc.c | 22 +-
drivers/amba/bus.c | 8 +-
drivers/ata/ahci.c | 8 +-
drivers/ata/ahci.h | 4 +-
drivers/ata/disk_ata_drive.c | 6 +-
drivers/ata/intf_platform_ide.c | 6 +-
drivers/ata/pata-imx.c | 8 +-
drivers/ata/sata-imx.c | 4 +-
drivers/ata/sata_mv.c | 4 +-
drivers/base/bus.c | 10 +-
drivers/base/driver.c | 95 +++---
drivers/base/platform.c | 8 +-
drivers/base/power.c | 10 +-
drivers/base/regmap/internal.h | 4 +-
drivers/base/regmap/regmap-mmio.c | 8 +-
drivers/base/regmap/regmap.c | 12 +-
drivers/base/resource.c | 28 +-
drivers/block/efi-block-io.c | 8 +-
drivers/bus/acpi.c | 16 +-
drivers/bus/imx-weim.c | 12 +-
drivers/bus/omap-gpmc.c | 16 +-
drivers/bus/ti-sysc.c | 8 +-
drivers/clk/bcm/clk-bcm2835-aux.c | 8 +-
drivers/clk/clk-ar933x.c | 6 +-
drivers/clk/clk-ar9344.c | 6 +-
drivers/clk/clk-bulk.c | 10 +-
drivers/clk/clk-composite.c | 18 +-
drivers/clk/clk-divider.c | 44 +--
drivers/clk/clk-fixed-factor.c | 16 +-
drivers/clk/clk-fixed.c | 2 +-
drivers/clk/clk-gate.c | 8 +-
drivers/clk/clk-mux.c | 22 +-
drivers/clk/clk-rpi.c | 10 +-
drivers/clk/clk-scmi.c | 9 +-
drivers/clk/clk-stm32f4.c | 23 +-
drivers/clk/clk-stm32mp1.c | 50 +--
drivers/clk/clk.c | 2 +-
drivers/clk/clkdev.c | 8 +-
drivers/clk/imx/clk-imx1.c | 4 +-
drivers/clk/imx/clk-imx21.c | 4 +-
drivers/clk/imx/clk-imx25.c | 4 +-
drivers/clk/imx/clk-imx27.c | 4 +-
drivers/clk/imx/clk-imx31.c | 4 +-
drivers/clk/imx/clk-imx35.c | 4 +-
drivers/clk/imx/clk-imx5.c | 27 +-
drivers/clk/imx/clk-imx6.c | 8 +-
drivers/clk/imx/clk-imx6sl.c | 6 +-
drivers/clk/imx/clk-imx6sx.c | 6 +-
drivers/clk/imx/clk-imx6ul.c | 6 +-
drivers/clk/imx/clk-imx7.c | 8 +-
drivers/clk/loongson/clk-ls1b200.c | 6 +-
drivers/clk/mvebu/common.c | 12 +-
drivers/clk/mvebu/corediv.c | 6 +-
drivers/clk/mxs/clk-imx23.c | 4 +-
drivers/clk/mxs/clk-imx28.c | 11 +-
drivers/clk/rockchip/clk-rk3399.c | 6 +-
drivers/clk/rockchip/clk-rk3568.c | 6 +-
drivers/clk/sifive/sifive-prci.c | 10 +-
drivers/clk/socfpga/clk.c | 9 +-
drivers/clk/starfive/jh7100-clkgen.c | 8 +-
drivers/clk/tegra/clk-tegra124.c | 8 +-
drivers/clk/tegra/clk-tegra20.c | 8 +-
drivers/clk/tegra/clk-tegra30.c | 8 +-
drivers/clk/zynq/clkc.c | 8 +-
drivers/clk/zynqmp/clkc.c | 10 +-
drivers/clocksource/arm_architected_timer.c | 4 +-
drivers/clocksource/arm_global_timer.c | 4 +-
drivers/clocksource/arm_smp_twd.c | 4 +-
drivers/clocksource/armv7m_systick.c | 6 +-
drivers/clocksource/bcm2835.c | 6 +-
drivers/clocksource/clps711x.c | 6 +-
drivers/clocksource/digic.c | 4 +-
drivers/clocksource/dw_apb_timer.c | 6 +-
drivers/clocksource/efi.c | 4 +-
drivers/clocksource/efi_x86.c | 4 +-
drivers/clocksource/kvx_timer.c | 4 +-
drivers/clocksource/mvebu.c | 6 +-
drivers/clocksource/nomadik.c | 4 +-
drivers/clocksource/orion.c | 4 +-
drivers/clocksource/rk_timer.c | 4 +-
drivers/clocksource/timer-atmel-pit.c | 4 +-
drivers/clocksource/timer-clint.c | 4 +-
drivers/clocksource/timer-imx-gpt.c | 4 +-
drivers/clocksource/timer-riscv.c | 4 +-
drivers/clocksource/timer-stm32.c | 4 +-
drivers/clocksource/timer-ti-32k.c | 4 +-
drivers/clocksource/timer-ti-dm.c | 4 +-
drivers/clocksource/uemd.c | 4 +-
drivers/crypto/caam/caam-blobgen.c | 8 +-
drivers/crypto/caam/caamrng.c | 10 +-
drivers/crypto/caam/ctrl.c | 18 +-
drivers/crypto/caam/error.c | 16 +-
drivers/crypto/caam/error.h | 2 +-
drivers/crypto/caam/intern.h | 14 +-
drivers/crypto/caam/jr.c | 12 +-
drivers/crypto/caam/jr.h | 4 +-
drivers/crypto/caam/rng_self_test.c | 6 +-
drivers/crypto/caam/rng_self_test.h | 3 +-
drivers/crypto/imx-scc/scc-blobgen.c | 2 +-
drivers/crypto/imx-scc/scc.c | 6 +-
drivers/crypto/imx-scc/scc.h | 2 +-
drivers/dma/apbh_dma.c | 4 +-
drivers/dma/map.c | 9 +-
drivers/eeprom/at24.c | 18 +-
drivers/eeprom/at25.c | 12 +-
drivers/efi/efi-device.c | 20 +-
drivers/firmware/altera_serial.c | 22 +-
drivers/firmware/arm_scmi/base.c | 4 +-
drivers/firmware/arm_scmi/bus.c | 16 +-
drivers/firmware/arm_scmi/common.h | 12 +-
drivers/firmware/arm_scmi/driver.c | 26 +-
drivers/firmware/arm_scmi/smc.c | 12 +-
drivers/firmware/arm_scmi/voltage.c | 4 +-
drivers/firmware/socfpga.c | 10 +-
drivers/firmware/zynqmp-fpga.c | 16 +-
drivers/fpga/fpga-bridge.c | 8 +-
drivers/fpga/socfpga-fpga2sdram-bridge.c | 6 +-
drivers/fpga/socfpga-hps2fpga-bridge.c | 10 +-
drivers/gpio/gpio-74164.c | 10 +-
drivers/gpio/gpio-74xx-mmio.c | 4 +-
drivers/gpio/gpio-ath79.c | 6 +-
drivers/gpio/gpio-clps711x.c | 6 +-
drivers/gpio/gpio-davinci.c | 6 +-
drivers/gpio/gpio-digic.c | 4 +-
drivers/gpio/gpio-dw.c | 10 +-
drivers/gpio/gpio-generic.c | 18 +-
drivers/gpio/gpio-imx.c | 6 +-
drivers/gpio/gpio-jz4740.c | 4 +-
drivers/gpio/gpio-latch.c | 6 +-
drivers/gpio/gpio-libftdi1.c | 12 +-
drivers/gpio/gpio-malta-fpga-i2c.c | 4 +-
drivers/gpio/gpio-mpc8xxx.c | 8 +-
drivers/gpio/gpio-mxs.c | 6 +-
drivers/gpio/gpio-omap.c | 6 +-
drivers/gpio/gpio-orion.c | 8 +-
drivers/gpio/gpio-pca953x.c | 4 +-
drivers/gpio/gpio-pcf857x.c | 6 +-
drivers/gpio/gpio-raspberrypi-exp.c | 4 +-
drivers/gpio/gpio-sifive.c | 6 +-
drivers/gpio/gpio-starfive-vic.c | 4 +-
drivers/gpio/gpio-stmpe.c | 4 +-
drivers/gpio/gpio-sx150x.c | 4 +-
drivers/gpio/gpio-tegra.c | 4 +-
drivers/gpio/gpio-vf610.c | 10 +-
drivers/gpio/gpio-zynq.c | 6 +-
drivers/gpio/gpiolib.c | 24 +-
drivers/hw_random/core.c | 6 +-
drivers/hw_random/dev-random.c | 4 +-
drivers/hw_random/mxc-rngc.c | 6 +-
drivers/hw_random/starfive-vic-rng.c | 6 +-
drivers/hw_random/stm32-rng.c | 6 +-
drivers/i2c/algos/i2c-algo-bit.c | 2 +-
drivers/i2c/busses/i2c-at91.c | 8 +-
drivers/i2c/busses/i2c-bcm283x.c | 12 +-
drivers/i2c/busses/i2c-cadence.c | 8 +-
drivers/i2c/busses/i2c-designware.c | 8 +-
drivers/i2c/busses/i2c-gpio.c | 10 +-
drivers/i2c/busses/i2c-imx.c | 23 +-
drivers/i2c/busses/i2c-mv64xxx.c | 12 +-
drivers/i2c/busses/i2c-omap.c | 10 +-
drivers/i2c/busses/i2c-rockchip.c | 22 +-
drivers/i2c/busses/i2c-stm32.c | 14 +-
drivers/i2c/busses/i2c-tegra.c | 12 +-
drivers/i2c/busses/i2c-versatile.c | 6 +-
drivers/i2c/i2c-mux.c | 10 +-
drivers/i2c/i2c.c | 28 +-
drivers/i2c/muxes/i2c-mux-pca954x.c | 8 +-
drivers/input/gpio_keys.c | 14 +-
drivers/input/imx_keypad.c | 6 +-
drivers/input/matrix-keymap.c | 13 +-
drivers/input/qt1070.c | 6 +-
drivers/input/twl6030_pwrbtn.c | 4 +-
drivers/input/virtio_input.c | 2 +-
drivers/led/led-gpio.c | 8 +-
drivers/led/led-pca955x.c | 6 +-
drivers/led/led-pwm.c | 6 +-
drivers/mci/arasan-sdhci.c | 8 +-
drivers/mci/atmel-mci-regs.h | 4 +-
drivers/mci/atmel-sdhci.c | 8 +-
drivers/mci/atmel-sdhci.h | 2 +-
drivers/mci/atmel_mci.c | 8 +-
drivers/mci/atmel_mci_common.c | 2 +-
drivers/mci/bcm2835-sdhost.c | 6 +-
drivers/mci/dove-sdhci.c | 6 +-
drivers/mci/dw_mmc.c | 27 +-
drivers/mci/imx-esdhc.c | 6 +-
drivers/mci/imx-esdhc.h | 2 +-
drivers/mci/imx.c | 6 +-
drivers/mci/mci-bcm2835.c | 8 +-
drivers/mci/mci-core.c | 22 +-
drivers/mci/mci_spi.c | 8 +-
drivers/mci/mmci.c | 8 +-
drivers/mci/mxs.c | 8 +-
drivers/mci/omap_hsmmc.c | 8 +-
drivers/mci/pxamci.c | 6 +-
drivers/mci/rockchip-dwcmshc-sdhci.c | 6 +-
drivers/mci/s3c.c | 11 +-
drivers/mci/sdhci.c | 8 +-
drivers/mci/stm32_sdmmc2.c | 8 +-
drivers/mci/tegra-sdmmc.c | 12 +-
drivers/memory/mc-tegra124.c | 4 +-
drivers/mfd/act8846.c | 4 +-
drivers/mfd/atmel-flexcom.c | 8 +-
drivers/mfd/axp20x-i2c.c | 4 +-
drivers/mfd/axp20x.c | 6 +-
drivers/mfd/core.c | 5 +-
drivers/mfd/da9053.c | 10 +-
drivers/mfd/da9063.c | 14 +-
drivers/mfd/lp3972.c | 4 +-
drivers/mfd/mc13xxx.c | 10 +-
drivers/mfd/mc34704.c | 4 +-
drivers/mfd/mc9sdz60.c | 4 +-
drivers/mfd/rave-sp.c | 24 +-
drivers/mfd/rk808.c | 6 +-
drivers/mfd/rn5t568.c | 11 +-
drivers/mfd/stm32-timers.c | 6 +-
drivers/mfd/stmpe-i2c.c | 10 +-
drivers/mfd/stpmic1.c | 6 +-
drivers/mfd/superio.c | 4 +-
drivers/mfd/syscon.c | 6 +-
drivers/mfd/twl4030.c | 4 +-
drivers/mfd/twl6030.c | 4 +-
drivers/misc/jtag.c | 8 +-
drivers/misc/mem.c | 6 +-
drivers/misc/sram.c | 4 +-
drivers/misc/starfive-pwrseq.c | 6 +-
drivers/misc/state.c | 6 +-
drivers/misc/storage-by-uuid.c | 12 +-
drivers/misc/ubootvar.c | 20 +-
drivers/mtd/core.c | 2 +-
drivers/mtd/devices/docg3.c | 6 +-
drivers/mtd/devices/docg3.h | 2 +-
drivers/mtd/devices/m25p80.c | 12 +-
drivers/mtd/devices/mtd_dataflash.c | 4 +-
drivers/mtd/devices/mtdram.c | 8 +-
drivers/mtd/nand/atmel_nand.c | 16 +-
drivers/mtd/nand/denali.h | 2 +-
drivers/mtd/nand/nand_denali_dt.c | 6 +-
drivers/mtd/nand/nand_fsl_ifc.c | 8 +-
drivers/mtd/nand/nand_imx.c | 8 +-
drivers/mtd/nand/nand_mrvl_nfc.c | 10 +-
drivers/mtd/nand/nand_mxs.c | 11 +-
drivers/mtd/nand/nand_omap_gpmc.c | 6 +-
drivers/mtd/nand/nand_orion.c | 6 +-
drivers/mtd/nand/nand_s3c24xx.c | 6 +-
drivers/mtd/nand/nomadik_nand.c | 4 +-
drivers/mtd/nand/omap_elm.c | 6 +-
drivers/mtd/nor/cfi_flash.c | 8 +-
drivers/mtd/nor/cfi_flash.h | 2 +-
drivers/mtd/spi-nor/cadence-quadspi.c | 22 +-
drivers/mtd/spi-nor/spi-nor.c | 4 +-
drivers/mtd/ubi/ubi.h | 4 +-
drivers/net/ag71xx.c | 14 +-
drivers/net/ar231x.c | 4 +-
drivers/net/arc_emac.c | 4 +-
drivers/net/at91_ether.c | 4 +-
drivers/net/bcmgenet.c | 14 +-
drivers/net/cpsw.c | 36 +--
drivers/net/cs8900.c | 6 +-
drivers/net/davinci_emac.c | 16 +-
drivers/net/designware.c | 14 +-
drivers/net/designware.h | 4 +-
drivers/net/designware_eqos.c | 30 +-
drivers/net/designware_eqos.h | 8 +-
drivers/net/designware_generic.c | 4 +-
drivers/net/designware_rockchip.c | 18 +-
drivers/net/designware_socfpga.c | 16 +-
drivers/net/designware_starfive.c | 7 +-
drivers/net/designware_stm32.c | 14 +-
drivers/net/designware_tegra186.c | 10 +-
drivers/net/dm9k.c | 28 +-
drivers/net/dsa.c | 10 +-
drivers/net/e1000/e1000.h | 4 +-
drivers/net/e1000/eeprom.c | 3 +-
drivers/net/efi-snp.c | 2 +-
drivers/net/enc28j60.c | 6 +-
drivers/net/ep93xx.c | 4 +-
drivers/net/ethoc.c | 4 +-
drivers/net/fec_imx.c | 25 +-
drivers/net/fec_imx.h | 2 +-
drivers/net/fec_mpc5200.c | 6 +-
drivers/net/fsl-fman.c | 36 +--
drivers/net/gianfar.c | 18 +-
drivers/net/gianfar.h | 2 +-
drivers/net/ks8851_mll.c | 16 +-
drivers/net/ksz8864rmn.c | 4 +-
drivers/net/ksz8873.c | 8 +-
drivers/net/ksz9477.c | 12 +-
drivers/net/liteeth.c | 8 +-
drivers/net/macb.c | 22 +-
drivers/net/mvneta.c | 8 +-
drivers/net/orion-gbe.c | 18 +-
drivers/net/phy/ar8327.c | 4 +-
drivers/net/phy/at803x.c | 4 +-
drivers/net/phy/dp83867.c | 4 +-
drivers/net/phy/marvell.c | 4 +-
drivers/net/phy/mdio-gpio.c | 16 +-
drivers/net/phy/mdio-mux-gpio.c | 10 +-
drivers/net/phy/mdio-mux.c | 4 +-
drivers/net/phy/mdio-mvebu.c | 8 +-
drivers/net/phy/mdio_bus.c | 24 +-
drivers/net/phy/micrel.c | 30 +-
drivers/net/phy/mv88e6xxx/chip.c | 8 +-
drivers/net/phy/mv88e6xxx/chip.h | 2 +-
drivers/net/phy/mv88e6xxx/port.c | 6 +-
drivers/net/phy/phy.c | 18 +-
drivers/net/phy/realtek.c | 2 +-
drivers/net/rtl8139.c | 2 +-
drivers/net/rtl8169.c | 2 +-
drivers/net/sja1105.c | 16 +-
drivers/net/smc91111.c | 4 +-
drivers/net/smc911x.c | 14 +-
drivers/net/tap.c | 4 +-
drivers/nvme/host/core.c | 2 +-
drivers/nvme/host/nvme.h | 4 +-
drivers/nvme/host/pci.c | 2 +-
drivers/nvmem/bsec.c | 10 +-
drivers/nvmem/core.c | 31 +-
drivers/nvmem/eeprom_93xx46.c | 8 +-
drivers/nvmem/kvx-otp-nv.c | 4 +-
drivers/nvmem/ocotp.c | 8 +-
drivers/nvmem/rave-sp-eeprom.c | 8 +-
drivers/nvmem/rmem.c | 6 +-
drivers/nvmem/snvs_lpgpr.c | 8 +-
drivers/nvmem/starfive-otp.c | 6 +-
drivers/of/barebox.c | 11 +-
drivers/of/base.c | 12 +-
drivers/of/device.c | 10 +-
drivers/of/of_gpio.c | 2 +-
drivers/of/of_path.c | 10 +-
drivers/of/platform.c | 50 +--
drivers/pci/bus.c | 10 +-
drivers/pci/pci-ecam-generic.c | 8 +-
drivers/pci/pci-efi.c | 6 +-
drivers/pci/pci-imx6.c | 22 +-
drivers/pci/pci-layerscape.c | 16 +-
drivers/pci/pci-mvebu.c | 12 +-
drivers/pci/pci-tegra.c | 12 +-
drivers/pci/pci.c | 12 +-
drivers/pci/pcie-designware-host.c | 4 +-
drivers/pci/pcie-designware.c | 4 +-
drivers/pci/pcie-designware.h | 2 +-
drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 6 +-
drivers/phy/phy-core.c | 40 +--
drivers/phy/phy-stm32-usbphyc.c | 16 +-
drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 20 +-
.../rockchip/phy-rockchip-naneng-combphy.c | 14 +-
drivers/phy/usb-nop-xceiv.c | 8 +-
drivers/pinctrl/imx-iomux-v1.c | 10 +-
drivers/pinctrl/imx-iomux-v2.c | 4 +-
drivers/pinctrl/imx-iomux-v3.c | 8 +-
drivers/pinctrl/mvebu/armada-370.c | 6 +-
drivers/pinctrl/mvebu/armada-xp.c | 6 +-
drivers/pinctrl/mvebu/common.c | 2 +-
drivers/pinctrl/mvebu/common.h | 2 +-
drivers/pinctrl/mvebu/dove.c | 6 +-
drivers/pinctrl/mvebu/kirkwood.c | 6 +-
drivers/pinctrl/pinctrl-at91-pio4.c | 8 +-
drivers/pinctrl/pinctrl-at91.c | 20 +-
drivers/pinctrl/pinctrl-bcm2835.c | 4 +-
drivers/pinctrl/pinctrl-mxs.c | 4 +-
drivers/pinctrl/pinctrl-rockchip.c | 22 +-
drivers/pinctrl/pinctrl-single.c | 6 +-
drivers/pinctrl/pinctrl-stm32.c | 15 +-
drivers/pinctrl/pinctrl-tegra-xusb.c | 8 +-
drivers/pinctrl/pinctrl-tegra20.c | 6 +-
drivers/pinctrl/pinctrl-tegra30.c | 6 +-
drivers/pinctrl/pinctrl-vf610.c | 4 +-
drivers/pinctrl/pinctrl.c | 10 +-
drivers/power/reset/gpio-poweroff.c | 6 +-
drivers/power/reset/gpio-restart.c | 8 +-
drivers/power/reset/htif-poweroff.c | 4 +-
drivers/power/reset/nvmem-reboot-mode.c | 4 +-
drivers/power/reset/reboot-mode.c | 6 +-
drivers/power/reset/stm32-reboot.c | 2 +-
drivers/power/reset/syscon-poweroff.c | 12 +-
drivers/power/reset/syscon-reboot-mode.c | 8 +-
drivers/power/reset/syscon-reboot.c | 16 +-
drivers/pwm/core.c | 8 +-
drivers/pwm/pwm-atmel.c | 8 +-
drivers/pwm/pwm-imx.c | 8 +-
drivers/pwm/pwm-mxs.c | 6 +-
drivers/pwm/pwm-stm32.c | 8 +-
drivers/pwm/pxa_pwm.c | 4 +-
drivers/regulator/anatop-regulator.c | 8 +-
drivers/regulator/bcm2835.c | 4 +-
drivers/regulator/core.c | 23 +-
drivers/regulator/fixed.c | 8 +-
drivers/regulator/of_regulator.c | 2 +-
drivers/regulator/pfuze.c | 8 +-
drivers/regulator/rk808-regulator.c | 10 +-
drivers/regulator/scmi-regulator.c | 4 +-
drivers/regulator/stm32-pwr.c | 6 +-
drivers/regulator/stm32-vrefbuf.c | 10 +-
drivers/regulator/stpmic1_regulator.c | 8 +-
drivers/remoteproc/imx_rproc.c | 12 +-
drivers/remoteproc/remoteproc_core.c | 12 +-
drivers/remoteproc/remoteproc_elf_loader.c | 2 +-
drivers/remoteproc/stm32_rproc.c | 12 +-
drivers/reset/core.c | 25 +-
drivers/reset/reset-imx7.c | 8 +-
drivers/reset/reset-scmi.c | 4 +-
drivers/reset/reset-simple.c | 6 +-
drivers/reset/reset-socfpga.c | 6 +-
drivers/reset/reset-starfive-vic.c | 6 +-
drivers/rtc/class.c | 2 +-
drivers/rtc/rtc-abracon.c | 4 +-
drivers/rtc/rtc-ds1307.c | 10 +-
drivers/rtc/rtc-imxdi.c | 6 +-
drivers/rtc/rtc-jz4740.c | 4 +-
drivers/rtc/rtc-pcf85363.c | 6 +-
drivers/serial/arm_dcc.c | 6 +-
drivers/serial/atmel.c | 6 +-
drivers/serial/efi-stdio.c | 4 +-
drivers/serial/linux_console.c | 10 +-
drivers/serial/serial_altera.c | 4 +-
drivers/serial/serial_altera_jtag.c | 4 +-
drivers/serial/serial_ar933x.c | 4 +-
drivers/serial/serial_auart.c | 4 +-
drivers/serial/serial_cadence.c | 4 +-
drivers/serial/serial_clps711x.c | 8 +-
drivers/serial/serial_digic.c | 4 +-
drivers/serial/serial_imx.c | 14 +-
drivers/serial/serial_litex.c | 4 +-
drivers/serial/serial_lpuart.c | 8 +-
drivers/serial/serial_mpc5xxx.c | 14 +-
drivers/serial/serial_ns16550.c | 10 +-
drivers/serial/serial_ns16550_pci.c | 2 +-
drivers/serial/serial_omap4_usbboot.c | 4 +-
drivers/serial/serial_pl010.c | 4 +-
drivers/serial/serial_pxa.c | 4 +-
drivers/serial/serial_s3c.c | 4 +-
drivers/serial/serial_sbi.c | 4 +-
drivers/serial/serial_sifive.c | 7 +-
drivers/serial/serial_stm32.c | 8 +-
drivers/serial/stm-serial.c | 4 +-
drivers/soc/imx/gpcv2.c | 20 +-
drivers/soc/imx/imx8m-featctrl.c | 2 +-
drivers/soc/kvx/kvx_socinfo.c | 6 +-
drivers/soc/rockchip/io-domain.c | 8 +-
drivers/soc/sifive/sifive_l2_cache.c | 6 +-
drivers/sound/gpio-beeper.c | 8 +-
drivers/sound/pwm-beeper.c | 13 +-
drivers/sound/sdl.c | 4 +-
drivers/spi/altera_spi.c | 6 +-
drivers/spi/ath79_spi.c | 10 +-
drivers/spi/atmel-quadspi.c | 4 +-
drivers/spi/atmel_spi.c | 6 +-
drivers/spi/dspi_spi.c | 14 +-
drivers/spi/gpio_spi.c | 8 +-
drivers/spi/imx_spi.c | 8 +-
drivers/spi/litex_spiflash.c | 8 +-
drivers/spi/mvebu_spi.c | 6 +-
drivers/spi/mxs_spi.c | 4 +-
drivers/spi/omap3_spi.c | 11 +-
drivers/spi/spi-fsl-dspi.c | 12 +-
drivers/spi/spi-fsl-qspi.c | 10 +-
drivers/spi/spi-nxp-fspi.c | 15 +-
drivers/spi/spi-sifive.c | 10 +-
drivers/spi/spi.c | 12 +-
drivers/spi/stm32_spi.c | 10 +-
drivers/spi/zynq_qspi.c | 8 +-
drivers/usb/core/hub.c | 2 +-
drivers/usb/core/usb.c | 8 +-
drivers/usb/dwc2/core.h | 2 +-
drivers/usb/dwc2/dwc2.c | 6 +-
drivers/usb/dwc2/host.c | 4 +-
drivers/usb/dwc3/core.c | 40 +--
drivers/usb/dwc3/core.h | 4 +-
drivers/usb/dwc3/dwc3-of-simple.c | 10 +-
drivers/usb/dwc3/gadget.c | 2 +-
drivers/usb/dwc3/host.c | 2 +-
drivers/usb/gadget/at91_udc.c | 8 +-
drivers/usb/gadget/at91_udc.h | 2 +-
drivers/usb/gadget/fsl_udc.c | 10 +-
drivers/usb/gadget/pxa27x_udc.c | 4 +-
drivers/usb/gadget/pxa27x_udc.h | 2 +-
drivers/usb/gadget/storage_common.h | 2 +-
drivers/usb/gadget/udc-core.c | 9 +-
drivers/usb/host/ehci-atmel.c | 10 +-
drivers/usb/host/ehci-hcd.c | 14 +-
drivers/usb/host/ohci-at91.c | 14 +-
drivers/usb/host/ohci-hcd.c | 4 +-
drivers/usb/host/xhci.c | 8 +-
drivers/usb/host/xhci.h | 2 +-
drivers/usb/imx/chipidea-imx.c | 30 +-
drivers/usb/imx/imx-usb-misc.c | 8 +-
drivers/usb/imx/imx-usb-phy.c | 8 +-
drivers/usb/misc/usb251xb.c | 16 +-
drivers/usb/musb/am35x-phy-control.h | 2 +-
drivers/usb/musb/musb_am335x.c | 6 +-
drivers/usb/musb/musb_core.h | 2 +-
drivers/usb/musb/musb_dsps.c | 16 +-
drivers/usb/musb/phy-am335x-control.c | 10 +-
drivers/usb/musb/phy-am335x.c | 6 +-
drivers/usb/otg/otgdev.c | 8 +-
drivers/usb/storage/transport.c | 6 +-
drivers/usb/storage/usb.c | 24 +-
drivers/video/atmel_hlcdfb.c | 4 +-
drivers/video/atmel_lcdfb.c | 4 +-
drivers/video/atmel_lcdfb.h | 4 +-
drivers/video/atmel_lcdfb_core.c | 17 +-
drivers/video/backlight-pwm.c | 14 +-
drivers/video/bcm2835.c | 4 +-
drivers/video/bochs/bochs_hw.c | 3 +-
drivers/video/bochs/bochs_hw.h | 4 +-
drivers/video/bochs/bochs_isa.c | 2 +-
drivers/video/efi_gop.c | 2 +-
drivers/video/fb.c | 6 +-
drivers/video/imx-ipu-fb.c | 6 +-
drivers/video/imx-ipu-v3/imx-hdmi.c | 8 +-
drivers/video/imx-ipu-v3/imx-ldb.c | 8 +-
drivers/video/imx-ipu-v3/imx-pd.c | 8 +-
drivers/video/imx-ipu-v3/ipu-common.c | 14 +-
drivers/video/imx-ipu-v3/ipu-dc.c | 4 +-
drivers/video/imx-ipu-v3/ipu-di.c | 2 +-
drivers/video/imx-ipu-v3/ipu-dmfc.c | 6 +-
drivers/video/imx-ipu-v3/ipu-dp.c | 4 +-
drivers/video/imx-ipu-v3/ipu-prv.h | 15 +-
drivers/video/imx-ipu-v3/ipufb.c | 17 +-
drivers/video/imx-ipu-v3/ipuv3-plane.c | 2 +-
drivers/video/imx.c | 8 +-
drivers/video/mipi_dbi.c | 2 +-
drivers/video/mtl017.c | 17 +-
drivers/video/omap.c | 6 +-
drivers/video/panel-ilitek-ili9341.c | 14 +-
drivers/video/pxa.c | 6 +-
drivers/video/rave-sp-backlight.c | 4 +-
drivers/video/s3c24xx.c | 8 +-
drivers/video/sdl.c | 6 +-
drivers/video/simple-panel.c | 10 +-
drivers/video/simplefb-client.c | 12 +-
drivers/video/ssd1307fb.c | 10 +-
drivers/video/stm.c | 10 +-
drivers/video/stm32_ltdc.c | 10 +-
drivers/video/tc358767.c | 20 +-
drivers/virtio/virtio.c | 8 +-
drivers/virtio/virtio_mmio.c | 6 +-
drivers/virtio/virtio_pci_modern.c | 2 +-
drivers/virtio/virtio_ring.c | 2 +-
drivers/w1/masters/w1-gpio.c | 8 +-
drivers/w1/w1.c | 8 +-
drivers/w1/w1.h | 8 +-
drivers/watchdog/ar9344_wdt.c | 6 +-
drivers/watchdog/at91sam9_wdt.c | 4 +-
drivers/watchdog/bcm2835_wdt.c | 6 +-
drivers/watchdog/davinci_wdt.c | 4 +-
drivers/watchdog/dw_wdt.c | 4 +-
drivers/watchdog/efi_wdt.c | 6 +-
drivers/watchdog/f71808e_wdt.c | 6 +-
drivers/watchdog/gpio_wdt.c | 6 +-
drivers/watchdog/im28wd.c | 6 +-
drivers/watchdog/imxwd.c | 10 +-
drivers/watchdog/jz4740.c | 4 +-
drivers/watchdog/kvx_wdt.c | 4 +-
drivers/watchdog/omap_wdt.c | 4 +-
drivers/watchdog/orion_wdt.c | 4 +-
drivers/watchdog/rave-sp-wdt.c | 6 +-
drivers/watchdog/rn5t568_wdt.c | 4 +-
drivers/watchdog/starfive_wdt.c | 4 +-
drivers/watchdog/stm32_iwdg.c | 4 +-
drivers/watchdog/stpmic1_wdt.c | 4 +-
drivers/watchdog/wd_core.c | 12 +-
drivers/watchdog/wdat_wdt.c | 2 +-
fs/bpkfs.c | 26 +-
fs/cramfs/cramfs.c | 19 +-
fs/devfs-core.c | 12 +-
fs/devfs.c | 35 ++-
fs/efi.c | 48 +--
fs/efivarfs.c | 32 +-
fs/ext4/ext4fs.h | 2 +-
fs/ext4/ext_barebox.c | 14 +-
fs/fat/fat.c | 37 +--
fs/fs.c | 100 +++---
fs/jffs2/fs.c | 16 +-
fs/jffs2/os-linux.h | 4 +-
fs/jffs2/super.c | 2 +-
fs/legacy.c | 20 +-
fs/nfs.c | 24 +-
fs/omap4_usbbootfs.c | 27 +-
fs/pstore/fs.c | 22 +-
fs/pstore/ram.c | 12 +-
fs/ramfs.c | 17 +-
fs/ratpfs.c | 48 +--
fs/smhfs.c | 28 +-
fs/squashfs/squashfs.c | 20 +-
fs/squashfs/squashfs.h | 4 +-
fs/squashfs/squashfs_fs_sb.h | 2 +-
fs/squashfs/super.c | 4 +-
fs/tftp.c | 31 +-
fs/ubifs/super.c | 5 +-
fs/ubifs/ubifs.c | 17 +-
fs/ubifs/ubifs.h | 5 +-
fs/ubootvarfs.c | 22 +-
fs/uimagefs.c | 28 +-
include/acpi.h | 4 +-
include/aiodev.h | 6 +-
include/ata_drive.h | 6 +-
include/blobgen.h | 4 +-
include/block.h | 2 +-
include/blspec.h | 2 +-
include/console.h | 16 +-
include/dirent.h | 4 +-
include/dma.h | 8 +-
include/driver.h | 145 ++++-----
include/dsa.h | 4 +-
include/efi/efi-device.h | 8 +-
include/fb.h | 2 +-
include/featctrl.h | 2 +-
include/firmware.h | 2 +-
include/fpga-bridge.h | 4 +-
include/fpga-mgr.h | 2 +-
include/fs.h | 77 ++---
include/globalvar.h | 7 +-
include/gpio.h | 9 +-
include/gpiod.h | 2 +-
include/hwspinlock.h | 2 +-
include/i2c/i2c-mux.h | 2 +-
include/i2c/i2c.h | 9 +-
include/input/matrix_keypad.h | 2 +-
include/linux/amba/bus.h | 10 +-
include/linux/basic_mmio_gpio.h | 2 +-
include/linux/clk.h | 161 +++++-----
include/linux/clkdev.h | 4 +-
include/linux/font.h | 8 +-
include/linux/hw_random.h | 4 +-
include/linux/mdio-mux.h | 2 +-
include/linux/mfd/axp20x.h | 2 +-
include/linux/mfd/core.h | 5 +-
include/linux/mtd/mtd.h | 10 +-
include/linux/mtd/spi-nor.h | 2 +-
include/linux/nvmem-consumer.h | 14 +-
include/linux/nvmem-provider.h | 2 +-
include/linux/pci.h | 8 +-
include/linux/phy.h | 10 +-
include/linux/phy/phy.h | 39 ++-
include/linux/printk.h | 14 +-
include/linux/reboot-mode.h | 4 +-
include/linux/regulator/of_regulator.h | 6 +-
include/linux/remoteproc.h | 4 +-
include/linux/reset.h | 25 +-
include/linux/rtc.h | 4 +-
include/linux/scmi_protocol.h | 16 +-
include/linux/spi/spi-mem.h | 2 +-
include/linux/virtio.h | 10 +-
include/mci.h | 6 +-
include/mfd/mc13xxx.h | 5 +-
include/net.h | 6 +-
include/of.h | 47 +--
include/of_device.h | 20 +-
include/param.h | 286 ++++++++++--------
include/pinctrl.h | 14 +-
include/pm_domain.h | 8 +-
include/printk.h | 4 +-
include/pwm.h | 4 +-
include/regmap.h | 10 +-
include/regulator.h | 13 +-
include/reset_source.h | 8 +-
include/serdev.h | 2 +-
include/soc/imx8m/featctrl.h | 4 +-
include/soc/stm32/reboot.h | 6 +-
include/spi/spi.h | 8 +-
include/superio.h | 4 +-
include/usb/chipidea-imx.h | 8 +-
include/usb/ehci.h | 4 +-
include/usb/fsl_usb2.h | 2 +-
include/usb/gadget.h | 14 +-
include/usb/musb.h | 2 +-
include/usb/phy.h | 2 +-
include/usb/usb.h | 8 +-
include/video/backlight.h | 2 +-
include/video/mipi_dbi.h | 2 +-
include/watchdog.h | 4 +-
lib/blobgen.c | 4 +-
lib/fonts/fonts.c | 8 +-
lib/hexdump.c | 2 +-
lib/parameter.c | 143 +++++----
net/eth.c | 22 +-
812 files changed, 4126 insertions(+), 3931 deletions(-)
--
2.30.2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/5] Rename device_d::device_node to device_d::of_node
2022-12-14 12:35 [PATCH 0/5] Rename some structs Sascha Hauer
@ 2022-12-14 12:35 ` Sascha Hauer
2022-12-14 12:35 ` [PATCH 2/5] Rename struct device_d to device Sascha Hauer
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2022-12-14 12:35 UTC (permalink / raw)
To: Barebox List
Linux struct device has the member of_node for the device_node pointer.
Rename this in barebox accordingly to minimize the necessary changes
when porting Linux code. This was done with the semantic patch:
@@ struct device_d E; @@
- E.device_node
+ E.of_node
@@ struct device_d *E; @@
- E->device_node
+ E->of_node
Plus some manual adjustments.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
Documentation/devel/porting.rst | 1 -
arch/arm/cpu/psci-client.c | 2 +-
arch/arm/mach-clps711x/clock.c | 2 +-
arch/arm/mach-clps711x/common.c | 10 ++++----
arch/arm/mach-imx/iim.c | 2 +-
arch/arm/mach-zynqmp/firmware-zynqmp.c | 4 ++--
arch/mips/mach-ath79/art.c | 4 ++--
arch/riscv/boards/riscvemu/board.c | 2 +-
arch/riscv/cpu/core.c | 4 ++--
arch/sandbox/board/hostfile.c | 2 +-
arch/sandbox/board/led.c | 2 +-
arch/sandbox/board/power.c | 3 ++-
arch/sandbox/board/watchdog.c | 5 ++--
commands/devinfo.c | 6 ++---
common/boards/qemu-virt/board.c | 2 +-
common/console.c | 2 +-
common/oftree.c | 4 ++--
common/reset_source.c | 2 +-
drivers/aiodev/am335x_adc.c | 2 +-
drivers/aiodev/core.c | 10 ++++----
drivers/aiodev/imx_thermal.c | 4 ++--
drivers/aiodev/qoriq_thermal.c | 4 ++--
drivers/aiodev/stm32-adc-core.c | 2 +-
drivers/aiodev/stm32-adc.c | 12 ++++++----
drivers/ata/intf_platform_ide.c | 2 +-
drivers/ata/pata-imx.c | 2 +-
drivers/base/bus.c | 6 ++---
drivers/base/driver.c | 6 ++---
drivers/base/power.c | 6 ++---
drivers/base/regmap/regmap.c | 4 ++--
drivers/bus/imx-weim.c | 6 ++---
drivers/bus/omap-gpmc.c | 4 ++--
drivers/bus/ti-sysc.c | 4 ++--
drivers/clk/bcm/clk-bcm2835-aux.c | 4 ++--
drivers/clk/clk-ar933x.c | 2 +-
drivers/clk/clk-ar9344.c | 2 +-
drivers/clk/clk-bulk.c | 2 +-
drivers/clk/clk-rpi.c | 2 +-
drivers/clk/clk-scmi.c | 5 ++--
drivers/clk/clkdev.c | 2 +-
drivers/clk/imx/clk-imx5.c | 6 ++---
drivers/clk/imx/clk-imx6.c | 4 ++--
drivers/clk/imx/clk-imx6sl.c | 2 +-
drivers/clk/imx/clk-imx6sx.c | 2 +-
drivers/clk/imx/clk-imx6ul.c | 2 +-
drivers/clk/imx/clk-imx7.c | 4 ++--
drivers/clk/loongson/clk-ls1b200.c | 2 +-
drivers/clk/mvebu/common.c | 4 ++--
drivers/clk/mvebu/corediv.c | 2 +-
drivers/clk/mxs/clk-imx28.c | 5 ++--
drivers/clk/rockchip/clk-rk3399.c | 2 +-
drivers/clk/rockchip/clk-rk3568.c | 2 +-
drivers/clk/sifive/sifive-prci.c | 4 ++--
drivers/clk/socfpga/clk.c | 2 +-
drivers/clk/starfive/jh7100-clkgen.c | 4 ++--
drivers/clk/tegra/clk-tegra124.c | 4 ++--
drivers/clk/tegra/clk-tegra20.c | 4 ++--
drivers/clk/tegra/clk-tegra30.c | 4 ++--
drivers/clk/zynq/clkc.c | 4 ++--
drivers/clk/zynqmp/clkc.c | 4 ++--
drivers/clocksource/armv7m_systick.c | 2 +-
drivers/clocksource/bcm2835.c | 2 +-
drivers/clocksource/clps711x.c | 2 +-
drivers/clocksource/dw_apb_timer.c | 2 +-
drivers/clocksource/mvebu.c | 2 +-
drivers/crypto/caam/ctrl.c | 2 +-
drivers/eeprom/at24.c | 14 +++++------
drivers/eeprom/at25.c | 6 ++---
drivers/firmware/altera_serial.c | 8 +++----
drivers/firmware/arm_scmi/bus.c | 2 +-
drivers/firmware/arm_scmi/driver.c | 2 +-
drivers/firmware/arm_scmi/smc.c | 6 ++---
drivers/firmware/socfpga.c | 6 ++---
drivers/firmware/zynqmp-fpga.c | 6 ++---
drivers/fpga/fpga-bridge.c | 4 ++--
drivers/fpga/socfpga-hps2fpga-bridge.c | 4 ++--
drivers/gpio/gpio-74164.c | 6 ++---
drivers/gpio/gpio-ath79.c | 2 +-
drivers/gpio/gpio-clps711x.c | 2 +-
drivers/gpio/gpio-davinci.c | 2 +-
drivers/gpio/gpio-dw.c | 4 ++--
drivers/gpio/gpio-generic.c | 4 ++--
drivers/gpio/gpio-imx.c | 2 +-
drivers/gpio/gpio-latch.c | 2 +-
drivers/gpio/gpio-libftdi1.c | 6 ++---
drivers/gpio/gpio-mpc8xxx.c | 4 ++--
drivers/gpio/gpio-mxs.c | 2 +-
drivers/gpio/gpio-omap.c | 2 +-
drivers/gpio/gpio-orion.c | 4 ++--
drivers/gpio/gpio-pcf857x.c | 2 +-
drivers/gpio/gpio-sifive.c | 2 +-
drivers/gpio/gpio-vf610.c | 6 ++---
drivers/gpio/gpio-zynq.c | 2 +-
drivers/gpio/gpiolib.c | 15 ++++++------
drivers/hw_random/core.c | 2 +-
drivers/i2c/busses/i2c-at91.c | 2 +-
drivers/i2c/busses/i2c-bcm283x.c | 4 ++--
drivers/i2c/busses/i2c-cadence.c | 4 ++--
drivers/i2c/busses/i2c-designware.c | 4 ++--
drivers/i2c/busses/i2c-gpio.c | 6 ++---
drivers/i2c/busses/i2c-imx.c | 16 +++++++------
drivers/i2c/busses/i2c-mv64xxx.c | 6 ++---
drivers/i2c/busses/i2c-omap.c | 6 ++---
drivers/i2c/busses/i2c-rockchip.c | 4 ++--
drivers/i2c/busses/i2c-stm32.c | 2 +-
drivers/i2c/busses/i2c-tegra.c | 6 ++---
drivers/i2c/busses/i2c-versatile.c | 2 +-
drivers/i2c/i2c-mux.c | 6 ++---
drivers/i2c/i2c.c | 10 ++++----
drivers/i2c/muxes/i2c-mux-pca954x.c | 4 ++--
drivers/input/gpio_keys.c | 4 ++--
drivers/input/matrix-keymap.c | 4 ++--
drivers/led/led-gpio.c | 4 ++--
drivers/led/led-pca955x.c | 2 +-
drivers/led/led-pwm.c | 2 +-
drivers/mci/arasan-sdhci.c | 2 +-
drivers/mci/atmel-sdhci.c | 2 +-
drivers/mci/atmel_mci.c | 2 +-
drivers/mci/dw_mmc.c | 19 ++++++++-------
drivers/mci/mci-core.c | 12 +++++-----
drivers/mci/mmci.c | 2 +-
drivers/mci/sdhci.c | 2 +-
drivers/mci/stm32_sdmmc2.c | 2 +-
drivers/mci/tegra-sdmmc.c | 6 ++---
drivers/mfd/atmel-flexcom.c | 4 ++--
drivers/mfd/axp20x.c | 4 ++--
drivers/mfd/da9053.c | 2 +-
drivers/mfd/da9063.c | 6 ++---
drivers/mfd/mc13xxx.c | 2 +-
drivers/mfd/rave-sp.c | 4 ++--
drivers/mfd/rk808.c | 2 +-
drivers/mfd/rn5t568.c | 4 ++--
drivers/mfd/stm32-timers.c | 2 +-
drivers/mfd/stmpe-i2c.c | 4 ++--
drivers/mfd/stpmic1.c | 2 +-
drivers/misc/starfive-pwrseq.c | 2 +-
drivers/misc/state.c | 2 +-
drivers/misc/storage-by-uuid.c | 4 ++--
drivers/misc/ubootvar.c | 6 ++---
drivers/mtd/devices/m25p80.c | 8 +++----
drivers/mtd/devices/mtdram.c | 4 ++--
drivers/mtd/nand/atmel_nand.c | 4 ++--
drivers/mtd/nand/nand_denali_dt.c | 2 +-
drivers/mtd/nand/nand_fsl_ifc.c | 2 +-
drivers/mtd/nand/nand_imx.c | 2 +-
drivers/mtd/nand/nand_mrvl_nfc.c | 2 +-
drivers/mtd/nand/nand_mxs.c | 2 +-
drivers/mtd/nand/nand_orion.c | 2 +-
drivers/mtd/nor/cfi_flash.c | 2 +-
drivers/mtd/spi-nor/cadence-quadspi.c | 10 ++++----
drivers/mtd/spi-nor/spi-nor.c | 2 +-
drivers/net/bcmgenet.c | 6 ++---
drivers/net/cpsw.c | 10 ++++----
drivers/net/davinci_emac.c | 2 +-
drivers/net/designware.c | 6 ++---
drivers/net/designware_eqos.c | 16 ++++++-------
drivers/net/designware_rockchip.c | 2 +-
drivers/net/designware_socfpga.c | 9 +++----
drivers/net/designware_starfive.c | 3 ++-
drivers/net/designware_stm32.c | 6 ++---
drivers/net/designware_tegra186.c | 2 +-
drivers/net/dm9k.c | 2 +-
drivers/net/dsa.c | 8 +++----
drivers/net/e1000/eeprom.c | 3 +--
drivers/net/fec_imx.c | 15 ++++++------
drivers/net/fsl-fman.c | 6 ++---
drivers/net/liteeth.c | 2 +-
drivers/net/macb.c | 8 +++----
drivers/net/mvneta.c | 2 +-
drivers/net/orion-gbe.c | 6 ++---
drivers/net/phy/at803x.c | 2 +-
drivers/net/phy/dp83867.c | 2 +-
drivers/net/phy/marvell.c | 4 ++--
drivers/net/phy/mdio-gpio.c | 10 ++++----
drivers/net/phy/mdio-mux-gpio.c | 6 ++---
drivers/net/phy/mdio-mux.c | 2 +-
drivers/net/phy/mdio-mvebu.c | 2 +-
drivers/net/phy/mdio_bus.c | 16 ++++++-------
drivers/net/phy/micrel.c | 16 ++++++-------
drivers/net/phy/mv88e6xxx/chip.c | 4 ++--
drivers/net/phy/mv88e6xxx/port.c | 4 ++--
drivers/net/phy/phy.c | 16 +++++++------
drivers/net/smc911x.c | 10 ++++----
drivers/nvmem/bsec.c | 2 +-
drivers/nvmem/core.c | 20 ++++++++--------
drivers/nvmem/eeprom_93xx46.c | 4 ++--
drivers/nvmem/ocotp.c | 2 +-
drivers/nvmem/rave-sp-eeprom.c | 4 ++--
drivers/nvmem/snvs_lpgpr.c | 2 +-
drivers/nvmem/starfive-otp.c | 2 +-
drivers/of/barebox.c | 5 ++--
drivers/of/base.c | 6 ++---
drivers/of/device.c | 4 ++--
drivers/of/of_path.c | 4 ++--
drivers/of/platform.c | 8 +++----
drivers/pci/pci-ecam-generic.c | 2 +-
drivers/pci/pci-imx6.c | 2 +-
drivers/pci/pci-layerscape.c | 6 ++---
drivers/pci/pci-mvebu.c | 6 ++---
drivers/pci/pci-tegra.c | 4 ++--
drivers/pci/pci.c | 10 ++++----
drivers/pci/pcie-designware-host.c | 2 +-
drivers/pci/pcie-designware.c | 2 +-
drivers/phy/phy-core.c | 24 +++++++++----------
drivers/phy/phy-stm32-usbphyc.c | 4 ++--
drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 8 +++----
.../rockchip/phy-rockchip-naneng-combphy.c | 4 ++--
drivers/phy/usb-nop-xceiv.c | 2 +-
drivers/pinctrl/imx-iomux-v1.c | 4 ++--
drivers/pinctrl/imx-iomux-v3.c | 2 +-
drivers/pinctrl/mvebu/armada-370.c | 2 +-
drivers/pinctrl/mvebu/armada-xp.c | 2 +-
drivers/pinctrl/mvebu/dove.c | 2 +-
drivers/pinctrl/mvebu/kirkwood.c | 2 +-
drivers/pinctrl/pinctrl-at91-pio4.c | 2 +-
drivers/pinctrl/pinctrl-at91.c | 8 +++----
drivers/pinctrl/pinctrl-rockchip.c | 10 ++++----
drivers/pinctrl/pinctrl-single.c | 2 +-
drivers/pinctrl/pinctrl-stm32.c | 2 +-
drivers/pinctrl/pinctrl-tegra20.c | 2 +-
drivers/pinctrl/pinctrl-tegra30.c | 2 +-
drivers/pinctrl/pinctrl.c | 6 ++---
drivers/power/reset/gpio-poweroff.c | 2 +-
drivers/power/reset/gpio-restart.c | 4 ++--
drivers/power/reset/reboot-mode.c | 4 ++--
drivers/power/reset/syscon-poweroff.c | 8 +++----
drivers/power/reset/syscon-reboot-mode.c | 4 ++--
drivers/power/reset/syscon-reboot.c | 12 +++++-----
drivers/pwm/core.c | 2 +-
drivers/pwm/pwm-atmel.c | 2 +-
drivers/pwm/pwm-imx.c | 4 ++--
drivers/pwm/pwm-mxs.c | 2 +-
drivers/pwm/pwm-stm32.c | 4 ++--
drivers/regulator/anatop-regulator.c | 4 ++--
drivers/regulator/core.c | 8 +++----
drivers/regulator/fixed.c | 4 ++--
drivers/regulator/pfuze.c | 2 +-
drivers/regulator/rk808-regulator.c | 2 +-
drivers/regulator/scmi-regulator.c | 2 +-
drivers/regulator/stm32-pwr.c | 2 +-
drivers/regulator/stm32-vrefbuf.c | 2 +-
drivers/regulator/stpmic1_regulator.c | 2 +-
drivers/remoteproc/imx_rproc.c | 4 ++--
drivers/remoteproc/remoteproc_core.c | 4 ++--
drivers/remoteproc/stm32_rproc.c | 4 ++--
drivers/reset/core.c | 11 +++++----
drivers/reset/reset-imx7.c | 4 ++--
drivers/reset/reset-scmi.c | 2 +-
drivers/reset/reset-simple.c | 2 +-
drivers/reset/reset-socfpga.c | 2 +-
drivers/reset/reset-starfive-vic.c | 2 +-
drivers/rtc/rtc-ds1307.c | 2 +-
drivers/serial/serial_clps711x.c | 4 ++--
drivers/serial/serial_imx.c | 10 ++++----
drivers/serial/serial_lpuart.c | 4 ++--
drivers/serial/serial_sifive.c | 3 ++-
drivers/serial/serial_stm32.c | 4 ++--
drivers/soc/imx/gpcv2.c | 8 +++----
drivers/soc/kvx/kvx_socinfo.c | 2 +-
drivers/soc/rockchip/io-domain.c | 2 +-
drivers/sound/gpio-beeper.c | 2 +-
drivers/sound/pwm-beeper.c | 7 +++---
drivers/spi/ath79_spi.c | 2 +-
drivers/spi/atmel_spi.c | 2 +-
drivers/spi/dspi_spi.c | 6 ++---
drivers/spi/gpio_spi.c | 2 +-
drivers/spi/imx_spi.c | 4 ++--
drivers/spi/mvebu_spi.c | 2 +-
drivers/spi/omap3_spi.c | 4 ++--
drivers/spi/spi-fsl-dspi.c | 6 ++---
drivers/spi/spi-fsl-qspi.c | 2 +-
drivers/spi/spi-nxp-fspi.c | 2 +-
drivers/spi/spi-sifive.c | 2 +-
drivers/spi/spi.c | 8 +++----
drivers/spi/zynq_qspi.c | 2 +-
drivers/usb/dwc3/core.c | 22 ++++++++---------
drivers/usb/dwc3/dwc3-of-simple.c | 2 +-
drivers/usb/gadget/at91_udc.c | 4 ++--
drivers/usb/host/ehci-atmel.c | 2 +-
drivers/usb/host/ehci-hcd.c | 2 +-
drivers/usb/host/ohci-at91.c | 4 ++--
drivers/usb/imx/chipidea-imx.c | 20 ++++++++--------
drivers/usb/imx/imx-usb-phy.c | 2 +-
drivers/usb/misc/usb251xb.c | 4 ++--
drivers/usb/musb/musb_am335x.c | 2 +-
drivers/usb/musb/musb_dsps.c | 4 ++--
drivers/usb/musb/phy-am335x-control.c | 2 +-
drivers/usb/musb/phy-am335x.c | 2 +-
drivers/video/atmel_lcdfb_core.c | 4 ++--
drivers/video/backlight-pwm.c | 6 ++---
drivers/video/imx-ipu-v3/imx-hdmi.c | 2 +-
drivers/video/imx-ipu-v3/imx-ldb.c | 2 +-
drivers/video/imx-ipu-v3/imx-pd.c | 2 +-
drivers/video/imx-ipu-v3/ipu-common.c | 2 +-
drivers/video/imx-ipu-v3/ipufb.c | 9 +++----
drivers/video/mtl017.c | 11 +++++----
drivers/video/panel-ilitek-ili9341.c | 2 +-
drivers/video/simple-panel.c | 4 ++--
drivers/video/simplefb-client.c | 4 ++--
drivers/video/ssd1307fb.c | 4 ++--
drivers/video/stm.c | 4 ++--
drivers/video/stm32_ltdc.c | 4 ++--
drivers/video/tc358767.c | 12 +++++-----
drivers/w1/masters/w1-gpio.c | 2 +-
drivers/watchdog/gpio_wdt.c | 2 +-
drivers/watchdog/imxwd.c | 4 ++--
drivers/watchdog/rave-sp-wdt.c | 2 +-
drivers/watchdog/wd_core.c | 8 +++----
fs/devfs-core.c | 2 +-
fs/pstore/ram.c | 4 ++--
include/console.h | 6 ++---
include/driver.h | 4 ++--
include/linux/mtd/mtd.h | 8 +++----
net/eth.c | 20 +++++++++-------
314 files changed, 712 insertions(+), 691 deletions(-)
diff --git a/Documentation/devel/porting.rst b/Documentation/devel/porting.rst
index f95e8cbba3..7702fee7bb 100644
--- a/Documentation/devel/porting.rst
+++ b/Documentation/devel/porting.rst
@@ -388,7 +388,6 @@ Miscellaneous Linux porting advice:
* Branches dependent on ``system_state``: Take the ``SYSTEM_BOOTING`` branch
* ``usleep`` and co.: use ``[mud]elay``
- * ``.of_node``: use ``.device_node`` or ``dev_of_node``
* ``jiffies``: use ``get_time_ns()``
* ``time_before``: use ``!is_timeout()``
* ``clk_hw_register_fixed_rate_with_accuracy``: use ``clk_hw_register_fixed_rate`` without accuracy
diff --git a/arch/arm/cpu/psci-client.c b/arch/arm/cpu/psci-client.c
index f9b1c684bf..917e06d560 100644
--- a/arch/arm/cpu/psci-client.c
+++ b/arch/arm/cpu/psci-client.c
@@ -123,7 +123,7 @@ static int __init psci_probe(struct device_d *dev)
if (ret)
return -ENODEV;
- ret = of_property_read_string(dev->device_node, "method", &method);
+ ret = of_property_read_string(dev->of_node, "method", &method);
if (ret) {
dev_warn(dev, "missing \"method\" property\n");
return -ENXIO;
diff --git a/arch/arm/mach-clps711x/clock.c b/arch/arm/mach-clps711x/clock.c
index 8674b8c801..573867e415 100644
--- a/arch/arm/mach-clps711x/clock.c
+++ b/arch/arm/mach-clps711x/clock.c
@@ -74,7 +74,7 @@ static int clps711x_clk_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = CLPS711X_CLK_MAX;
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data);
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data);
return 0;
}
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
index c0b817872d..dcb97ad236 100644
--- a/arch/arm/mach-clps711x/common.c
+++ b/arch/arm/mach-clps711x/common.c
@@ -115,18 +115,18 @@ static int clps711x_bus_probe(struct device_d *dev)
u32 mcfg;
/* Setup bus timings */
- if (!of_property_read_u32(dev->device_node,
+ if (!of_property_read_u32(dev->of_node,
"barebox,ep7209-memcfg1", &mcfg))
writel(mcfg, MEMCFG1);
- if (!of_property_read_u32(dev->device_node,
+ if (!of_property_read_u32(dev->of_node,
"barebox,ep7209-memcfg2", &mcfg))
writel(mcfg, MEMCFG2);
- clps711x_bus_patch(dev->device_node, 0, CLPS711X_MAP_ADDR);
+ clps711x_bus_patch(dev->of_node, 0, CLPS711X_MAP_ADDR);
- of_platform_populate(dev->device_node, NULL, dev);
+ of_platform_populate(dev->of_node, NULL, dev);
- of_register_fixup(clps711x_bus_fixup, dev->device_node);
+ of_register_fixup(clps711x_bus_fixup, dev->of_node);
return 0;
}
diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c
index 40b9b00cec..638f329c37 100644
--- a/arch/arm/mach-imx/iim.c
+++ b/arch/arm/mach-imx/iim.c
@@ -408,7 +408,7 @@ static void imx_iim_init_dt(struct device_d *dev, struct iim_priv *iim)
{
char mac[6];
const __be32 *prop;
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
int len, ret, macnum = 0;
if (!node)
diff --git a/arch/arm/mach-zynqmp/firmware-zynqmp.c b/arch/arm/mach-zynqmp/firmware-zynqmp.c
index c23b434031..0d1eb5b137 100644
--- a/arch/arm/mach-zynqmp/firmware-zynqmp.c
+++ b/arch/arm/mach-zynqmp/firmware-zynqmp.c
@@ -581,7 +581,7 @@ static int zynqmp_firmware_probe(struct device_d *dev)
{
int ret;
- ret = get_set_conduit_method(dev->device_node);
+ ret = get_set_conduit_method(dev->of_node);
if (ret)
goto out;
@@ -619,7 +619,7 @@ static int zynqmp_firmware_probe(struct device_d *dev)
dev_dbg(dev, "Trustzone version v%d.%d\n",
pm_tz_version >> 16, pm_tz_version & 0xFFFF);
- of_platform_populate(dev->device_node, NULL, dev);
+ of_platform_populate(dev->of_node, NULL, dev);
out:
if (ret)
do_fw_call = do_fw_call_fail;
diff --git a/arch/mips/mach-ath79/art.c b/arch/mips/mach-ath79/art.c
index d119ca6d1a..de9f638e1c 100644
--- a/arch/mips/mach-ath79/art.c
+++ b/arch/mips/mach-ath79/art.c
@@ -20,7 +20,7 @@ struct ar9300_eeprom {
static int art_set_mac(struct device_d *dev, struct ar9300_eeprom *eeprom)
{
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
struct device_node *rnode;
if (!node)
@@ -80,7 +80,7 @@ static int art_probe(struct device_d *dev)
dev_dbg(dev, "found ART partition\n");
- ret = of_find_path(dev->device_node, "device-path", &path, 0);
+ ret = of_find_path(dev->of_node, "device-path", &path, 0);
if (ret) {
dev_err(dev, "can't find path\n");
return ret;
diff --git a/arch/riscv/boards/riscvemu/board.c b/arch/riscv/boards/riscvemu/board.c
index d9c7bd77b8..e735d7e05e 100644
--- a/arch/riscv/boards/riscvemu/board.c
+++ b/arch/riscv/boards/riscvemu/board.c
@@ -43,7 +43,7 @@ static int riscvemu_probe(struct device_d *dev)
u64 start;
overlay = of_unflatten_dtb(__dtb_overlay_of_sram_start, INT_MAX);
- of_overlay_apply_tree(dev->device_node, overlay);
+ of_overlay_apply_tree(dev->of_node, overlay);
/* of_probe() will happen later at of_populate_initcall */
if (IS_ENABLED(CONFIG_CMD_TUTORIAL))
diff --git a/arch/riscv/cpu/core.c b/arch/riscv/cpu/core.c
index c075301b1b..02b13ada4b 100644
--- a/arch/riscv/cpu/core.c
+++ b/arch/riscv/cpu/core.c
@@ -67,7 +67,7 @@ static int riscv_probe(struct device_d *parent)
/* Each hart has a timer, but we only need one */
if (IS_ENABLED(CONFIG_RISCV_TIMER) && !timer_dev.parent) {
timer_dev.id = DEVICE_ID_SINGLE;
- timer_dev.device_node = parent->device_node;
+ timer_dev.of_node = parent->of_node;
timer_dev.parent = parent;
dev_set_name(&timer_dev, "riscv-timer");
@@ -78,7 +78,7 @@ static int riscv_probe(struct device_d *parent)
if (IS_ENABLED(CONFIG_SERIAL_SBI) && !serial_sbi_dev.parent) {
serial_sbi_dev.id = DEVICE_ID_SINGLE;
- serial_sbi_dev.device_node = 0;
+ serial_sbi_dev.of_node = 0;
serial_sbi_dev.parent = parent;
dev_set_name(&serial_sbi_dev, "riscv-serial-sbi");
diff --git a/arch/sandbox/board/hostfile.c b/arch/sandbox/board/hostfile.c
index 52165adec8..d04925d6d4 100644
--- a/arch/sandbox/board/hostfile.c
+++ b/arch/sandbox/board/hostfile.c
@@ -98,7 +98,7 @@ static void hf_info(struct device_d *dev)
static int hf_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct hf_priv *priv = xzalloc(sizeof(*priv));
struct cdev *cdev;
bool is_blockdev;
diff --git a/arch/sandbox/board/led.c b/arch/sandbox/board/led.c
index b7ab81112b..a4d5b3e89a 100644
--- a/arch/sandbox/board/led.c
+++ b/arch/sandbox/board/led.c
@@ -28,7 +28,7 @@ static void sandbox_led_set(struct led *led, unsigned int brightness)
static int sandbox_led_of_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
int ret;
if (sandbox_led.led.set)
diff --git a/arch/sandbox/board/power.c b/arch/sandbox/board/power.c
index 009b410eaa..071a7fd907 100644
--- a/arch/sandbox/board/power.c
+++ b/arch/sandbox/board/power.c
@@ -66,7 +66,8 @@ static int sandbox_power_probe(struct device_d *dev)
if (IS_ENABLED(CONFIG_SANDBOX_REEXEC))
restart_handler_register(&power->rst_reexec);
- power->reset_source_cell = of_nvmem_cell_get(dev->device_node, "reset-source");
+ power->reset_source_cell = of_nvmem_cell_get(dev->of_node,
+ "reset-source");
if (IS_ERR(power->reset_source_cell)) {
dev_warn(dev, "No reset source info available: %pe\n", power->reset_source_cell);
return 0;
diff --git a/arch/sandbox/board/watchdog.c b/arch/sandbox/board/watchdog.c
index daaf549642..24e556a918 100644
--- a/arch/sandbox/board/watchdog.c
+++ b/arch/sandbox/board/watchdog.c
@@ -38,7 +38,7 @@ static int sandbox_watchdog_set_timeout(struct watchdog *wdd, unsigned int timeo
static int sandbox_watchdog_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct sandbox_watchdog *wd;
struct watchdog *wdd;
int ret;
@@ -58,7 +58,8 @@ static int sandbox_watchdog_probe(struct device_d *dev)
return ret;
}
- wd->reset_source_cell = of_nvmem_cell_get(dev->device_node, "reset-source");
+ wd->reset_source_cell = of_nvmem_cell_get(dev->of_node,
+ "reset-source");
if (IS_ERR(wd->reset_source_cell)) {
dev_warn(dev, "No reset source info available: %pe\n", wd->reset_source_cell);
goto out;
diff --git a/commands/devinfo.c b/commands/devinfo.c
index e171ecc62c..a0addfbcf1 100644
--- a/commands/devinfo.c
+++ b/commands/devinfo.c
@@ -102,9 +102,9 @@ static int do_devinfo(int argc, char *argv[])
printf("\n");
}
#ifdef CONFIG_OFDEVICE
- if (dev->device_node) {
- printf("Device node: %s\n", dev->device_node->full_name);
- of_print_nodes(dev->device_node, 0, ~0);
+ if (dev->of_node) {
+ printf("Device node: %s\n", dev->of_node->full_name);
+ of_print_nodes(dev->of_node, 0, ~0);
}
#endif
}
diff --git a/common/boards/qemu-virt/board.c b/common/boards/qemu-virt/board.c
index 4064409c80..bfda86569b 100644
--- a/common/boards/qemu-virt/board.c
+++ b/common/boards/qemu-virt/board.c
@@ -46,7 +46,7 @@ static int virt_probe(struct device_d *dev)
init();
overlay = of_unflatten_dtb(__dtb_overlay_of_flash_start, INT_MAX);
- of_overlay_apply_tree(dev->device_node, overlay);
+ of_overlay_apply_tree(dev->of_node, overlay);
/* of_probe() will happen later at of_populate_initcall */
return 0;
diff --git a/common/console.c b/common/console.c
index c442c2dde1..56caa12b45 100644
--- a/common/console.c
+++ b/common/console.c
@@ -243,7 +243,7 @@ static void console_set_stdoutpath(struct console_device *cdev, unsigned baudrat
if (!cdev->linux_console_name)
return;
- id = of_alias_get_id(cdev->dev->device_node, "serial");
+ id = of_alias_get_id(cdev->dev->of_node, "serial");
if (id < 0)
return;
diff --git a/common/oftree.c b/common/oftree.c
index 38752e2c19..4cb74067de 100644
--- a/common/oftree.c
+++ b/common/oftree.c
@@ -233,10 +233,10 @@ static int of_fixup_bootargs(struct device_node *root, void *unused)
dev = reset_source_get_device();
- if (dev && dev->device_node) {
+ if (dev && dev->of_node) {
phandle phandle;
- phandle = of_node_create_phandle(dev->device_node);
+ phandle = of_node_create_phandle(dev->of_node);
err = of_property_write_u32(node,
"reset-source-device", phandle);
diff --git a/common/reset_source.c b/common/reset_source.c
index 774ea5fc8c..90a34f5f50 100644
--- a/common/reset_source.c
+++ b/common/reset_source.c
@@ -78,7 +78,7 @@ void reset_source_set_device(struct device_d *dev, enum reset_src_type st)
{
unsigned int priority = RESET_SOURCE_DEFAULT_PRIORITY;
- of_property_read_u32(dev->device_node, "reset-source-priority", &priority);
+ of_property_read_u32(dev->of_node, "reset-source-priority", &priority);
__reset_source_set(dev, st, priority, -1);
}
diff --git a/drivers/aiodev/am335x_adc.c b/drivers/aiodev/am335x_adc.c
index 0d6cc426eb..2ac1b7ab94 100644
--- a/drivers/aiodev/am335x_adc.c
+++ b/drivers/aiodev/am335x_adc.c
@@ -87,7 +87,7 @@ static int am335x_adc_probe(struct device_d *dev)
goto fail_data;
}
- node = of_find_compatible_node(dev->device_node, NULL, "ti,am3359-adc");
+ node = of_find_compatible_node(dev->of_node, NULL, "ti,am3359-adc");
if (!node) {
ret = -EINVAL;
goto fail_data;
diff --git a/drivers/aiodev/core.c b/drivers/aiodev/core.c
index 9f5c422500..c66eb449fc 100644
--- a/drivers/aiodev/core.c
+++ b/drivers/aiodev/core.c
@@ -37,10 +37,10 @@ struct aiochannel *aiochannel_get(struct device_d *dev, int index)
struct aiodevice *aiodev;
int ret, chnum = 0;
- if (!dev->device_node)
+ if (!dev->of_node)
return ERR_PTR(-EINVAL);
- ret = of_parse_phandle_with_args(dev->device_node,
+ ret = of_parse_phandle_with_args(dev->of_node,
"io-channels",
"#io-channel-cells",
index, &spec);
@@ -48,7 +48,7 @@ struct aiochannel *aiochannel_get(struct device_d *dev, int index)
return ERR_PTR(ret);
list_for_each_entry(aiodev, &aiodevices, list) {
- if (aiodev->hwdev->device_node == spec.np)
+ if (aiodev->hwdev->of_node == spec.np)
goto found;
}
@@ -91,10 +91,10 @@ int aiodevice_register(struct aiodevice *aiodev)
int i, ret;
if (!aiodev->name && aiodev->hwdev &&
- aiodev->hwdev->device_node) {
+ aiodev->hwdev->of_node) {
aiodev->dev.id = DEVICE_ID_SINGLE;
- aiodev->name = of_alias_get(aiodev->hwdev->device_node);
+ aiodev->name = of_alias_get(aiodev->hwdev->of_node);
}
if (!aiodev->name) {
diff --git a/drivers/aiodev/imx_thermal.c b/drivers/aiodev/imx_thermal.c
index 0bc84ee160..bac51e03d2 100644
--- a/drivers/aiodev/imx_thermal.c
+++ b/drivers/aiodev/imx_thermal.c
@@ -115,7 +115,7 @@ static int imx_thermal_probe(struct device_d *dev)
int t1, n1, t2, n2;
int ret;
- node = of_parse_phandle(dev->device_node, "fsl,tempmon-data", 0);
+ node = of_parse_phandle(dev->of_node, "fsl,tempmon-data", 0);
if (!node) {
dev_err(dev, "No calibration data source\n");
return -ENODEV;
@@ -135,7 +135,7 @@ static int imx_thermal_probe(struct device_d *dev)
}
imx_thermal = xzalloc(sizeof(*imx_thermal));
- imx_thermal->base = syscon_base_lookup_by_phandle(dev->device_node,
+ imx_thermal->base = syscon_base_lookup_by_phandle(dev->of_node,
"fsl,tempmon");
if (IS_ERR(imx_thermal->base)) {
dev_err(dev, "Could not get ANATOP address\n");
diff --git a/drivers/aiodev/qoriq_thermal.c b/drivers/aiodev/qoriq_thermal.c
index 1acb06a9de..ed76945fd1 100644
--- a/drivers/aiodev/qoriq_thermal.c
+++ b/drivers/aiodev/qoriq_thermal.c
@@ -146,7 +146,7 @@ static int qoriq_tmu_calibration(struct qoriq_tmu_data *data)
int i, val, len;
u32 range[4];
const u32 *calibration;
- struct device_node *np = data->dev->device_node;
+ struct device_node *np = data->dev->of_node;
if (of_property_read_u32_array(np, "fsl,tmu-range", range, 4)) {
dev_err(data->dev, "missing calibration range.\n");
@@ -189,7 +189,7 @@ static void qoriq_tmu_init_device(struct qoriq_tmu_data *data)
static int qoriq_tmu_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct qoriq_tmu_data *data;
u32 site;
int ret;
diff --git a/drivers/aiodev/stm32-adc-core.c b/drivers/aiodev/stm32-adc-core.c
index 43abed8386..b83cabb973 100644
--- a/drivers/aiodev/stm32-adc-core.c
+++ b/drivers/aiodev/stm32-adc-core.c
@@ -186,7 +186,7 @@ static int stm32_adc_core_probe(struct device_d *dev)
goto err_bclk_disable;
dev->priv = common;
- return of_platform_populate(dev->device_node, NULL, dev);
+ return of_platform_populate(dev->of_node, NULL, dev);
err_bclk_disable:
clk_disable(common->bclk);
diff --git a/drivers/aiodev/stm32-adc.c b/drivers/aiodev/stm32-adc.c
index 930708d4df..3969da5975 100644
--- a/drivers/aiodev/stm32-adc.c
+++ b/drivers/aiodev/stm32-adc.c
@@ -219,7 +219,7 @@ static int stm32_adc_chan_of_init(struct device_d *dev, struct stm32_adc *adc)
int ret;
/* Retrieve single ended channels listed in device tree */
- of_get_property(dev->device_node, "st,adc-channels", &num_channels);
+ of_get_property(dev->of_node, "st,adc-channels", &num_channels);
num_channels /= sizeof(__be32);
if (num_channels > adc->cfg->max_channels) {
@@ -228,7 +228,7 @@ static int stm32_adc_chan_of_init(struct device_d *dev, struct stm32_adc *adc)
}
/* Optional sample time is provided either for each, or all channels */
- of_get_property(dev->device_node, "st,min-sample-time-nsecs", &num_times);
+ of_get_property(dev->of_node, "st,min-sample-time-nsecs", &num_times);
num_times /= sizeof(__be32);
if (num_times > 1 && num_times != num_channels) {
dev_err(dev, "Invalid st,min-sample-time-nsecs\n");
@@ -252,7 +252,8 @@ static int stm32_adc_chan_of_init(struct device_d *dev, struct stm32_adc *adc)
for (i = 0; i < num_channels; i++) {
u32 chan;
- ret = of_property_read_u32_index(dev->device_node, "st,adc-channels", i, &chan);
+ ret = of_property_read_u32_index(dev->of_node,
+ "st,adc-channels", i, &chan);
if (ret)
return ret;
@@ -273,7 +274,8 @@ static int stm32_adc_chan_of_init(struct device_d *dev, struct stm32_adc *adc)
* get either no value, 1 shared value for all indexes, or one
* value per channel.
*/
- of_property_read_u32_index(dev->device_node, "st,min-sample-time-nsecs",
+ of_property_read_u32_index(dev->of_node,
+ "st,min-sample-time-nsecs",
i, &smp);
/* Prepare sampling time settings */
stm32_adc_smpr_init(adc, chan, smp);
@@ -295,7 +297,7 @@ static int stm32_adc_probe(struct device_d *dev)
u32 offset;
int ret;
- ret = of_property_read_u32(dev->device_node, "reg", &offset);
+ ret = of_property_read_u32(dev->of_node, "reg", &offset);
if (ret) {
dev_err(dev, "Can't read reg property\n");
return ret;
diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
index 96ea3717b6..b8711d0de3 100644
--- a/drivers/ata/intf_platform_ide.c
+++ b/drivers/ata/intf_platform_ide.c
@@ -74,7 +74,7 @@ static int platform_ide_probe(struct device_d *dev)
void *reg_base, *alt_base = NULL;
struct resource *reg, *alt;
int mmio = 0;
- struct device_node *dn = dev->device_node;
+ struct device_node *dn = dev->of_node;
u32 ioport_shift = 0;
int dataif_be = 0;
void (*reset)(int) = NULL;
diff --git a/drivers/ata/pata-imx.c b/drivers/ata/pata-imx.c
index 383f5f3bc1..48f7159726 100644
--- a/drivers/ata/pata-imx.c
+++ b/drivers/ata/pata-imx.c
@@ -171,7 +171,7 @@ static int imx_pata_probe(struct device_d *dev)
ide->port.dev = dev;
- ide->port.devname = xstrdup(of_alias_get(dev->device_node));
+ ide->port.devname = xstrdup(of_alias_get(dev->of_node));
dev->priv = ide;
dev->detect = pata_imx_detect;
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 3c2bab937a..09bd621e39 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -49,7 +49,7 @@ int bus_register(struct bus_type *bus)
int device_match(struct device_d *dev, struct driver_d *drv)
{
- if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node &&
+ if (IS_ENABLED(CONFIG_OFDEVICE) && dev->of_node &&
drv->of_compatible)
return of_match(dev, drv);
@@ -80,10 +80,10 @@ int device_match_of_modalias(struct device_d *dev, struct driver_d *drv)
if (!device_match(dev, drv))
return 0;
- if (!id || !IS_ENABLED(CONFIG_OFDEVICE) || !dev->device_node)
+ if (!id || !IS_ENABLED(CONFIG_OFDEVICE) || !dev->of_node)
return -1;
- of_property_for_each_string(dev->device_node, "compatible", prop, compat) {
+ of_property_for_each_string(dev->of_node, "compatible", prop, compat) {
p = strchr(compat, ',');
of_modalias = p ? p + 1 : compat;
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index cbe1c974f4..8057032a81 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -102,7 +102,7 @@ int device_probe(struct device_d *dev)
static int depth = 0;
int ret;
- ret = of_feature_controller_check(dev->device_node);
+ ret = of_feature_controller_check(dev->of_node);
if (ret < 0)
return ret;
if (ret == FEATCTRL_GATED) {
@@ -115,7 +115,7 @@ int device_probe(struct device_d *dev)
pr_report_probe("%*sprobe-> %s\n", depth * 4, "", dev_name(dev));
pinctrl_select_state_default(dev);
- of_clk_set_defaults(dev->device_node, false);
+ of_clk_set_defaults(dev->of_node, false);
list_add(&dev->active, &active_device_list);
@@ -291,7 +291,7 @@ int unregister_device(struct device_d *old_dev)
if (old_dev->parent)
list_del(&old_dev->sibling);
if (dev_of_node(old_dev))
- old_dev->device_node->dev = NULL;
+ old_dev->of_node->dev = NULL;
return 0;
}
diff --git a/drivers/base/power.c b/drivers/base/power.c
index 3eabf3c897..d4551879e7 100644
--- a/drivers/base/power.c
+++ b/drivers/base/power.c
@@ -252,18 +252,18 @@ static int __genpd_dev_pm_attach(struct device_d *dev, struct device_node *np,
*/
int genpd_dev_pm_attach(struct device_d *dev)
{
- if (!dev->device_node)
+ if (!dev->of_node)
return 0;
/*
* Devices with multiple PM domains must be attached separately, as we
* can only attach one PM domain per device.
*/
- if (of_count_phandle_with_args(dev->device_node, "power-domains",
+ if (of_count_phandle_with_args(dev->of_node, "power-domains",
"#power-domain-cells") != 1)
return 0;
- return __genpd_dev_pm_attach(dev, dev->device_node, 0, true);
+ return __genpd_dev_pm_attach(dev, dev->of_node, 0, true);
}
EXPORT_SYMBOL_GPL(genpd_dev_pm_attach);
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 35c462f962..a35528227d 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -35,8 +35,8 @@ enum regmap_endian regmap_get_val_endian(struct device_d *dev,
return endian;
/* If the dev and dev->device_node exist try to get endianness from DT */
- if (dev && dev->device_node) {
- np = dev->device_node;
+ if (dev && dev->of_node) {
+ np = dev->of_node;
/* Parse the device's DT node for an endianness specification */
if (of_property_read_bool(np, "big-endian"))
diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c
index 01a35cfc9f..7d8471b7ac 100644
--- a/drivers/bus/imx-weim.c
+++ b/drivers/bus/imx-weim.c
@@ -106,7 +106,7 @@ static int weim_parse_dt(struct imx_weim *weim)
struct device_node *child;
int ret;
- for_each_child_of_node(weim->dev->device_node, child) {
+ for_each_child_of_node(weim->dev->of_node, child) {
if (!child->name)
continue;
@@ -118,10 +118,10 @@ static int weim_parse_dt(struct imx_weim *weim)
}
}
- ret = of_platform_populate(weim->dev->device_node, NULL, weim->dev);
+ ret = of_platform_populate(weim->dev->of_node, NULL, weim->dev);
if (ret)
dev_err(weim->dev, "%s fail to create devices.\n",
- weim->dev->device_node->full_name);
+ weim->dev->of_node->full_name);
return ret;
}
diff --git a/drivers/bus/omap-gpmc.c b/drivers/bus/omap-gpmc.c
index 5f65d59911..2d3a637820 100644
--- a/drivers/bus/omap-gpmc.c
+++ b/drivers/bus/omap-gpmc.c
@@ -523,7 +523,7 @@ static int gpmc_probe_nand_child(struct device_d *dev,
dev = device_alloc("gpmc_nand", DEVICE_ID_DYNAMIC);
device_add_resource(dev, NULL, (resource_size_t)gpmc_base, SZ_4K, IORESOURCE_MEM);
device_add_data(dev, &gpmc_nand_data, sizeof(gpmc_nand_data));
- dev->device_node = child;
+ dev->of_node = child;
platform_device_register(dev);
return 0;
@@ -602,7 +602,7 @@ err:
static int gpmc_probe(struct device_d *dev)
{
- struct device_node *child, *node = dev->device_node;
+ struct device_node *child, *node = dev->of_node;
int ret;
gpmc_generic_init(0x12);
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index ff9d2f81cd..e863e01f3b 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -12,11 +12,11 @@ static int ti_sysc_probe(struct device_d *dev)
{
int ret;
- ret = of_platform_populate(dev->device_node,
+ ret = of_platform_populate(dev->of_node,
of_default_bus_match_table, dev);
if (ret)
dev_err(dev, "%s fail to create devices.\n",
- dev->device_node->full_name);
+ dev->of_node->full_name);
return ret;
};
diff --git a/drivers/clk/bcm/clk-bcm2835-aux.c b/drivers/clk/bcm/clk-bcm2835-aux.c
index 385cfd5d3f..b4636b850e 100644
--- a/drivers/clk/bcm/clk-bcm2835-aux.c
+++ b/drivers/clk/bcm/clk-bcm2835-aux.c
@@ -25,7 +25,7 @@ static int bcm2835_aux_clk_probe(struct device_d *dev)
return PTR_ERR(parent_clk);
parent = __clk_get_name(parent_clk);
- reg = of_iomap(dev->device_node, 0);
+ reg = of_iomap(dev->of_node, 0);
if (!reg)
return -ENOMEM;
@@ -45,7 +45,7 @@ static int bcm2835_aux_clk_probe(struct device_d *dev)
onecell->hws[BCM2835_AUX_CLOCK_SPI2] =
clk_hw_register_gate(dev, "aux_spi2", parent, 0, gate, 2, 0, NULL);
- return of_clk_add_hw_provider(dev->device_node, of_clk_hw_onecell_get,
+ return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
onecell);
}
diff --git a/drivers/clk/clk-ar933x.c b/drivers/clk/clk-ar933x.c
index c5e57f41ec..372a9e7457 100644
--- a/drivers/clk/clk-ar933x.c
+++ b/drivers/clk/clk-ar933x.c
@@ -118,7 +118,7 @@ static int ar933x_clk_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = ARRAY_SIZE(clks);
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get,
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get,
&clk_data);
return 0;
diff --git a/drivers/clk/clk-ar9344.c b/drivers/clk/clk-ar9344.c
index d2f63f2608..5bb55d2227 100644
--- a/drivers/clk/clk-ar9344.c
+++ b/drivers/clk/clk-ar9344.c
@@ -113,7 +113,7 @@ static int ar9344_clk_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = ARRAY_SIZE(clks);
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get,
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get,
&clk_data);
return 0;
diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c
index 4510283962..f6fe07a0bf 100644
--- a/drivers/clk/clk-bulk.c
+++ b/drivers/clk/clk-bulk.c
@@ -143,7 +143,7 @@ EXPORT_SYMBOL(clk_bulk_put_all);
int __must_check clk_bulk_get_all(struct device_d *dev,
struct clk_bulk_data **clks)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
if (!np)
return 0;
diff --git a/drivers/clk/clk-rpi.c b/drivers/clk/clk-rpi.c
index 71badc04c0..1eae4540bb 100644
--- a/drivers/clk/clk-rpi.c
+++ b/drivers/clk/clk-rpi.c
@@ -86,7 +86,7 @@ static int rpi_cprman_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = BCM2711_CLOCK_END;
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data);
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data);
return 0;
}
diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c
index 9170dba393..fcffe6a438 100644
--- a/drivers/clk/clk-scmi.c
+++ b/drivers/clk/clk-scmi.c
@@ -120,7 +120,7 @@ static int scmi_clocks_probe(struct scmi_device *sdev)
struct clk **clks;
struct clk_onecell_data *clk_data;
struct device_d *dev = &sdev->dev;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
const struct scmi_handle *handle = sdev->handle;
struct scmi_protocol_handle *ph;
@@ -172,7 +172,8 @@ static int scmi_clocks_probe(struct scmi_device *sdev)
}
}
- return of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, clk_data);
+ return of_clk_add_provider(dev->of_node, of_clk_src_onecell_get,
+ clk_data);
}
static const struct scmi_device_id scmi_id_table[] = {
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 462a7e16ef..d7d0103bdc 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -177,7 +177,7 @@ struct clk *clk_get(struct device_d *dev, const char *con_id)
return clk;
if (dev) {
- clk = of_clk_get_by_name(dev->device_node, con_id);
+ clk = of_clk_get_by_name(dev->of_node, con_id);
if (!IS_ERR(clk) || PTR_ERR(clk) != -ENOENT)
return clk;
}
diff --git a/drivers/clk/imx/clk-imx5.c b/drivers/clk/imx/clk-imx5.c
index 81af9a9c88..d96aa81358 100644
--- a/drivers/clk/imx/clk-imx5.c
+++ b/drivers/clk/imx/clk-imx5.c
@@ -207,7 +207,7 @@ static void __init mx5_clocks_common_init(struct device_d *dev, void __iomem *ba
clks[IMX5_CLK_DUMMY] = clk_fixed("dummy", 0);
- if (!IS_ENABLED(CONFIG_COMMON_CLK_OF_PROVIDER) || !dev->device_node) {
+ if (!IS_ENABLED(CONFIG_COMMON_CLK_OF_PROVIDER) || !dev->of_node) {
clks[IMX5_CLK_CKIL] = clk_fixed("ckil", 32768);
clks[IMX5_CLK_OSC] = clk_fixed("osc", 24000000);
}
@@ -418,7 +418,7 @@ static int imx51_ccm_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = IMX5_CLK_END;
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data);
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data);
return 0;
}
@@ -516,7 +516,7 @@ static int imx53_ccm_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = IMX5_CLK_END;
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data);
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data);
return 0;
}
diff --git a/drivers/clk/imx/clk-imx6.c b/drivers/clk/imx/clk-imx6.c
index 06cc992b72..692bbd4e0a 100644
--- a/drivers/clk/imx/clk-imx6.c
+++ b/drivers/clk/imx/clk-imx6.c
@@ -808,7 +808,7 @@ static int imx6_ccm_probe(struct device_d *dev)
imx6q_mmdc_ch1_mask_handshake(ccm_base);
if (IS_ENABLED(CONFIG_DRIVER_VIDEO_IMX_IPUV3))
- imx6_add_video_clks(anatop_base, ccm_base, dev->device_node);
+ imx6_add_video_clks(anatop_base, ccm_base, dev->of_node);
writel(0xffffffff, ccm_base + CCGR0);
writel(0xf0ffffff, ccm_base + CCGR1); /* gate GPU3D, GPU2D */
@@ -824,7 +824,7 @@ static int imx6_ccm_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = IMX6QDL_CLK_END;
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data);
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data);
clk_enable(clks[IMX6QDL_CLK_MMDC_CH0_AXI_PODF]);
clk_enable(clks[IMX6QDL_CLK_PLL6_ENET]);
diff --git a/drivers/clk/imx/clk-imx6sl.c b/drivers/clk/imx/clk-imx6sl.c
index 466893f82f..3e6a8c58d0 100644
--- a/drivers/clk/imx/clk-imx6sl.c
+++ b/drivers/clk/imx/clk-imx6sl.c
@@ -85,7 +85,7 @@ static int imx6sl_ccm_probe(struct device_d *dev)
{
struct resource *iores;
void __iomem *base, *anatop_base, *ccm_base;
- struct device_node *ccm_node = dev->device_node;
+ struct device_node *ccm_node = dev->of_node;
clks[IMX6SL_CLK_DUMMY] = clk_fixed("dummy", 0);
diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c
index c11829259e..ae61c138fd 100644
--- a/drivers/clk/imx/clk-imx6sx.c
+++ b/drivers/clk/imx/clk-imx6sx.c
@@ -113,7 +113,7 @@ static int imx6sx_ccm_probe(struct device_d *dev)
{
struct resource *iores;
void __iomem *base, *anatop_base, *ccm_base;
- struct device_node *ccm_node = dev->device_node;
+ struct device_node *ccm_node = dev->of_node;
clks[IMX6SX_CLK_DUMMY] = clk_fixed("dummy", 0);
diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c
index af5d582ffc..24350d63fa 100644
--- a/drivers/clk/imx/clk-imx6ul.c
+++ b/drivers/clk/imx/clk-imx6ul.c
@@ -97,7 +97,7 @@ static int imx6_ccm_probe(struct device_d *dev)
struct resource *iores;
void __iomem *base, *anatop_base, *ccm_base;
int i;
- struct device_node *ccm_node = dev->device_node;
+ struct device_node *ccm_node = dev->of_node;
struct clk_hw *hw;
anatop_base = IOMEM(MX6_ANATOP_BASE_ADDR);
diff --git a/drivers/clk/imx/clk-imx7.c b/drivers/clk/imx/clk-imx7.c
index 588e9cbe5c..b75928d59e 100644
--- a/drivers/clk/imx/clk-imx7.c
+++ b/drivers/clk/imx/clk-imx7.c
@@ -807,9 +807,9 @@ static int imx7_ccm_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = ARRAY_SIZE(clks);
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data);
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data);
- ccm_np = dev->device_node;
+ ccm_np = dev->of_node;
/*
* imx7_clk_setup() requires both the CCM and fixed-clock osc devices
diff --git a/drivers/clk/loongson/clk-ls1b200.c b/drivers/clk/loongson/clk-ls1b200.c
index 6ac545224f..096768c7a1 100644
--- a/drivers/clk/loongson/clk-ls1b200.c
+++ b/drivers/clk/loongson/clk-ls1b200.c
@@ -129,7 +129,7 @@ static int ls1b200_clk_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = ARRAY_SIZE(clks);
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data);
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data);
return 0;
}
diff --git a/drivers/clk/mvebu/common.c b/drivers/clk/mvebu/common.c
index 3d924ccf4d..17cbc77690 100644
--- a/drivers/clk/mvebu/common.c
+++ b/drivers/clk/mvebu/common.c
@@ -42,7 +42,7 @@ static struct of_device_id mvebu_coreclk_ids[] = {
static int mvebu_coreclk_probe(struct device_d *dev)
{
struct resource *iores;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
const struct of_device_id *match;
const struct coreclk_soc_desc *desc;
const char *tclk_name = "tclk";
@@ -151,7 +151,7 @@ static struct of_device_id mvebu_clk_gating_ids[] = {
static int mvebu_clk_gating_probe(struct device_d *dev)
{
struct resource *iores;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
const struct of_device_id *match;
const struct clk_gating_soc_desc *desc;
struct clk_gating_ctrl *ctrl;
diff --git a/drivers/clk/mvebu/corediv.c b/drivers/clk/mvebu/corediv.c
index 1b7fa12701..7b85bd01d3 100644
--- a/drivers/clk/mvebu/corediv.c
+++ b/drivers/clk/mvebu/corediv.c
@@ -197,7 +197,7 @@ static struct of_device_id mvebu_corediv_clk_ids[] = {
static int mvebu_corediv_clk_probe(struct device_d *dev)
{
struct resource *iores;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
const struct of_device_id *match;
const struct clk_corediv_soc_desc *soc_desc;
struct clk_corediv *corediv;
diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c
index 382021e49c..a10571237f 100644
--- a/drivers/clk/mxs/clk-imx28.c
+++ b/drivers/clk/mxs/clk-imx28.c
@@ -147,10 +147,11 @@ static int __init mx28_clocks_init(struct device_d *dev, void __iomem *regs)
clk_set_parent(clks[lcdif_sel], clks[ref_pix]);
clk_set_parent(clks[gpmi_sel], clks[ref_gpmi]);
- if (dev->device_node) {
+ if (dev->of_node) {
clk_data.clks = clks;
clk_data.clk_num = clk_max;
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data);
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get,
+ &clk_data);
} else {
clkdev_add_physbase(clks[ssp0], IMX_SSP0_BASE, NULL);
clkdev_add_physbase(clks[ssp1], IMX_SSP1_BASE, NULL);
diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
index 399d6006c6..1f2430e521 100644
--- a/drivers/clk/rockchip/clk-rk3399.c
+++ b/drivers/clk/rockchip/clk-rk3399.c
@@ -1629,7 +1629,7 @@ static const struct of_device_id clk_rk3399_match_table[] = {
static int __init clk_rk3399_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
const struct of_device_id *match;
const struct clk_rk3399_inits *init_data;
diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c
index 7f9c29316a..3e788f2c5a 100644
--- a/drivers/clk/rockchip/clk-rk3568.c
+++ b/drivers/clk/rockchip/clk-rk3568.c
@@ -1721,7 +1721,7 @@ static const struct of_device_id clk_rk3568_match_table[] = {
static int __init clk_rk3568_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
const struct clk_rk3568_inits *init_data;
init_data = of_device_get_match_data(dev);
diff --git a/drivers/clk/sifive/sifive-prci.c b/drivers/clk/sifive/sifive-prci.c
index 2ef10f9693..010ccb92af 100644
--- a/drivers/clk/sifive/sifive-prci.c
+++ b/drivers/clk/sifive/sifive-prci.c
@@ -477,7 +477,7 @@ static int __prci_register_clocks(struct device_d *dev, struct __prci_data *pd,
struct __prci_clock *pic;
int parent_count, i, r;
- parent_count = of_clk_get_parent_count(dev->device_node);
+ parent_count = of_clk_get_parent_count(dev->of_node);
if (parent_count != EXPECTED_CLK_PARENT_COUNT) {
dev_err(dev, "expected only two parent clocks, found %d\n",
parent_count);
@@ -520,7 +520,7 @@ static int __prci_register_clocks(struct device_d *dev, struct __prci_data *pd,
pd->hw_clks.clk_num = i;
- r = of_clk_add_provider(dev->device_node, of_clk_src_onecell_get,
+ r = of_clk_add_provider(dev->of_node, of_clk_src_onecell_get,
&pd->hw_clks);
if (r) {
dev_err(dev, "could not add hw_provider: %d\n", r);
diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
index 8ee405c6c6..6691403843 100644
--- a/drivers/clk/socfpga/clk.c
+++ b/drivers/clk/socfpga/clk.c
@@ -407,7 +407,7 @@ static int socfpga_ccm_probe(struct device_d *dev)
clk_mgr_base_addr = regs;
- clknode = of_get_child_by_name(dev->device_node, "clocks");
+ clknode = of_get_child_by_name(dev->of_node, "clocks");
if (!clknode)
return -EINVAL;
diff --git a/drivers/clk/starfive/jh7100-clkgen.c b/drivers/clk/starfive/jh7100-clkgen.c
index 36dc91991e..29095aa991 100644
--- a/drivers/clk/starfive/jh7100-clkgen.c
+++ b/drivers/clk/starfive/jh7100-clkgen.c
@@ -340,11 +340,11 @@ static int starfive_clkgen_clk_probe(struct device_d *dev)
if (IS_ERR(iores))
return PTR_ERR(iores);
- starfive_clkgen_init(dev->device_node, IOMEM(iores->start));
+ starfive_clkgen_init(dev->of_node, IOMEM(iores->start));
clk_data.clks = clks;
clk_data.clk_num = ARRAY_SIZE(clks);
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get,
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get,
&clk_data);
return 0;
diff --git a/drivers/clk/tegra/clk-tegra124.c b/drivers/clk/tegra/clk-tegra124.c
index bdd822e296..c7644361f3 100644
--- a/drivers/clk/tegra/clk-tegra124.c
+++ b/drivers/clk/tegra/clk-tegra124.c
@@ -345,10 +345,10 @@ static int tegra124_car_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = ARRAY_SIZE(clks);
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get,
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get,
&clk_data);
- tegra_clk_init_rst_controller(car_base, dev->device_node, 6 * 32);
+ tegra_clk_init_rst_controller(car_base, dev->of_node, 6 * 32);
tegra_clk_reset_uarts();
return 0;
diff --git a/drivers/clk/tegra/clk-tegra20.c b/drivers/clk/tegra/clk-tegra20.c
index 6e5fa144e4..04bcec1f25 100644
--- a/drivers/clk/tegra/clk-tegra20.c
+++ b/drivers/clk/tegra/clk-tegra20.c
@@ -348,10 +348,10 @@ static int tegra20_car_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = ARRAY_SIZE(clks);
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get,
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get,
&clk_data);
- tegra_clk_init_rst_controller(car_base, dev->device_node, 3 * 32);
+ tegra_clk_init_rst_controller(car_base, dev->of_node, 3 * 32);
tegra_clk_reset_uarts();
return 0;
diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c
index 505851f8f5..cbb3b959b4 100644
--- a/drivers/clk/tegra/clk-tegra30.c
+++ b/drivers/clk/tegra/clk-tegra30.c
@@ -376,10 +376,10 @@ static int tegra30_car_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = ARRAY_SIZE(clks);
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get,
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get,
&clk_data);
- tegra_clk_init_rst_controller(car_base, dev->device_node, 6 * 32);
+ tegra_clk_init_rst_controller(car_base, dev->of_node, 6 * 32);
tegra_clk_reset_uarts();
return 0;
diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index e4ce102d6e..a6916bf448 100644
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@ -380,7 +380,7 @@ static int zynq_clock_probe(struct device_d *dev)
* in the SCLR region. So we can't directly map the address we get from
* the DT, but need to add the SCLR base offset.
*/
- if (dev->device_node) {
+ if (dev->of_node) {
struct resource *parent_res;
parent_res = dev_get_resource(dev->parent, IORESOURCE_MEM, 0);
@@ -470,7 +470,7 @@ static int zynq_clock_probe(struct device_d *dev)
clk_data.clks = clks;
clk_data.clk_num = ARRAY_SIZE(clks);
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get,
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get,
&clk_data);
return 0;
diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c
index d7ac0bdb36..a5cb99ba8d 100644
--- a/drivers/clk/zynqmp/clkc.c
+++ b/drivers/clk/zynqmp/clkc.c
@@ -452,7 +452,7 @@ static int zynqmp_register_clocks(struct device_d *dev,
unsigned int i;
const char *parent_names[MAX_PARENT];
char *name;
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
int num_parents;
for (i = 0; i < num_clocks; i++) {
@@ -558,7 +558,7 @@ static int zynqmp_clock_probe(struct device_d *dev)
zynqmp_register_clocks(dev, clk_data->clks, num_clocks);
clk_data->clk_num = num_clocks;
- of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, clk_data);
+ of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, clk_data);
/*
* We can free clock_info now, as is only used to store clock info
diff --git a/drivers/clocksource/armv7m_systick.c b/drivers/clocksource/armv7m_systick.c
index 16d89c23bd..9eb292ee94 100644
--- a/drivers/clocksource/armv7m_systick.c
+++ b/drivers/clocksource/armv7m_systick.c
@@ -47,7 +47,7 @@ static int armv7m_systick_probe(struct device_d *dev)
if (!systick_base)
return -ENOENT;
- ret = of_property_read_u32(dev->device_node, "clock-frequency", &rate);
+ ret = of_property_read_u32(dev->of_node, "clock-frequency", &rate);
if (ret) {
clk = clk_get(dev, NULL);
if (IS_ERR(clk))
diff --git a/drivers/clocksource/bcm2835.c b/drivers/clocksource/bcm2835.c
index d5d3e3477d..26c1382738 100644
--- a/drivers/clocksource/bcm2835.c
+++ b/drivers/clocksource/bcm2835.c
@@ -41,7 +41,7 @@ static int bcm2835_cs_probe(struct device_d *dev)
/* try to read rate from DT property first */
if (IS_ENABLED(CONFIG_OFTREE))
- of_property_read_u32(dev->device_node, "clock-frequency",
+ of_property_read_u32(dev->of_node, "clock-frequency",
&rate);
/* if rate is still empty, try to get rate from clk */
diff --git a/drivers/clocksource/clps711x.c b/drivers/clocksource/clps711x.c
index d6ab695afa..e96924b750 100644
--- a/drivers/clocksource/clps711x.c
+++ b/drivers/clocksource/clps711x.c
@@ -29,7 +29,7 @@ static int clps711x_cs_probe(struct device_d *dev)
struct clk *timer_clk;
int id;
- id = of_alias_get_id(dev->device_node, "timer");
+ id = of_alias_get_id(dev->of_node, "timer");
if (id != 1)
return 0;
diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c
index 251089cf7e..d0be26b380 100644
--- a/drivers/clocksource/dw_apb_timer.c
+++ b/drivers/clocksource/dw_apb_timer.c
@@ -99,7 +99,7 @@ static struct clocksource dw_apb_clksrc = {
static int dw_apb_timer_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct resource *iores;
struct clk *clk;
uint32_t clk_freq;
diff --git a/drivers/clocksource/mvebu.c b/drivers/clocksource/mvebu.c
index d3214955dc..47a4e379c1 100644
--- a/drivers/clocksource/mvebu.c
+++ b/drivers/clocksource/mvebu.c
@@ -58,7 +58,7 @@ static int mvebu_timer_probe(struct device_d *dev)
val = __raw_readl(timer_base + TIMER_CTRL_OFF);
val &= ~(TIMER0_25MHZ | TIMER0_DIV_MASK);
- if (of_device_is_compatible(dev->device_node,
+ if (of_device_is_compatible(dev->of_node,
"marvell,armada-370-timer")) {
clk = clk_get(dev, NULL);
div = TIMER_DIVIDER;
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index e271051575..3a86c5f9a3 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -366,7 +366,7 @@ static int caam_probe(struct device_d *dev)
dev->priv = ctrlpriv;
ctrlpriv->pdev = dev;
- nprop = dev->device_node;
+ nprop = dev->of_node;
ctrlpriv->caam_ipg = clk_get(dev, "ipg");
if (IS_ERR(ctrlpriv->caam_ipg)) {
diff --git a/drivers/eeprom/at24.c b/drivers/eeprom/at24.c
index 3103d7722a..88be3098cc 100644
--- a/drivers/eeprom/at24.c
+++ b/drivers/eeprom/at24.c
@@ -390,8 +390,8 @@ static int at24_probe(struct device_d *dev)
chip.byte_len = BIT(magic & AT24_BITMASK(AT24_SIZE_BYTELEN));
magic >>= AT24_SIZE_BYTELEN;
chip.flags = magic & AT24_BITMASK(AT24_SIZE_FLAGS);
- if (dev->device_node &&
- !of_property_read_u32(dev->device_node, "pagesize", &page_size))
+ if (dev->of_node &&
+ !of_property_read_u32(dev->of_node, "pagesize", &page_size))
chip.page_size = page_size;
else {
/*
@@ -427,7 +427,7 @@ static int at24_probe(struct device_d *dev)
at24->chip = chip;
at24->num_addresses = num_addresses;
- alias = of_alias_get(dev->device_node);
+ alias = of_alias_get(dev->of_node);
if (alias) {
devname = xstrdup(alias);
} else {
@@ -441,7 +441,7 @@ static int at24_probe(struct device_d *dev)
writable = !(chip.flags & AT24_FLAG_READONLY);
- if (of_get_property(dev->device_node, "read-only", NULL))
+ if (of_get_property(dev->of_node, "read-only", NULL))
writable = 0;
if (writable) {
@@ -456,10 +456,10 @@ static int at24_probe(struct device_d *dev)
}
at24->wp_gpio = -1;
- if (dev->device_node) {
+ if (dev->of_node) {
enum of_gpio_flags flags;
- at24->wp_gpio = of_get_named_gpio_flags(dev->device_node,
- "wp-gpios", 0, &flags);
+ at24->wp_gpio = of_get_named_gpio_flags(dev->of_node,
+ "wp-gpios", 0, &flags);
if (gpio_is_valid(at24->wp_gpio)) {
at24->wp_active_low = flags & OF_GPIO_ACTIVE_LOW;
gpio_request(at24->wp_gpio, "eeprom-wp");
diff --git a/drivers/eeprom/at25.c b/drivers/eeprom/at25.c
index ee4663270b..21dea33fbd 100644
--- a/drivers/eeprom/at25.c
+++ b/drivers/eeprom/at25.c
@@ -301,8 +301,8 @@ static int at25_probe(struct device_d *dev)
at25 = xzalloc(sizeof(*at25));
/* Chip description */
- if (dev->device_node) {
- err = at25_np_to_chip(dev, dev->device_node, &at25->chip);
+ if (dev->of_node) {
+ err = at25_np_to_chip(dev, dev->of_node, &at25->chip);
if (err)
goto fail;
} else {
@@ -354,7 +354,7 @@ static int at25_probe(struct device_d *dev)
goto fail;
dev_dbg(dev, "%s probed\n", at25->cdev.name);
- of_parse_partitions(&at25->cdev, dev->device_node);
+ of_parse_partitions(&at25->cdev, dev->of_node);
of_partitions_register_fixup(&at25->cdev);
return 0;
diff --git a/drivers/firmware/altera_serial.c b/drivers/firmware/altera_serial.c
index dcb49ad4dd..27eb367a68 100644
--- a/drivers/firmware/altera_serial.c
+++ b/drivers/firmware/altera_serial.c
@@ -267,7 +267,7 @@ static int altera_spi_close(struct firmware_handler *fh)
static int altera_spi_of(struct device_d *dev, struct fpga_spi *this)
{
- struct device_node *n = dev->device_node;
+ struct device_node *n = dev->of_node;
const char *name;
int ret;
@@ -334,7 +334,7 @@ static int altera_spi_probe(struct device_d *dev)
int rc;
struct fpga_spi *this;
struct firmware_handler *fh;
- const char *alias = of_alias_get(dev->device_node);
+ const char *alias = of_alias_get(dev->of_node);
const char *model = NULL;
const struct altera_ps_data *data;
@@ -359,11 +359,11 @@ static int altera_spi_probe(struct device_d *dev)
fh->open = altera_spi_open;
fh->write = altera_spi_write;
fh->close = altera_spi_close;
- of_property_read_string(dev->device_node, "compatible", &model);
+ of_property_read_string(dev->of_node, "compatible", &model);
if (model)
fh->model = xstrdup(model);
fh->dev = dev;
- fh->device_node = dev->device_node;
+ fh->device_node = dev->of_node;
this->spi = (struct spi_device *)dev->type_data;
this->data = data;
diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c
index e8297be4d2..1f6338aa2f 100644
--- a/drivers/firmware/arm_scmi/bus.c
+++ b/drivers/firmware/arm_scmi/bus.c
@@ -159,7 +159,7 @@ scmi_device_alloc(struct device_node *np, struct device_d *parent, int protocol,
scmi_dev->dev.id = DEVICE_ID_DYNAMIC;
scmi_dev->protocol_id = protocol;
scmi_dev->dev.parent = parent;
- scmi_dev->dev.device_node = np;
+ scmi_dev->dev.of_node = np;
scmi_dev->dev.bus = &scmi_bus_type;
dev_set_name(&scmi_dev->dev, "scmi_dev");
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index fc02a53a2b..a74746ac30 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -1154,7 +1154,7 @@ static int scmi_probe(struct device_d *dev)
struct scmi_handle *handle;
const struct scmi_desc *desc;
struct scmi_info *info;
- struct device_node *child, *np = dev->device_node;
+ struct device_node *child, *np = dev->of_node;
desc = of_device_get_match_data(dev);
if (!desc)
diff --git a/drivers/firmware/arm_scmi/smc.c b/drivers/firmware/arm_scmi/smc.c
index 67f19a7b43..fd45d55b2e 100644
--- a/drivers/firmware/arm_scmi/smc.c
+++ b/drivers/firmware/arm_scmi/smc.c
@@ -31,7 +31,7 @@ struct scmi_smc {
static bool smc_chan_available(struct device_d *dev, int idx)
{
- return of_parse_phandle(dev->device_node, "shmem", 0) != NULL;
+ return of_parse_phandle(dev->of_node, "shmem", 0) != NULL;
}
static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device_d *dev,
@@ -52,7 +52,7 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device_d *dev,
if (!scmi_info)
return -ENOMEM;
- np = of_parse_phandle(cdev->device_node, "shmem", 0);
+ np = of_parse_phandle(cdev->of_node, "shmem", 0);
ret = of_address_to_resource(np, 0, &res);
if (ret) {
dev_err(cdev, "failed to get SCMI Tx shared memory\n");
@@ -62,7 +62,7 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device_d *dev,
size = resource_size(&res);
scmi_info->shmem = IOMEM(res.start);
- ret = of_property_read_u32(dev->device_node, "arm,smc-id", &func_id);
+ ret = of_property_read_u32(dev->of_node, "arm,smc-id", &func_id);
if (ret < 0)
return ret;
diff --git a/drivers/firmware/socfpga.c b/drivers/firmware/socfpga.c
index 98b47f6570..4ab41cbf79 100644
--- a/drivers/firmware/socfpga.c
+++ b/drivers/firmware/socfpga.c
@@ -382,7 +382,7 @@ static int socfpga_fpgamgr_probe(struct device_d *dev)
struct resource *iores;
struct fpgamgr *mgr;
struct firmware_handler *fh;
- const char *alias = of_alias_get(dev->device_node);
+ const char *alias = of_alias_get(dev->of_node);
const char *model = NULL;
struct param_d *p;
int ret;
@@ -414,7 +414,7 @@ static int socfpga_fpgamgr_probe(struct device_d *dev)
fh->open = socfpga_fpgamgr_program_start;
fh->write = socfpga_fpgamgr_program_write_buf;
fh->close = socfpga_fpgamgr_program_finish;
- of_property_read_string(dev->device_node, "compatible", &model);
+ of_property_read_string(dev->of_node, "compatible", &model);
if (model)
fh->model = xstrdup(model);
fh->dev = dev;
@@ -435,7 +435,7 @@ static int socfpga_fpgamgr_probe(struct device_d *dev)
}
fh->dev = &mgr->dev;
- fh->device_node = dev->device_node;
+ fh->device_node = dev->of_node;
ret = firmwaremgr_register(fh);
if (ret != 0) {
diff --git a/drivers/firmware/zynqmp-fpga.c b/drivers/firmware/zynqmp-fpga.c
index 63d7398fd4..0c40522ddf 100644
--- a/drivers/firmware/zynqmp-fpga.c
+++ b/drivers/firmware/zynqmp-fpga.c
@@ -330,7 +330,7 @@ static int zynqmp_fpga_probe(struct device_d *dev)
{
struct fpgamgr *mgr;
struct firmware_handler *fh;
- const char *alias = of_alias_get(dev->device_node);
+ const char *alias = of_alias_get(dev->of_node);
const char *model = NULL;
struct param_d *p;
u32 api_version;
@@ -347,7 +347,7 @@ static int zynqmp_fpga_probe(struct device_d *dev)
fh->open = fpgamgr_program_start;
fh->write = fpgamgr_program_write_buf;
fh->close = fpgamgr_program_finish;
- of_property_read_string(dev->device_node, "compatible", &model);
+ of_property_read_string(dev->of_node, "compatible", &model);
if (model)
fh->model = xstrdup(model);
fh->dev = dev;
@@ -381,7 +381,7 @@ static int zynqmp_fpga_probe(struct device_d *dev)
}
fh->dev = &mgr->dev;
- fh->device_node = dev->device_node;
+ fh->device_node = dev->of_node;
ret = firmwaremgr_register(fh);
if (ret != 0) {
diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index dd52b4cb20..022498cd32 100644
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -201,7 +201,7 @@ int fpga_bridge_register(struct device_d *dev, const char *name,
bridge->priv = priv;
bridge->dev.parent = dev;
- bridge->dev.device_node = dev->device_node;
+ bridge->dev.of_node = dev->of_node;
bridge->dev.id = DEVICE_ID_DYNAMIC;
bridge->dev.name = xstrdup(name);
@@ -218,7 +218,7 @@ int fpga_bridge_register(struct device_d *dev, const char *name,
if (IS_ERR(p))
return PTR_ERR(p);
- of_platform_populate(dev->device_node, NULL, dev);
+ of_platform_populate(dev->of_node, NULL, dev);
dev_info(bridge->dev.parent, "fpga bridge [%s] registered\n",
bridge->dev.name);
diff --git a/drivers/fpga/socfpga-hps2fpga-bridge.c b/drivers/fpga/socfpga-hps2fpga-bridge.c
index b41db4512f..0eaaabf6c6 100644
--- a/drivers/fpga/socfpga-hps2fpga-bridge.c
+++ b/drivers/fpga/socfpga-hps2fpga-bridge.c
@@ -123,7 +123,7 @@ static int alt_fpga_bridge_probe(struct device_d *dev)
of_id = of_match_device(altera_fpga_of_match, dev);
priv = (struct altera_hps2fpga_data *)of_id->data;
- priv->bridge_reset = of_reset_control_get(dev->device_node, NULL);
+ priv->bridge_reset = of_reset_control_get(dev->of_node, NULL);
if (IS_ERR(priv->bridge_reset)) {
dev_err(dev, "Could not get %s reset control\n", priv->name);
return PTR_ERR(priv->bridge_reset);
@@ -143,7 +143,7 @@ static int alt_fpga_bridge_probe(struct device_d *dev)
priv->dev = dev;
- if (!of_property_read_u32(dev->device_node, "bridge-enable", &enable)) {
+ if (!of_property_read_u32(dev->of_node, "bridge-enable", &enable)) {
if (enable > 1) {
dev_warn(dev, "invalid bridge-enable %u > 1\n", enable);
} else {
diff --git a/drivers/gpio/gpio-74164.c b/drivers/gpio/gpio-74164.c
index 23dec89ec8..2e8ecf6b53 100644
--- a/drivers/gpio/gpio-74164.c
+++ b/drivers/gpio/gpio-74164.c
@@ -101,9 +101,9 @@ static int gpio_74164_probe(struct device_d *dev)
u32 num_regs = 1;
dev->id = DEVICE_ID_DYNAMIC;
- if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node) {
- dev->id = of_alias_get_id(dev->device_node, "gpio");
- of_property_read_u32(dev->device_node, "registers-number",
+ if (IS_ENABLED(CONFIG_OFDEVICE) && dev->of_node) {
+ dev->id = of_alias_get_id(dev->of_node, "gpio");
+ of_property_read_u32(dev->of_node, "registers-number",
&num_regs);
}
diff --git a/drivers/gpio/gpio-ath79.c b/drivers/gpio/gpio-ath79.c
index 72f76c8a54..08d19c2a7c 100644
--- a/drivers/gpio/gpio-ath79.c
+++ b/drivers/gpio/gpio-ath79.c
@@ -106,7 +106,7 @@ static const struct of_device_id ath79_gpio_of_match[] = {
static int ath79_gpio_probe(struct device_d *dev)
{
struct resource *iores;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
int err;
if (!np) {
diff --git a/drivers/gpio/gpio-clps711x.c b/drivers/gpio/gpio-clps711x.c
index cb4bd4025c..1c5f714aa5 100644
--- a/drivers/gpio/gpio-clps711x.c
+++ b/drivers/gpio/gpio-clps711x.c
@@ -10,7 +10,7 @@
static int clps711x_gpio_probe(struct device_d *dev)
{
struct resource *iores;
- int err, id = of_alias_get_id(dev->device_node, "gpio");
+ int err, id = of_alias_get_id(dev->of_node, "gpio");
void __iomem *dat, *dir = NULL, *dir_inv = NULL;
struct bgpio_chip *bgc;
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index b4f2176606..655621b179 100644
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -143,7 +143,7 @@ static int davinci_gpio_probe(struct device_d *dev)
unsigned ngpio;
struct davinci_gpio_controller *chips;
- ret = of_property_read_u32(dev->device_node, "ti,ngpio", &val);
+ ret = of_property_read_u32(dev->of_node, "ti,ngpio", &val);
if (ret) {
dev_err(dev, "could not read 'ti,ngpio' property\n");
return -EINVAL;
diff --git a/drivers/gpio/gpio-dw.c b/drivers/gpio/gpio-dw.c
index 448a04d4ba..0d810310ce 100644
--- a/drivers/gpio/gpio-dw.c
+++ b/drivers/gpio/gpio-dw.c
@@ -138,7 +138,7 @@ static int dw_gpio_add_port(struct device_d *dev, struct device_node *node,
return -ENODEV;
}
- chip->chip.dev->device_node = node;
+ chip->chip.dev->of_node = node;
ret = gpiochip_add(&chip->chip);
if (ret)
@@ -163,7 +163,7 @@ static int dw_gpio_probe(struct device_d *dev)
return PTR_ERR(iores);
gpio->regs = IOMEM(iores->start);
- for_each_child_of_node(dev->device_node, node)
+ for_each_child_of_node(dev->of_node, node)
dw_gpio_add_port(dev, node, gpio);
return 0;
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c
index 3066b3f7a1..49b5b2bf8d 100644
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
@@ -510,10 +510,10 @@ static struct bgpio_pdata *bgpio_parse_dt(struct device_d *dev,
pdata->base = -1;
- if (of_device_is_big_endian(dev->device_node))
+ if (of_device_is_big_endian(dev->of_node))
*flags |= BGPIOF_BIG_ENDIAN_BYTE_ORDER;
- if (of_property_read_bool(dev->device_node, "no-output"))
+ if (of_property_read_bool(dev->of_node, "no-output"))
*flags |= BGPIOF_NO_OUTPUT;
return pdata;
diff --git a/drivers/gpio/gpio-imx.c b/drivers/gpio/gpio-imx.c
index 8ddec1244b..f670d109ac 100644
--- a/drivers/gpio/gpio-imx.c
+++ b/drivers/gpio/gpio-imx.c
@@ -135,7 +135,7 @@ static int imx_gpio_probe(struct device_d *dev)
imxgpio->base = IOMEM(iores->start);
imxgpio->chip.ops = &imx_gpio_ops;
if (dev->id < 0) {
- imxgpio->chip.base = of_alias_get_id(dev->device_node, "gpio");
+ imxgpio->chip.base = of_alias_get_id(dev->of_node, "gpio");
if (imxgpio->chip.base < 0)
return imxgpio->chip.base;
imxgpio->chip.base *= 32;
diff --git a/drivers/gpio/gpio-latch.c b/drivers/gpio/gpio-latch.c
index 2a89f22401..fbb86a953f 100644
--- a/drivers/gpio/gpio-latch.c
+++ b/drivers/gpio/gpio-latch.c
@@ -98,7 +98,7 @@ static int gpio_latch_probe(struct device_d *dev)
{
struct gpio_latch_priv *priv;
int n_latches, i, ret;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
enum of_gpio_flags flags;
priv = xzalloc(sizeof(*priv));
diff --git a/drivers/gpio/gpio-libftdi1.c b/drivers/gpio/gpio-libftdi1.c
index d8e1fc8b34..fbbb4d3944 100644
--- a/drivers/gpio/gpio-libftdi1.c
+++ b/drivers/gpio/gpio-libftdi1.c
@@ -74,13 +74,13 @@ static int libftdi1_gpio_probe(struct device_d *dev)
uint32_t id_vendor, id_product;
const char *i_serial_number = NULL;
- of_property_read_u32(dev->device_node, "usb,id_vendor",
+ of_property_read_u32(dev->of_node, "usb,id_vendor",
&id_vendor);
- of_property_read_u32(dev->device_node, "usb,id_product",
+ of_property_read_u32(dev->of_node, "usb,id_product",
&id_product);
- of_property_read_string(dev->device_node, "usb,i_serial_number",
+ of_property_read_string(dev->of_node, "usb,i_serial_number",
&i_serial_number);
ftbb = barebox_libftdi1_open(id_vendor, id_product,
diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
index d48a8aa7fb..b41a11aac2 100644
--- a/drivers/gpio/gpio-mpc8xxx.c
+++ b/drivers/gpio/gpio-mpc8xxx.c
@@ -44,8 +44,8 @@ static int mpc8xxx_probe(struct device_d *dev)
mpc8xxx_gc = xzalloc(sizeof(*mpc8xxx_gc));
- if (dev->device_node) {
- np = dev->device_node;
+ if (dev->of_node) {
+ np = dev->of_node;
} else {
dev_err(dev, "no device_node\n");
return -ENODEV;
diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index dde79f8fe8..1a49a2b3dd 100644
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -111,7 +111,7 @@ static int mxs_gpio_probe(struct device_d *dev)
mxsgpio = xzalloc(sizeof(*mxsgpio));
mxsgpio->chip.ops = &mxs_gpio_ops;
if (dev->id < 0) {
- id = of_alias_get_id(dev->device_node, "gpio");
+ id = of_alias_get_id(dev->of_node, "gpio");
if (id < 0)
return id;
mxsgpio->base = dev_get_mem_region(dev->parent, 0);
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index a328317ce8..ad23810467 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -134,7 +134,7 @@ static int omap_gpio_probe(struct device_d *dev)
omapgpio->chip.ops = &omap_gpio_ops;
if (dev->id < 0) {
- omapgpio->chip.base = of_alias_get_id(dev->device_node, "gpio");
+ omapgpio->chip.base = of_alias_get_id(dev->of_node, "gpio");
if (omapgpio->chip.base < 0)
return omapgpio->chip.base;
omapgpio->chip.base *= 32;
diff --git a/drivers/gpio/gpio-orion.c b/drivers/gpio/gpio-orion.c
index afbcb9d321..cd9a4fb638 100644
--- a/drivers/gpio/gpio-orion.c
+++ b/drivers/gpio/gpio-orion.c
@@ -94,13 +94,13 @@ static int orion_gpio_probe(struct device_d *dev)
gpio->chip.dev = dev;
gpio->chip.ops = &orion_gpio_ops;
- id = of_alias_get_id(dev->device_node, "gpio");
+ id = of_alias_get_id(dev->of_node, "gpio");
if (id < 0)
return id;
gpio->chip.base = id * 32;
gpio->chip.ngpio = 32;
- of_property_read_u32(dev->device_node, "ngpios", &gpio->chip.ngpio);
+ of_property_read_u32(dev->of_node, "ngpios", &gpio->chip.ngpio);
gpiochip_add(&gpio->chip);
diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index 612ef3a82e..58a2f7e1ba 100644
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -148,7 +148,7 @@ static struct gpio_ops pcf857x_gpio_ops = {
static int pcf857x_probe(struct device_d *dev)
{
struct i2c_client *client = to_i2c_client(dev);
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct pcf857x *gpio;
unsigned long driver_data;
unsigned int n_latch = 0;
diff --git a/drivers/gpio/gpio-sifive.c b/drivers/gpio/gpio-sifive.c
index 4d0e12b0a8..70a07ff0f7 100644
--- a/drivers/gpio/gpio-sifive.c
+++ b/drivers/gpio/gpio-sifive.c
@@ -44,7 +44,7 @@ static int sifive_gpio_probe(struct device_d *dev)
}
base = IOMEM(res->start);
- ngpio = __of_irq_count(dev->device_node);
+ ngpio = __of_irq_count(dev->of_node);
if (ngpio > SIFIVE_GPIO_MAX) {
dev_err(dev, "Too many GPIO interrupts (max=%d)\n",
SIFIVE_GPIO_MAX);
diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c
index f8e31736f8..1438a74785 100644
--- a/drivers/gpio/gpio-vf610.c
+++ b/drivers/gpio/gpio-vf610.c
@@ -97,10 +97,10 @@ static int vf610_gpio_probe(struct device_d *dev)
port = xzalloc(sizeof(*port));
- gpio_ranges = of_get_property(dev->device_node, "gpio-ranges", &size);
+ gpio_ranges = of_get_property(dev->of_node, "gpio-ranges", &size);
if (!gpio_ranges) {
dev_err(dev, "Couldn't read 'gpio-ranges' propery of %s\n",
- dev->device_node->full_name);
+ dev->of_node->full_name);
ret = -EINVAL;
goto free_port;
}
@@ -119,7 +119,7 @@ static int vf610_gpio_probe(struct device_d *dev)
port->chip.ops = &vf610_gpio_ops;
if (dev->id < 0) {
- port->chip.base = of_alias_get_id(dev->device_node, "gpio");
+ port->chip.base = of_alias_get_id(dev->of_node, "gpio");
if (port->chip.base < 0) {
ret = port->chip.base;
dev_dbg(dev, "Failed to get GPIO alias\n");
diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c
index bb77857611..c53c3da059 100644
--- a/drivers/gpio/gpio-zynq.c
+++ b/drivers/gpio/gpio-zynq.c
@@ -376,7 +376,7 @@ static int zynqmp_gpio_probe(struct device_d *dev)
}
gpio->base_addr = IOMEM(iores->start);
- gpio->chip.base = of_alias_get_id(dev->device_node, "gpio");
+ gpio->chip.base = of_alias_get_id(dev->of_node, "gpio");
gpio->chip.ops = &zynq_gpio_ops;
gpio->chip.ngpio = p_data->ngpio;
gpio->chip.dev = dev;
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 2503262d65..944cb1cb2a 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -443,7 +443,7 @@ static int gpiochip_find_base(int ngpio)
static int of_hog_gpio(struct device_node *np, struct gpio_chip *chip,
unsigned int idx)
{
- struct device_node *chip_np = chip->dev->device_node;
+ struct device_node *chip_np = chip->dev->of_node;
struct of_phandle_args gpiospec;
unsigned long flags = 0;
u32 gpio_flags;
@@ -500,15 +500,16 @@ static int of_gpiochip_scan_hogs(struct gpio_chip *chip)
struct device_node *np;
int ret, i, count;
- if (!IS_ENABLED(CONFIG_OFDEVICE) || !chip->dev->device_node)
+ if (!IS_ENABLED(CONFIG_OFDEVICE) || !chip->dev->of_node)
return 0;
- count = of_property_count_strings(chip->dev->device_node, "gpio-line-names");
+ count = of_property_count_strings(chip->dev->of_node,
+ "gpio-line-names");
if (count > 0) {
const char **arr = xzalloc(count * sizeof(char *));
- of_property_read_string_array(chip->dev->device_node,
+ of_property_read_string_array(chip->dev->of_node,
"gpio-line-names", arr, count);
for (i = 0; i < chip->ngpio && i < count; i++)
@@ -517,7 +518,7 @@ static int of_gpiochip_scan_hogs(struct gpio_chip *chip)
free(arr);
}
- for_each_available_child_of_node(chip->dev->device_node, np) {
+ for_each_available_child_of_node(chip->dev->of_node, np) {
if (!of_property_read_bool(np, "gpio-hog"))
continue;
@@ -544,14 +545,14 @@ static const char *gpio_suffixes[] = {
/* Linux compatibility helper: Get a GPIO descriptor from device tree */
int gpiod_get(struct device_d *dev, const char *_con_id, enum gpiod_flags flags)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
enum of_gpio_flags of_flags;
const char *label = dev_name(dev);
char *buf = NULL, *con_id;
int gpio;
int ret, i;
- if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->device_node)
+ if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->of_node)
return -ENODEV;
for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
diff --git a/drivers/hw_random/core.c b/drivers/hw_random/core.c
index f68ca070f5..4b6a403337 100644
--- a/drivers/hw_random/core.c
+++ b/drivers/hw_random/core.c
@@ -69,7 +69,7 @@ static int hwrng_register_cdev(struct hwrng *rng)
char *devname;
int err;
- alias = of_alias_get(dev->device_node);
+ alias = of_alias_get(dev->of_node);
if (alias) {
devname = xstrdup(alias);
} else {
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index b100dc6c17..49f0338df3 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -546,7 +546,7 @@ static int at91_twi_probe(struct device_d *dev)
i2c_at91->adapter.master_xfer = at91_twi_xfer;
i2c_at91->adapter.dev.parent = dev;
i2c_at91->adapter.nr = dev->id;
- i2c_at91->adapter.dev.device_node = dev->device_node;
+ i2c_at91->adapter.dev.of_node = dev->of_node;
rc = i2c_add_numbered_adapter(&i2c_at91->adapter);
if (rc) {
diff --git a/drivers/i2c/busses/i2c-bcm283x.c b/drivers/i2c/busses/i2c-bcm283x.c
index d9bbc17b13..63380d632e 100644
--- a/drivers/i2c/busses/i2c-bcm283x.c
+++ b/drivers/i2c/busses/i2c-bcm283x.c
@@ -271,7 +271,7 @@ static int bcm283x_i2c_probe(struct device_d *dev)
int ret;
struct resource *iores;
struct bcm283x_i2c *bcm_i2c;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
bcm_i2c = xzalloc(sizeof(*bcm_i2c));
@@ -308,7 +308,7 @@ static int bcm283x_i2c_probe(struct device_d *dev)
bcm_i2c->adapter.master_xfer = bcm283x_i2c_xfer;
bcm_i2c->adapter.nr = dev->id;
bcm_i2c->adapter.dev.parent = dev;
- bcm_i2c->adapter.dev.device_node = np;
+ bcm_i2c->adapter.dev.of_node = np;
ret = bcm283x_i2c_init(bcm_i2c);
if (ret)
diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c
index 5537efff23..255e085d90 100644
--- a/drivers/i2c/busses/i2c-cadence.c
+++ b/drivers/i2c/busses/i2c-cadence.c
@@ -398,7 +398,7 @@ static int cdns_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msg,
static int cdns_i2c_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct resource *iores;
struct cdns_i2c *i2c;
u32 bitrate;
@@ -424,7 +424,7 @@ static int cdns_i2c_probe(struct device_d *dev)
i2c->adapter.master_xfer = cdns_i2c_xfer;
i2c->adapter.nr = dev->id;
i2c->adapter.dev.parent = dev;
- i2c->adapter.dev.device_node = np;
+ i2c->adapter.dev.of_node = np;
cdns_i2c_reset_hardware(i2c);
diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c
index 93b7af6623..70bb0dc4cc 100644
--- a/drivers/i2c/busses/i2c-designware.c
+++ b/drivers/i2c/busses/i2c-designware.c
@@ -245,7 +245,7 @@ static void i2c_dw_setup_timings(struct dw_i2c_dev *dw)
u32 ht;
int ret;
- ret = of_property_read_u32(dw->adapter.dev.device_node,
+ ret = of_property_read_u32(dw->adapter.dev.of_node,
"i2c-sda-hold-time-ns", &ht);
if (ret) {
/* Keep previous hold time setting if no one set it */
@@ -527,7 +527,7 @@ static int i2c_dw_probe(struct device_d *pdev)
dw->adapter.master_xfer = i2c_dw_xfer;
dw->adapter.nr = pdev->id;
dw->adapter.dev.parent = pdev;
- dw->adapter.dev.device_node = pdev->device_node;
+ dw->adapter.dev.of_node = pdev->of_node;
iores = dev_request_mem_resource(pdev, 0);
if (IS_ERR(iores)) {
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index ad0c4c8f82..abe3b804dd 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -140,8 +140,8 @@ static int i2c_gpio_probe(struct device_d *dev)
bit_data = &priv->bit_data;
pdata = &priv->pdata;
- if (dev->device_node) {
- ret = of_i2c_gpio_probe(dev->device_node, pdata);
+ if (dev->of_node) {
+ ret = of_i2c_gpio_probe(dev->of_node, pdata);
if (ret)
return ret;
} else {
@@ -193,7 +193,7 @@ static int i2c_gpio_probe(struct device_d *dev)
adap->algo_data = bit_data;
adap->dev.parent = dev;
- adap->dev.device_node = dev->device_node;
+ adap->dev.of_node = dev->of_node;
adap->bus_recovery_info = xzalloc(sizeof(*adap->bus_recovery_info));
adap->bus_recovery_info->scl_gpio = pdata->scl_pin;
adap->bus_recovery_info->sda_gpio = pdata->sda_pin;
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index a2abfa5b43..8145990716 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -527,13 +527,15 @@ static void i2c_fsl_unprepare_recovery(struct i2c_adapter *adapter)
static void i2c_fsl_init_recovery(struct fsl_i2c_struct *i2c_fsl, struct device_d *dev)
{
- if (!dev->device_node)
+ if (!dev->of_node)
return;
- i2c_fsl->rinfo.sda_gpio = of_get_named_gpio_flags(dev->device_node,
- "sda-gpios", 0, NULL);
- i2c_fsl->rinfo.scl_gpio = of_get_named_gpio_flags(dev->device_node,
- "scl-gpios", 0, NULL);
+ i2c_fsl->rinfo.sda_gpio = of_get_named_gpio_flags(dev->of_node,
+ "sda-gpios", 0,
+ NULL);
+ i2c_fsl->rinfo.scl_gpio = of_get_named_gpio_flags(dev->of_node,
+ "scl-gpios", 0,
+ NULL);
if (!gpio_is_valid(i2c_fsl->rinfo.sda_gpio) ||
!gpio_is_valid(i2c_fsl->rinfo.scl_gpio))
@@ -585,7 +587,7 @@ static int __init i2c_fsl_probe(struct device_d *pdev)
i2c_fsl->adapter.master_xfer = i2c_fsl_xfer;
i2c_fsl->adapter.nr = pdev->id;
i2c_fsl->adapter.dev.parent = pdev;
- i2c_fsl->adapter.dev.device_node = pdev->device_node;
+ i2c_fsl->adapter.dev.of_node = pdev->of_node;
iores = dev_request_mem_resource(pdev, 0);
if (IS_ERR(iores)) {
ret = PTR_ERR(iores);
@@ -599,7 +601,7 @@ static int __init i2c_fsl_probe(struct device_d *pdev)
/* Set up clock divider */
bitrate = 100000;
- of_property_read_u32(pdev->device_node, "clock-frequency", &bitrate);
+ of_property_read_u32(pdev->of_node, "clock-frequency", &bitrate);
if (pdata && pdata->bitrate)
bitrate = pdata->bitrate;
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 765fc9926b..20b262e081 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -530,7 +530,7 @@ static int
mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
struct device_d *pd)
{
- struct device_node *np = pd->device_node;
+ struct device_node *np = pd->of_node;
u32 bus_freq, tclk;
int rc = 0;
u32 prop;
@@ -602,7 +602,7 @@ mv64xxx_i2c_probe(struct device_d *pd)
struct mv64xxx_i2c_data *drv_data;
int rc;
- if (!pd->device_node)
+ if (!pd->of_node)
return -ENODEV;
drv_data = xzalloc(sizeof(*drv_data));
@@ -625,7 +625,7 @@ mv64xxx_i2c_probe(struct device_d *pd)
drv_data->adapter.master_xfer = mv64xxx_i2c_xfer;
drv_data->adapter.dev.parent = pd;
drv_data->adapter.nr = pd->id;
- drv_data->adapter.dev.device_node = pd->device_node;
+ drv_data->adapter.dev.of_node = pd->of_node;
mv64xxx_i2c_hw_init(drv_data);
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 29a618c8b2..74161288ae 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1091,8 +1091,8 @@ i2c_omap_probe(struct device_d *pdev)
if (pdev->platform_data != NULL) {
speed = *(u32 *)pdev->platform_data;
} else {
- of_property_read_u32(pdev->device_node, "clock-frequency",
- &speed);
+ of_property_read_u32(pdev->of_node, "clock-frequency",
+ &speed);
/* convert DT freq value in Hz into kHz for speed */
speed /= 1000;
}
@@ -1170,7 +1170,7 @@ i2c_omap_probe(struct device_d *pdev)
i2c_omap->adapter.master_xfer = omap_i2c_xfer;
i2c_omap->adapter.nr = pdev->id;
i2c_omap->adapter.dev.parent = pdev;
- i2c_omap->adapter.dev.device_node = pdev->device_node;
+ i2c_omap->adapter.dev.of_node = pdev->of_node;
i2c_omap->adapter.bus_recovery_info = &omap_i2c_bus_recovery_info;
/* i2c device drivers may be active on return from add_adapter() */
diff --git a/drivers/i2c/busses/i2c-rockchip.c b/drivers/i2c/busses/i2c-rockchip.c
index ca33905335..df71a8a733 100644
--- a/drivers/i2c/busses/i2c-rockchip.c
+++ b/drivers/i2c/busses/i2c-rockchip.c
@@ -410,7 +410,7 @@ static int rockchip_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs,
static int rk_i2c_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct resource *iores;
struct rk_i2c *i2c;
unsigned bitrate;
@@ -434,7 +434,7 @@ static int rk_i2c_probe(struct device_d *dev)
i2c->adapter.master_xfer = rockchip_i2c_xfer;
i2c->adapter.nr = dev->id;
i2c->adapter.dev.parent = dev;
- i2c->adapter.dev.device_node = np;
+ i2c->adapter.dev.of_node = np;
/* Set up clock divider */
bitrate = 100000;
diff --git a/drivers/i2c/busses/i2c-stm32.c b/drivers/i2c/busses/i2c-stm32.c
index d412630365..7825b50d9e 100644
--- a/drivers/i2c/busses/i2c-stm32.c
+++ b/drivers/i2c/busses/i2c-stm32.c
@@ -823,7 +823,7 @@ static int __init stm32_i2c_probe(struct device_d *dev)
stm32_i2c->adapter.master_xfer = stm32_i2c_xfer;
stm32_i2c->adapter.nr = dev->id;
stm32_i2c->adapter.dev.parent = dev;
- stm32_i2c->adapter.dev.device_node = dev->device_node;
+ stm32_i2c->adapter.dev.of_node = dev->of_node;
iores = dev_request_mem_resource(dev, 0);
if (IS_ERR(iores))
return PTR_ERR(iores);
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 077b55e175..eec377fc8a 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -627,14 +627,14 @@ static int tegra_i2c_probe(struct device_d *dev)
return PTR_ERR(i2c_dev->rst);
}
- ret = of_property_read_u32(dev->device_node, "clock-frequency",
+ ret = of_property_read_u32(dev->of_node, "clock-frequency",
&i2c_dev->bus_clk_rate);
if (ret)
i2c_dev->bus_clk_rate = 100000; /* default clock rate */
i2c_dev->hw = &tegra20_i2c_hw;
dev_get_drvdata(dev, (const void **)&i2c_dev->hw);
- i2c_dev->is_dvc = of_device_is_compatible(dev->device_node,
+ i2c_dev->is_dvc = of_device_is_compatible(dev->of_node,
"nvidia,tegra20-i2c-dvc");
if (!i2c_dev->hw->has_single_clk_source) {
@@ -655,7 +655,7 @@ static int tegra_i2c_probe(struct device_d *dev)
i2c_dev->adapter.master_xfer = tegra_i2c_xfer;
i2c_dev->adapter.dev.parent = dev;
i2c_dev->adapter.nr = dev->id;
- i2c_dev->adapter.dev.device_node = dev->device_node;
+ i2c_dev->adapter.dev.of_node = dev->of_node;
ret = i2c_add_numbered_adapter(&i2c_dev->adapter);
if (ret) {
diff --git a/drivers/i2c/busses/i2c-versatile.c b/drivers/i2c/busses/i2c-versatile.c
index ece483f6f5..998d69422b 100644
--- a/drivers/i2c/busses/i2c-versatile.c
+++ b/drivers/i2c/busses/i2c-versatile.c
@@ -86,7 +86,7 @@ static int i2c_versatile_probe(struct device_d *dev)
i2c->adap.algo_data = &i2c->algo;
i2c->adap.dev.parent = dev;
- i2c->adap.dev.device_node = dev->device_node;
+ i2c->adap.dev.of_node = dev->of_node;
i2c->algo = i2c_versatile_algo;
i2c->algo.data = i2c;
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index 233d231525..1e5fd1e552 100644
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -95,16 +95,16 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
* Try to populate the mux adapter's device_node, expands to
* nothing if !CONFIG_OFDEVICE.
*/
- if (mux_dev->device_node) {
+ if (mux_dev->of_node) {
struct device_node *child;
u32 reg;
- for_each_child_of_node(mux_dev->device_node, child) {
+ for_each_child_of_node(mux_dev->of_node, child) {
ret = of_property_read_u32(child, "reg", ®);
if (ret)
continue;
if (chan_id == reg) {
- priv->adap.dev.device_node = child;
+ priv->adap.dev.of_node = child;
break;
}
}
diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c
index 40590b7d11..ffcc866ad0 100644
--- a/drivers/i2c/i2c.c
+++ b/drivers/i2c/i2c.c
@@ -394,7 +394,7 @@ static struct i2c_client *i2c_new_device(struct i2c_adapter *adapter,
client->dev.platform_data = chip->platform_data;
client->dev.id = DEVICE_ID_DYNAMIC;
client->dev.bus = &i2c_bus;
- client->dev.device_node = chip->of_node;
+ client->dev.of_node = chip->of_node;
client->adapter = adapter;
client->addr = chip->addr;
@@ -418,10 +418,10 @@ static void of_i2c_register_devices(struct i2c_adapter *adap)
struct device_node *n;
/* Only register child devices if the adapter has a node pointer set */
- if (!IS_ENABLED(CONFIG_OFDEVICE) || !adap->dev.device_node)
+ if (!IS_ENABLED(CONFIG_OFDEVICE) || !adap->dev.of_node)
return;
- for_each_available_child_of_node(adap->dev.device_node, n) {
+ for_each_available_child_of_node(adap->dev.of_node, n) {
struct i2c_board_info info = {};
struct i2c_client *result;
const __be32 *addr;
@@ -578,7 +578,7 @@ struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node)
return ERR_PTR(ret);
for_each_i2c_adapter(adap)
- if (adap->dev.device_node == node)
+ if (adap->dev.of_node == node)
return adap;
return NULL;
@@ -615,7 +615,7 @@ static void i2c_parse_timing(struct device_d *dev, char *prop_name, u32 *cur_val
{
int ret;
- ret = of_property_read_u32(dev->device_node, prop_name, cur_val_p);
+ ret = of_property_read_u32(dev->of_node, prop_name, cur_val_p);
if (ret && use_def)
*cur_val_p = def_val;
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index f547527fed..a05d25f344 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -199,7 +199,7 @@ static int pca954x_probe(struct device_d *dev)
i2c_set_clientdata(client, data);
- gpio = of_get_named_gpio(dev->device_node, "reset-gpios", 0);
+ gpio = of_get_named_gpio(dev->of_node, "reset-gpios", 0);
if (gpio_is_valid(gpio))
gpio_direction_output(gpio, 1);
@@ -215,7 +215,7 @@ static int pca954x_probe(struct device_d *dev)
if (ret)
goto exit_free;
- idle_disconnect = of_property_read_bool(dev->device_node,
+ idle_disconnect = of_property_read_bool(dev->of_node,
"i2c-mux-idle-disconnect");
data->last_chan = 0; /* force the first selection */
diff --git a/drivers/input/gpio_keys.c b/drivers/input/gpio_keys.c
index 45b3c562f8..c188cf34bd 100644
--- a/drivers/input/gpio_keys.c
+++ b/drivers/input/gpio_keys.c
@@ -94,7 +94,7 @@ static int gpio_keys_probe_pdata(struct gpio_keys *gk, struct device_d *dev)
static int gpio_keys_probe_dt(struct gpio_keys *gk, struct device_d *dev)
{
- struct device_node *npkey, *np = dev->device_node;
+ struct device_node *npkey, *np = dev->of_node;
int i = 0, ret;
if (!IS_ENABLED(CONFIG_OFDEVICE) || !IS_ENABLED(CONFIG_OF_GPIO))
@@ -140,7 +140,7 @@ static int __init gpio_keys_probe(struct device_d *dev)
gk->dev = dev;
- if (dev->device_node)
+ if (dev->of_node)
ret = gpio_keys_probe_dt(gk, dev);
else
ret = gpio_keys_probe_pdata(gk, dev);
diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c
index 68dc5d2f06..1d974f7f7a 100644
--- a/drivers/input/matrix-keymap.c
+++ b/drivers/input/matrix-keymap.c
@@ -9,7 +9,7 @@ static int matrix_keypad_parse_of_keymap(struct device_d *dev,
{
unsigned int proplen, i, size;
const __be32 *prop;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
const char *propname = "linux,keymap";
prop = of_get_property(np, propname, &proplen);
@@ -61,7 +61,7 @@ int matrix_keypad_build_keymap(struct device_d *dev, const struct matrix_keymap_
{
int i;
- if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node)
+ if (IS_ENABLED(CONFIG_OFDEVICE) && dev->of_node)
return matrix_keypad_parse_of_keymap(dev, row_shift, keymap);
if (!keymap_data)
diff --git a/drivers/led/led-gpio.c b/drivers/led/led-gpio.c
index 1a5eda0371..1458ca0bac 100644
--- a/drivers/led/led-gpio.c
+++ b/drivers/led/led-gpio.c
@@ -199,13 +199,13 @@ static int led_gpio_of_probe(struct device_d *dev)
int num_leds;
int ret = 0, n = 0;
- num_leds = of_get_child_count(dev->device_node);
+ num_leds = of_get_child_count(dev->of_node);
if (num_leds <= 0)
return num_leds;
leds = xzalloc(num_leds * sizeof(struct gpio_led));
- for_each_child_of_node(dev->device_node, child) {
+ for_each_child_of_node(dev->of_node, child) {
struct gpio_led *gled = &leds[n];
const char *default_state;
enum of_gpio_flags flags;
diff --git a/drivers/led/led-pca955x.c b/drivers/led/led-pca955x.c
index aa518fe738..8eeef60fb1 100644
--- a/drivers/led/led-pca955x.c
+++ b/drivers/led/led-pca955x.c
@@ -365,7 +365,7 @@ static int led_pca955x_probe(struct device_d *dev)
pca955x->client = client;
pca955x->chipdef = chip;
- pdata = led_pca955x_pdata_of_init(dev->device_node, pca955x);
+ pdata = led_pca955x_pdata_of_init(dev->of_node, pca955x);
if (IS_ERR(pdata))
return PTR_ERR(pdata);
diff --git a/drivers/led/led-pwm.c b/drivers/led/led-pwm.c
index 071e219d73..9dbf510dc6 100644
--- a/drivers/led/led-pwm.c
+++ b/drivers/led/led-pwm.c
@@ -44,7 +44,7 @@ static int led_pwm_of_probe(struct device_d *dev)
struct device_node *child;
int ret;
- for_each_child_of_node(dev->device_node, child) {
+ for_each_child_of_node(dev->of_node, child) {
struct pwmled *pwmled;
struct pwm_device *pwm;
diff --git a/drivers/mci/arasan-sdhci.c b/drivers/mci/arasan-sdhci.c
index d45f9184cd..460d1df709 100644
--- a/drivers/mci/arasan-sdhci.c
+++ b/drivers/mci/arasan-sdhci.c
@@ -235,7 +235,7 @@ error:
static int arasan_sdhci_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct arasan_sdhci_host *arasan_sdhci;
struct clk *clk_xin, *clk_ahb;
struct resource *iores;
diff --git a/drivers/mci/atmel-sdhci.c b/drivers/mci/atmel-sdhci.c
index 380a79d33e..059a21d774 100644
--- a/drivers/mci/atmel-sdhci.c
+++ b/drivers/mci/atmel-sdhci.c
@@ -135,7 +135,7 @@ static int at91_sdhci_probe(struct device_d *dev)
* if SDCAL pin is wrongly connected, we must enable
* the analog calibration cell permanently.
*/
- priv->cal_always_on = of_property_read_bool(dev->device_node,
+ priv->cal_always_on = of_property_read_bool(dev->of_node,
"microchip,sdcal-inverted");
at91_sdhci_mmio_init(&priv->host, IOMEM(iores->start));
diff --git a/drivers/mci/atmel_mci.c b/drivers/mci/atmel_mci.c
index e676c1bd5c..8835f0eda5 100644
--- a/drivers/mci/atmel_mci.c
+++ b/drivers/mci/atmel_mci.c
@@ -71,7 +71,7 @@ static int atmci_probe(struct device_d *hw_dev)
{
struct resource *iores;
struct atmel_mci *host;
- struct device_node *np = hw_dev->device_node;
+ struct device_node *np = hw_dev->of_node;
struct atmel_mci_platform_data *pd = hw_dev->platform_data;
int ret;
diff --git a/drivers/mci/dw_mmc.c b/drivers/mci/dw_mmc.c
index 86c4f43e88..46a69808e9 100644
--- a/drivers/mci/dw_mmc.c
+++ b/drivers/mci/dw_mmc.c
@@ -528,8 +528,8 @@ static int dwmci_init(struct mci_host *mci, struct device_d *dev)
/*
* If fifo-depth property is set, use this value
*/
- if (!of_property_read_u32(host->mci.hw_dev->device_node,
- "fifo-depth", &fifo_size)) {
+ if (!of_property_read_u32(host->mci.hw_dev->of_node,
+ "fifo-depth", &fifo_size)) {
host->fifo_size_bytes = fifo_size;
dev_dbg(host->mci.hw_dev, "Using fifo-depth=%u\n",
host->fifo_size_bytes);
@@ -603,22 +603,23 @@ static int dw_mmc_probe(struct device_d *dev)
host->ciu_div = pdata->ciu_div;
host->mci.host_caps &= ~MMC_CAP_BIT_DATA_MASK;
host->mci.host_caps |= pdata->bus_width_caps;
- } else if (dev->device_node) {
- of_property_read_u32(dev->device_node, "dw-mshc-ciu-div",
- &host->ciu_div);
+ } else if (dev->of_node) {
+ of_property_read_u32(dev->of_node, "dw-mshc-ciu-div",
+ &host->ciu_div);
}
/* divider is 0 based in pdata and 1 based in our private struct */
host->ciu_div++;
- if (of_device_is_compatible(dev->device_node,
- "rockchip,rk2928-dw-mshc"))
+ if (of_device_is_compatible(dev->of_node,
+ "rockchip,rk2928-dw-mshc"))
host->pwren_value = 0;
else
host->pwren_value = 1;
- if (of_device_is_compatible(dev->device_node, "starfive,jh7100-dw-mshc"))
- of_property_read_u32(dev->device_node, "clock-frequency", &host->clkrate);
+ if (of_device_is_compatible(dev->of_node, "starfive,jh7100-dw-mshc"))
+ of_property_read_u32(dev->of_node, "clock-frequency",
+ &host->clkrate);
if (!host->clkrate)
host->clkrate = clk_get_rate(host->clk_ciu);
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index 8cda07e711..7dcbae9951 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -428,7 +428,7 @@ static void mci_part_add(struct mci *mci, uint64_t size,
part->idx = idx;
if (area_type == MMC_BLK_DATA_AREA_MAIN) {
- part->blk.cdev.device_node = mci->host->hw_dev->device_node;
+ part->blk.cdev.device_node = mci->host->hw_dev->of_node;
part->blk.cdev.flags |= DEVFS_IS_MCI_MAIN_PART_DEV;
}
@@ -1699,7 +1699,7 @@ static int mci_register_partition(struct mci_part *part)
}
dev_info(&mci->dev, "registered %s\n", part->blk.cdev.name);
- np = host->hw_dev->device_node;
+ np = host->hw_dev->of_node;
/* create partitions on demand */
switch (part->area_type) {
@@ -1709,7 +1709,7 @@ static int mci_register_partition(struct mci_part *part)
else
partnodename = "boot1-partitions";
- np = of_get_child_by_name(host->hw_dev->device_node,
+ np = of_get_child_by_name(host->hw_dev->of_node,
partnodename);
break;
case MMC_BLK_DATA_AREA_MAIN:
@@ -1749,12 +1749,12 @@ static int of_broken_cd_fixup(struct device_node *root, void *ctx)
if (!host->broken_cd)
return 0;
- name = of_get_reproducible_name(hw_dev->device_node);
+ name = of_get_reproducible_name(hw_dev->of_node);
np = of_find_node_by_reproducible_name(root, name);
free(name);
if (!np) {
dev_warn(hw_dev, "Cannot find nodepath %s, cannot fixup\n",
- hw_dev->device_node->full_name);
+ hw_dev->of_node->full_name);
return -EINVAL;
}
@@ -2091,7 +2091,7 @@ void mci_of_parse_node(struct mci_host *host,
void mci_of_parse(struct mci_host *host)
{
- return mci_of_parse_node(host, host->hw_dev->device_node);
+ return mci_of_parse_node(host, host->hw_dev->of_node);
}
struct mci *mci_get_device_by_name(const char *name)
diff --git a/drivers/mci/mmci.c b/drivers/mci/mmci.c
index 2edc37c681..8c1e8dc7fd 100644
--- a/drivers/mci/mmci.c
+++ b/drivers/mci/mmci.c
@@ -552,7 +552,7 @@ static int mmci_of_parse(struct device_node *np,
static int mmci_probe(struct amba_device *dev, const struct amba_id *id)
{
struct device_d *hw_dev = &dev->dev;
- struct device_node *np = hw_dev->device_node;
+ struct device_node *np = hw_dev->of_node;
struct mmci_platform_data *plat = hw_dev->platform_data;
struct variant_data *variant = id->data;
u32 sdi_u32;
diff --git a/drivers/mci/sdhci.c b/drivers/mci/sdhci.c
index 8da32d57c2..2ec38cb93f 100644
--- a/drivers/mci/sdhci.c
+++ b/drivers/mci/sdhci.c
@@ -459,7 +459,7 @@ void __sdhci_read_caps(struct sdhci *host, const u16 *ver,
u16 v;
u64 dt_caps_mask = 0;
u64 dt_caps = 0;
- struct device_node *np = host->mci->hw_dev->device_node;
+ struct device_node *np = host->mci->hw_dev->of_node;
BUG_ON(!host->mci); /* Call sdhci_setup_host() before using this */
diff --git a/drivers/mci/stm32_sdmmc2.c b/drivers/mci/stm32_sdmmc2.c
index 40ffc17908..af01c9b47b 100644
--- a/drivers/mci/stm32_sdmmc2.c
+++ b/drivers/mci/stm32_sdmmc2.c
@@ -575,7 +575,7 @@ static int stm32_sdmmc2_probe(struct amba_device *adev,
const struct amba_id *id)
{
struct device_d *dev = &adev->dev;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct stm32_sdmmc2_priv *priv;
struct mci_host *mci;
int ret;
diff --git a/drivers/mci/tegra-sdmmc.c b/drivers/mci/tegra-sdmmc.c
index 756fb94c52..9ff43440fb 100644
--- a/drivers/mci/tegra-sdmmc.c
+++ b/drivers/mci/tegra-sdmmc.c
@@ -308,8 +308,8 @@ static int tegra_sdmmc_init(struct mci_host *mci, struct device_d *dev)
sdhci_write32(&host->sdhci, TEGRA_SDMMC_PWR_CNTL, val);
/* sdmmc1 and sdmmc3 on T30 need a bit of padctrl init */
- if (of_device_is_compatible(mci->hw_dev->device_node,
- "nvidia,tegra30-sdhci") &&
+ if (of_device_is_compatible(mci->hw_dev->of_node,
+ "nvidia,tegra30-sdhci") &&
((u32)regs == 0x78000000 || (u32)regs == 78000400)) {
val = readl(regs + TEGRA_SDMMC_SDMEMCOMPPADCTRL);
val &= 0xfffffff0;
@@ -366,7 +366,7 @@ static int tegra_sdmmc_card_present(struct mci_host *mci)
static void tegra_sdmmc_parse_dt(struct tegra_sdmmc_host *host)
{
- struct device_node *np = host->mci.hw_dev->device_node;
+ struct device_node *np = host->mci.hw_dev->of_node;
host->gpio_cd = of_get_named_gpio(np, "cd-gpios", 0);
host->gpio_pwr = of_get_named_gpio(np, "power-gpios", 0);
diff --git a/drivers/mfd/atmel-flexcom.c b/drivers/mfd/atmel-flexcom.c
index 996d4850ee..13b648f903 100644
--- a/drivers/mfd/atmel-flexcom.c
+++ b/drivers/mfd/atmel-flexcom.c
@@ -27,7 +27,7 @@ static int atmel_flexcom_probe(struct device_d *dev)
u32 opmode;
int err;
- err = of_property_read_u32(dev->device_node,
+ err = of_property_read_u32(dev->of_node,
"atmel,flexcom-mode", &opmode);
if (err)
return err;
@@ -57,7 +57,7 @@ static int atmel_flexcom_probe(struct device_d *dev)
clk_disable(clk);
- return of_platform_populate(dev->device_node, NULL, dev);
+ return of_platform_populate(dev->of_node, NULL, dev);
}
static const struct of_device_id atmel_flexcom_of_match[] = {
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 62df91ff01..3004a9b1fa 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -348,9 +348,9 @@ int axp20x_device_probe(struct axp20x_dev *axp20x)
* property "x-powers,master-mode" to override the default.
*/
if (axp20x->variant == AXP806_ID) {
- if (of_property_read_bool(axp20x->dev->device_node,
+ if (of_property_read_bool(axp20x->dev->of_node,
"x-powers,master-mode") ||
- of_property_read_bool(axp20x->dev->device_node,
+ of_property_read_bool(axp20x->dev->of_node,
"x-powers,self-working-mode"))
regmap_write(axp20x->regmap, AXP806_REG_ADDR_EXT,
AXP806_REG_ADDR_EXT_ADDR_MASTER_MODE);
diff --git a/drivers/mfd/da9053.c b/drivers/mfd/da9053.c
index 693c0ca606..4115551911 100644
--- a/drivers/mfd/da9053.c
+++ b/drivers/mfd/da9053.c
@@ -272,7 +272,7 @@ static int da9053_probe(struct device_d *dev)
da9053_detect_reset_source(da9053);
- da9053->restart.of_node = dev->device_node;
+ da9053->restart.of_node = dev->of_node;
da9053->restart.name = "da9063";
da9053->restart.restart = &da9053_force_system_reset;
diff --git a/drivers/mfd/da9063.c b/drivers/mfd/da9063.c
index 4627dd1aa5..b30f55a6ff 100644
--- a/drivers/mfd/da9063.c
+++ b/drivers/mfd/da9063.c
@@ -383,7 +383,7 @@ static int da9063_probe(struct device_d *dev)
da9063_detect_reset_source(priv);
- priv->restart.of_node = dev->device_node;
+ priv->restart.of_node = dev->of_node;
priv->restart.name = "da9063";
priv->restart.restart = &da9063_restart;
@@ -399,8 +399,8 @@ static int da9063_probe(struct device_d *dev)
goto on_error;
}
- if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node)
- return of_platform_populate(dev->device_node, NULL, dev);
+ if (IS_ENABLED(CONFIG_OFDEVICE) && dev->of_node)
+ return of_platform_populate(dev->of_node, NULL, dev);
return 0;
diff --git a/drivers/mfd/mc13xxx.c b/drivers/mfd/mc13xxx.c
index 1851950406..057224855f 100644
--- a/drivers/mfd/mc13xxx.c
+++ b/drivers/mfd/mc13xxx.c
@@ -353,7 +353,7 @@ static int __init mc13xxx_probe(struct device_d *dev)
if (mc13xxx_init_callback)
mc13xxx_init_callback(mc_dev);
- if (of_property_read_bool(dev->device_node, "fsl,mc13xxx-uses-adc"))
+ if (of_property_read_bool(dev->of_node, "fsl,mc13xxx-uses-adc"))
mc13xxx_adc_probe(dev, mc_dev);
return 0;
diff --git a/drivers/mfd/rave-sp.c b/drivers/mfd/rave-sp.c
index 30d4bde5dc..e323c49716 100644
--- a/drivers/mfd/rave-sp.c
+++ b/drivers/mfd/rave-sp.c
@@ -795,7 +795,7 @@ static int rave_sp_probe(struct device_d *dev)
u32 baud;
int ret;
- if (of_property_read_u32(dev->device_node, "current-speed", &baud)) {
+ if (of_property_read_u32(dev->of_node, "current-speed", &baud)) {
dev_err(dev,
"'current-speed' is not specified in device node\n");
return -EINVAL;
@@ -850,7 +850,7 @@ static int rave_sp_probe(struct device_d *dev)
return ret;
}
- return of_platform_populate(dev->device_node, NULL, dev);
+ return of_platform_populate(dev->of_node, NULL, dev);
}
static struct driver_d rave_sp_drv = {
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index 1b5b9d3a17..53eadde4cb 100644
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -249,7 +249,7 @@ static void rk808_poweroff(struct poweroff_handler *handler)
static int rk808_probe(struct device_d *dev)
{
struct i2c_client *client = to_i2c_client(dev);
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct rk808 *rk808;
const struct rk808_reg_data *pre_init_reg;
const struct mfd_cell *cells;
diff --git a/drivers/mfd/rn5t568.c b/drivers/mfd/rn5t568.c
index 4bbab54fe4..6e40105e32 100644
--- a/drivers/mfd/rn5t568.c
+++ b/drivers/mfd/rn5t568.c
@@ -138,7 +138,7 @@ static int __init rn5t568_i2c_probe(struct device_d *dev)
regmap_write(pmic_instance->regmap, RN5T568_REPCNT, RN5T568_REPCNT_OFF_RESETO_16MS |
RN5T568_REPCNT_OFF_REPWRTIM_1000MS | RN5T568_REPCNT_OFF_REPWRON);
- pmic_instance->restart.of_node = dev->device_node;
+ pmic_instance->restart.of_node = dev->of_node;
pmic_instance->restart.name = "RN5T568";
pmic_instance->restart.restart = &rn5t568_restart;
restart_handler_register(&pmic_instance->restart);
@@ -148,7 +148,7 @@ static int __init rn5t568_i2c_probe(struct device_d *dev)
if (ret)
dev_warn(dev, "Failed to query reset reason\n");
- return of_platform_populate(dev->device_node, NULL, dev);
+ return of_platform_populate(dev->of_node, NULL, dev);
}
static __maybe_unused const struct of_device_id rn5t568_of_match[] = {
diff --git a/drivers/mfd/stm32-timers.c b/drivers/mfd/stm32-timers.c
index 4814c06a62..294860613f 100644
--- a/drivers/mfd/stm32-timers.c
+++ b/drivers/mfd/stm32-timers.c
@@ -58,7 +58,7 @@ static int stm32_timers_probe(struct device_d *dev)
dev->priv = ddata;
- return of_platform_populate(dev->device_node, NULL, dev);
+ return of_platform_populate(dev->of_node, NULL, dev);
}
static const struct of_device_id stm32_timers_of_match[] = {
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index 37cf6b8b36..55a794d75f 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -100,12 +100,12 @@ static struct stmpe_platform_data *stmpe_of_probe(struct device_d *dev)
struct stmpe_platform_data *pdata;
struct device_node *node;
- if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->device_node)
+ if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->of_node)
return NULL;
pdata = xzalloc(sizeof(*pdata));
- for_each_child_of_node(dev->device_node, node) {
+ for_each_child_of_node(dev->of_node, node) {
if (!strcmp(node->name, "stmpe_gpio")) {
pdata->blocks |= STMPE_BLOCK_GPIO;
}
diff --git a/drivers/mfd/stpmic1.c b/drivers/mfd/stpmic1.c
index 1de5afa2ef..68c1b70b2a 100644
--- a/drivers/mfd/stpmic1.c
+++ b/drivers/mfd/stpmic1.c
@@ -39,7 +39,7 @@ static int __init stpmic1_probe(struct device_d *dev)
}
dev_info(dev, "PMIC Chip Version: 0x%x\n", reg);
- return of_platform_populate(dev->device_node, NULL, dev);
+ return of_platform_populate(dev->of_node, NULL, dev);
}
static __maybe_unused struct of_device_id stpmic1_dt_ids[] = {
diff --git a/drivers/misc/starfive-pwrseq.c b/drivers/misc/starfive-pwrseq.c
index 8527d12504..62c36f3e5b 100644
--- a/drivers/misc/starfive-pwrseq.c
+++ b/drivers/misc/starfive-pwrseq.c
@@ -21,7 +21,7 @@ static int starfive_pwrseq_probe(struct device_d *dev)
if (ret)
return ret;
- return of_platform_populate(dev->device_node, NULL, dev);
+ return of_platform_populate(dev->of_node, NULL, dev);
}
static struct of_device_id starfive_pwrseq_dt_ids[] = {
diff --git a/drivers/misc/state.c b/drivers/misc/state.c
index cb0d9cf3ad..2e393505d1 100644
--- a/drivers/misc/state.c
+++ b/drivers/misc/state.c
@@ -14,7 +14,7 @@
static int state_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct state *state;
bool readonly = false;
int ret;
diff --git a/drivers/misc/storage-by-uuid.c b/drivers/misc/storage-by-uuid.c
index c57cbb57d8..13efb9d01f 100644
--- a/drivers/misc/storage-by-uuid.c
+++ b/drivers/misc/storage-by-uuid.c
@@ -132,7 +132,7 @@ static void storage_by_uuid_add_partitions(struct sbu *sbu, struct cdev *rcdev)
return;
}
- of_parse_partitions(&sbu->cdev, sbu->dev->device_node);
+ of_parse_partitions(&sbu->cdev, sbu->dev->of_node);
}
static void check_exist(struct sbu *sbu)
@@ -166,7 +166,7 @@ static int storage_by_uuid_probe(struct device_d *dev)
sbu = xzalloc(sizeof(*sbu));
- ret = of_property_read_string(dev->device_node, "uuid", &uuid);
+ ret = of_property_read_string(dev->of_node, "uuid", &uuid);
if (ret)
return ret;
diff --git a/drivers/misc/ubootvar.c b/drivers/misc/ubootvar.c
index e5095bb2d2..1c291343d1 100644
--- a/drivers/misc/ubootvar.c
+++ b/drivers/misc/ubootvar.c
@@ -195,11 +195,11 @@ static int ubootenv_probe(struct device_d *dev)
ubdata = xzalloc(sizeof(*ubdata));
- ret = of_find_path(dev->device_node, "device-path-0",
+ ret = of_find_path(dev->of_node, "device-path-0",
&ubdata->path[0],
OF_FIND_PATH_FLAGS_BB);
if (ret)
- ret = of_find_path(dev->device_node, "device-path",
+ ret = of_find_path(dev->of_node, "device-path",
&ubdata->path[0],
OF_FIND_PATH_FLAGS_BB);
@@ -210,7 +210,7 @@ static int ubootenv_probe(struct device_d *dev)
count++;
- if (!of_find_path(dev->device_node, "device-path-1",
+ if (!of_find_path(dev->of_node, "device-path-1",
&ubdata->path[1],
OF_FIND_PATH_FLAGS_BB)) {
count++;
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 5592f9597e..5bbe4cec01 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -257,16 +257,16 @@ static int m25p_probe(struct device_d *dev)
else
flash_name = NULL; /* auto-detect */
- use_large_blocks = of_property_read_bool(dev->device_node,
- "use-large-blocks");
+ use_large_blocks = of_property_read_bool(dev->of_node,
+ "use-large-blocks");
ret = spi_nor_scan(nor, flash_name, &hwcaps, use_large_blocks);
if (ret)
return ret;
device_id = DEVICE_ID_SINGLE;
- if (dev->device_node)
- flash_name = of_alias_get(dev->device_node);
+ if (dev->of_node)
+ flash_name = of_alias_get(dev->of_node);
else if (data && data->name)
flash_name = data->name;
diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c
index abef07d9c0..2f81c4f766 100644
--- a/drivers/mtd/devices/mtdram.c
+++ b/drivers/mtd/devices/mtdram.c
@@ -48,8 +48,8 @@ static int mtdram_probe(struct device_d *dev)
mtd = xzalloc(sizeof(struct mtd_info));
device_id = DEVICE_ID_SINGLE;
- if (dev->device_node) {
- const char *alias = of_alias_get(dev->device_node);
+ if (dev->of_node) {
+ const char *alias = of_alias_get(dev->of_node);
if (alias)
mtd->name = xstrdup(alias);
}
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 6a54add93b..7541eeb302 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -1281,8 +1281,8 @@ static int __init atmel_nand_probe(struct device_d *dev)
host->board = pdata;
host->dev = dev;
- if (dev->device_node) {
- res = atmel_nand_of_init(host, dev->device_node);
+ if (dev->of_node) {
+ res = atmel_nand_of_init(host, dev->of_node);
if (res)
goto err_no_card;
} else {
diff --git a/drivers/mtd/nand/nand_denali_dt.c b/drivers/mtd/nand/nand_denali_dt.c
index 5cb62cd733..bd4dd4cffd 100644
--- a/drivers/mtd/nand/nand_denali_dt.c
+++ b/drivers/mtd/nand/nand_denali_dt.c
@@ -189,7 +189,7 @@ static int denali_dt_probe(struct device_d *ofdev)
if (ret)
goto out_disable_clk;
- for_each_child_of_node(ofdev->device_node, np) {
+ for_each_child_of_node(ofdev->of_node, np) {
ret = denali_dt_chip_init(denali, np);
if (ret)
goto out_disable_clk;
diff --git a/drivers/mtd/nand/nand_fsl_ifc.c b/drivers/mtd/nand/nand_fsl_ifc.c
index 64dc9c225f..d5ff3b0141 100644
--- a/drivers/mtd/nand/nand_fsl_ifc.c
+++ b/drivers/mtd/nand/nand_fsl_ifc.c
@@ -851,7 +851,7 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv)
}
ctrl = priv->ctrl = ifc_ctrl;
- if (priv->dev->device_node) {
+ if (priv->dev->of_node) {
int bank, banks;
/* find which chip select it is connected to */
diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c
index 66c53670d3..09e26a6910 100644
--- a/drivers/mtd/nand/nand_imx.c
+++ b/drivers/mtd/nand/nand_imx.c
@@ -1106,7 +1106,7 @@ static struct nand_bbt_descr bbt_mirror_descr = {
static int __init mxcnd_probe_dt(struct imx_nand_host *host)
{
- struct device_node *np = host->dev->device_node;
+ struct device_node *np = host->dev->of_node;
int buswidth;
if (!IS_ENABLED(CONFIG_OFDEVICE))
diff --git a/drivers/mtd/nand/nand_mrvl_nfc.c b/drivers/mtd/nand/nand_mrvl_nfc.c
index 064853b344..fe2cd2c865 100644
--- a/drivers/mtd/nand/nand_mrvl_nfc.c
+++ b/drivers/mtd/nand/nand_mrvl_nfc.c
@@ -1188,7 +1188,7 @@ static struct mrvl_nand_host *alloc_nand_resource(struct device_d *dev)
static int mrvl_nand_probe_dt(struct mrvl_nand_host *host)
{
- struct device_node *np = host->dev->device_node;
+ struct device_node *np = host->dev->of_node;
const struct of_device_id *match;
const struct mrvl_nand_variant *variant;
diff --git a/drivers/mtd/nand/nand_mxs.c b/drivers/mtd/nand/nand_mxs.c
index 79a8fbdefa..9387cd7a3a 100644
--- a/drivers/mtd/nand/nand_mxs.c
+++ b/drivers/mtd/nand/nand_mxs.c
@@ -1407,7 +1407,7 @@ static void mxs_nand_probe_dt(struct device_d *dev, struct mxs_nand_info *nand_i
if (!IS_ENABLED(CONFIG_OFTREE))
return;
- if (of_get_nand_on_flash_bbt(dev->device_node))
+ if (of_get_nand_on_flash_bbt(dev->of_node))
chip->bbt_options |= NAND_BBT_USE_FLASH | NAND_BBT_NO_OOB;
}
diff --git a/drivers/mtd/nand/nand_orion.c b/drivers/mtd/nand/nand_orion.c
index bb41b006e2..63c7aa461f 100644
--- a/drivers/mtd/nand/nand_orion.c
+++ b/drivers/mtd/nand/nand_orion.c
@@ -76,7 +76,7 @@ static void orion_nand_read_buf(struct nand_chip *chip, uint8_t *buf, int len)
static int orion_nand_probe(struct device_d *dev)
{
struct resource *iores;
- struct device_node *dev_node = dev->device_node;
+ struct device_node *dev_node = dev->of_node;
struct orion_nand *priv;
struct mtd_info *mtd;
struct nand_chip *chip;
diff --git a/drivers/mtd/nor/cfi_flash.c b/drivers/mtd/nor/cfi_flash.c
index 3b0d2332aa..179f2c718b 100644
--- a/drivers/mtd/nor/cfi_flash.c
+++ b/drivers/mtd/nor/cfi_flash.c
@@ -997,7 +997,7 @@ static int cfi_probe(struct device_d *dev)
priv->infos = xzalloc(sizeof(*priv->infos) * priv->num_devs);
priv->mtds = xzalloc(sizeof(*priv->mtds) * priv->num_devs);
- of_property_read_string(dev->device_node, "linux,mtd-name", &mtd_name);
+ of_property_read_string(dev->of_node, "linux,mtd-name", &mtd_name);
if (!mtd_name)
mtd_name = dev_name(dev);
diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
index 98b84cab1e..c7c5f21efd 100644
--- a/drivers/mtd/spi-nor/cadence-quadspi.c
+++ b/drivers/mtd/spi-nor/cadence-quadspi.c
@@ -1058,7 +1058,7 @@ static int cqspi_of_get_flash_pdata(struct device_d *dev,
static int cqspi_parse_dt(struct cqspi_st *cqspi)
{
- struct device_node *np = cqspi->dev->device_node;
+ struct device_node *np = cqspi->dev->of_node;
struct device_d *dev = cqspi->dev;
cqspi->is_decoded_cs = of_property_read_bool(np, "cdns,is-decoded-cs");
@@ -1101,7 +1101,7 @@ static int cqspi_setup_flash(struct device_d *dev,
dev_set_name(nor->dev, np->name);
- nor->dev->device_node = np;
+ nor->dev->of_node = np;
nor->dev->id = DEVICE_ID_SINGLE;
nor->dev->parent = dev;
ret = register_device(nor->dev);
@@ -1155,7 +1155,7 @@ static void cqspi_controller_init(struct cqspi_st *cqspi)
static int cqspi_probe(struct device_d *dev)
{
struct resource *iores;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct cqspi_st *cqspi;
struct cadence_qspi_platform_data *pdata = dev->platform_data;
int ret;
@@ -1203,7 +1203,7 @@ static int cqspi_probe(struct device_d *dev)
cqspi->current_cs = -1;
cqspi->sclk = 0;
- if (!dev->device_node) {
+ if (!dev->of_node) {
struct cqspi_flash_pdata *f_pdata;
f_pdata = &cqspi->f_pdata[0];
@@ -1213,7 +1213,7 @@ static int cqspi_probe(struct device_d *dev)
goto probe_failed;
} else {
/* Get flash device data */
- for_each_available_child_of_node(dev->device_node, np) {
+ for_each_available_child_of_node(dev->of_node, np) {
struct cqspi_flash_pdata *f_pdata;
unsigned int cs;
if (of_property_read_u32(np, "reg", &cs)) {
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 0ed7fd3d04..ab5aff6a57 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1372,7 +1372,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,
struct flash_info *info;
struct device_d *dev = nor->dev;
struct mtd_info *mtd = nor->mtd;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
int ret;
int i;
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index 8df5fd5dea..cc951c7ddb 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -561,7 +561,7 @@ static int bcmgenet_probe(struct device_d *dev)
return -ENODEV;
}
- ret = of_get_phy_mode(dev->device_node);
+ ret = of_get_phy_mode(dev->of_node);
if (ret < 0)
priv->interface = PHY_INTERFACE_MODE_MII;
else
@@ -579,8 +579,8 @@ static int bcmgenet_probe(struct device_d *dev)
priv->miibus.priv = priv;
priv->miibus.parent = dev;
- priv->miibus.dev.device_node
- = of_get_compatible_child(dev->device_node, "brcm,genet-mdio-v5");
+ priv->miibus.dev.of_node
+ = of_get_compatible_child(dev->of_node, "brcm,genet-mdio-v5");
ret = mdiobus_register(&priv->miibus);
if (ret)
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c
index 73671ae2d4..ec464e5c03 100644
--- a/drivers/net/cpsw.c
+++ b/drivers/net/cpsw.c
@@ -1229,7 +1229,7 @@ static void cpsw_add_slave(struct cpsw_slave *slave, struct device_node *child,
dev_warn(slave->cpsw->dev, "phy_id is deprecated, use phy-handle\n");
}
- slave->dev.device_node = child;
+ slave->dev.of_node = child;
slave->phy_id = phy_id[1];
slave->phy_if = of_get_phy_mode(child);
slave->slave_num = i;
@@ -1238,7 +1238,7 @@ static void cpsw_add_slave(struct cpsw_slave *slave, struct device_node *child,
static int cpsw_legacy_probe_dt(struct cpsw_priv *priv)
{
struct device_d *dev = priv->dev;
- struct device_node *np = dev->device_node, *child;
+ struct device_node *np = dev->of_node, *child;
int ret, i = 0;
ret = of_property_read_u32(np, "slaves", &priv->num_slaves);
@@ -1266,7 +1266,7 @@ static int cpsw_legacy_probe_dt(struct cpsw_priv *priv)
static int cpsw_switch_probe_dt(struct cpsw_priv *priv)
{
struct device_d *dev = priv->dev;
- struct device_node *np = dev->device_node, *child;
+ struct device_node *np = dev->of_node, *child;
struct device_node *ports = NULL;
int ret, i = 0;
@@ -1342,14 +1342,14 @@ static int cpsw_probe(struct device_d *dev)
return PTR_ERR(iores);
regs = IOMEM(iores->start);
- ret = of_platform_populate(dev->device_node, NULL, dev);
+ ret = of_platform_populate(dev->of_node, NULL, dev);
if (ret)
return ret;
priv = xzalloc(sizeof(*priv));
priv->dev = dev;
- if (dev->device_node) {
+ if (dev->of_node) {
ret = cpsw_probe_dt(priv);
if (ret)
goto out;
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index ff35b746e2..463c5fc11e 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -539,7 +539,7 @@ static int davinci_emac_probe(struct device_d *dev)
struct davinci_emac_priv *priv;
uint32_t ctrl_reg_offset;
uint32_t ctrl_ram_offset;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
dev_dbg(dev, "+ emac_probe\n");
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index afc275e81e..c0683bfec4 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -427,12 +427,12 @@ static int dwc_probe_dt(struct device_d *dev, struct dw_eth_dev *priv)
return -ENODEV;
priv->phy_addr = -1;
- priv->interface = of_get_phy_mode(dev->device_node);
+ priv->interface = of_get_phy_mode(dev->of_node);
/* Set MDIO bus device node, if present. */
- for_each_child_of_node(dev->device_node, child) {
+ for_each_child_of_node(dev->of_node, child) {
if (of_device_is_compatible(child, "snps,dwmac-mdio")) {
- priv->miibus.dev.device_node = child;
+ priv->miibus.dev.of_node = child;
break;
}
}
diff --git a/drivers/net/designware_eqos.c b/drivers/net/designware_eqos.c
index 7ff0b8489c..e998d35d5c 100644
--- a/drivers/net/designware_eqos.c
+++ b/drivers/net/designware_eqos.c
@@ -204,7 +204,7 @@ static int eqos_phy_reset(struct device_d *dev, struct eqos *eqos)
if (!gpio_is_valid(phy_reset))
return 0;
- of_property_read_u32_array(dev->device_node,
+ of_property_read_u32_array(dev->of_node,
"snps,reset-delays-us",
delays, ARRAY_SIZE(delays));
@@ -808,14 +808,14 @@ static void eqos_probe_dt(struct device_d *dev, struct eqos *eqos)
{
struct device_node *child;
- eqos->interface = of_get_phy_mode(dev->device_node);
+ eqos->interface = of_get_phy_mode(dev->of_node);
eqos->phy_addr = -1;
/* Set MDIO bus device node, if present. */
- for_each_child_of_node(dev->device_node, child) {
+ for_each_child_of_node(dev->of_node, child) {
if (of_device_is_compatible(child, "snps,dwmac-mdio") ||
(child->name && !of_node_cmp(child->name, "mdio"))) {
- eqos->miibus.dev.device_node = child;
+ eqos->miibus.dev.of_node = child;
break;
}
}
@@ -823,7 +823,7 @@ static void eqos_probe_dt(struct device_d *dev, struct eqos *eqos)
int eqos_probe(struct device_d *dev, const struct eqos_ops *ops, void *priv)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct mii_bus *miibus;
struct resource *iores;
struct eqos *eqos;
@@ -863,9 +863,9 @@ int eqos_probe(struct device_d *dev, const struct eqos_ops *ops, void *priv)
miibus->write = eqos_mdio_write;
miibus->priv = eqos;
- miibus->dev.device_node = of_get_compatible_child(np, "snps,dwmac-mdio");
- if (!miibus->dev.device_node)
- miibus->dev.device_node = of_get_child_by_name(np, "mdio");
+ miibus->dev.of_node = of_get_compatible_child(np, "snps,dwmac-mdio");
+ if (!miibus->dev.of_node)
+ miibus->dev.of_node = of_get_child_by_name(np, "mdio");
ret = eqos_init(dev, eqos);
if (ret)
diff --git a/drivers/net/designware_rockchip.c b/drivers/net/designware_rockchip.c
index a3859dce0c..fbb6be5fa1 100644
--- a/drivers/net/designware_rockchip.c
+++ b/drivers/net/designware_rockchip.c
@@ -232,7 +232,7 @@ static void eqos_rk_adjust_link(struct eth_device *edev)
static int eqos_init_rk_gmac(struct device_d *dev, struct eqos *eqos)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct eqos_rk_gmac *priv = to_rk_gmac(eqos);
int i = 0, ret;
const char *strings;
diff --git a/drivers/net/designware_socfpga.c b/drivers/net/designware_socfpga.c
index d6c28af45e..0c2bc5797d 100644
--- a/drivers/net/designware_socfpga.c
+++ b/drivers/net/designware_socfpga.c
@@ -162,7 +162,7 @@ static int socfpga_dwc_probe_dt(struct device_d *dev, struct socfpga_dwc_dev *pr
if (!IS_ENABLED(CONFIG_OFTREE))
return -ENODEV;
- ret = of_property_read_u32_index(dev->device_node, "altr,sysmgr-syscon",
+ ret = of_property_read_u32_index(dev->of_node, "altr,sysmgr-syscon",
1, ®_offset);
if (ret) {
dev_err(dev, "Could not read reg_offset from sysmgr-syscon! Please update the devicetree.\n");
@@ -170,14 +170,15 @@ static int socfpga_dwc_probe_dt(struct device_d *dev, struct socfpga_dwc_dev *pr
return -EINVAL;
}
- ret = of_property_read_u32_index(dev->device_node, "altr,sysmgr-syscon",
+ ret = of_property_read_u32_index(dev->of_node, "altr,sysmgr-syscon",
2, ®_shift);
if (ret) {
dev_err(dev, "Could not read reg_shift from sysmgr-syscon! Please update the devicetree.\n");
return -EINVAL;
}
- priv->f2h_ptp_ref_clk = of_property_read_bool(dev->device_node, "altr,f2h_ptp_ref_clk");
+ priv->f2h_ptp_ref_clk = of_property_read_bool(dev->of_node,
+ "altr,f2h_ptp_ref_clk");
priv->reg_offset = reg_offset;
priv->reg_shift = reg_shift;
@@ -215,7 +216,7 @@ static int socfpga_dwc_ether_probe(struct device_d *dev)
dwc_dev->priv = priv;
- dwc_dev->sys_mgr_base = syscon_base_lookup_by_phandle(dev->device_node,
+ dwc_dev->sys_mgr_base = syscon_base_lookup_by_phandle(dev->of_node,
"altr,sysmgr-syscon");
if (IS_ERR(dwc_dev->sys_mgr_base)) {
dev_err(dev, "Could not get sysmgr-syscon node\n");
diff --git a/drivers/net/designware_starfive.c b/drivers/net/designware_starfive.c
index 3dc9d14e11..c6acb94644 100644
--- a/drivers/net/designware_starfive.c
+++ b/drivers/net/designware_starfive.c
@@ -67,7 +67,8 @@ static int starfive_dwc_ether_probe(struct device_d *dev)
{ .id = "tx" },
};
- regmap = syscon_regmap_lookup_by_phandle(dev->device_node, "starfive,sysmain");
+ regmap = syscon_regmap_lookup_by_phandle(dev->of_node,
+ "starfive,sysmain");
if (IS_ERR(regmap)) {
dev_err(dev, "Could not get starfive,sysmain node\n");
return PTR_ERR(regmap);
diff --git a/drivers/net/designware_stm32.c b/drivers/net/designware_stm32.c
index 43f2d0987c..a8e5bfbfad 100644
--- a/drivers/net/designware_stm32.c
+++ b/drivers/net/designware_stm32.c
@@ -114,7 +114,7 @@ static int eqos_set_mode_stm32(struct eqos_stm32 *priv, phy_interface_t interfac
static int eqos_init_stm32(struct device_d *dev, struct eqos *eqos)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct eqos_stm32 *priv = to_stm32(eqos);
struct clk_bulk_data *eth_ck;
int ret;
@@ -126,14 +126,14 @@ static int eqos_init_stm32(struct device_d *dev, struct eqos *eqos)
priv->eth_ref_clk_sel_reg =
of_property_read_bool(np, "st,eth-ref-clk-sel");
- priv->regmap = syscon_regmap_lookup_by_phandle(dev->device_node,
+ priv->regmap = syscon_regmap_lookup_by_phandle(dev->of_node,
"st,syscon");
if (IS_ERR(priv->regmap)) {
dev_err(dev, "Could not get st,syscon node\n");
return PTR_ERR(priv->regmap);
}
- ret = of_property_read_u32_index(dev->device_node, "st,syscon",
+ ret = of_property_read_u32_index(dev->of_node, "st,syscon",
1, &priv->mode_reg);
if (ret) {
dev_err(dev, "Can't get sysconfig mode offset (%s)\n",
diff --git a/drivers/net/designware_tegra186.c b/drivers/net/designware_tegra186.c
index 0cbbdb46a4..78818a1ed6 100644
--- a/drivers/net/designware_tegra186.c
+++ b/drivers/net/designware_tegra186.c
@@ -217,7 +217,7 @@ static int eqos_init_tegra186(struct device_d *dev, struct eqos *eqos)
return PTR_ERR(priv->rst);
}
- phy_reset = of_get_named_gpio(dev->device_node, "phy-reset-gpios", 0);
+ phy_reset = of_get_named_gpio(dev->of_node, "phy-reset-gpios", 0);
if (gpio_is_valid(phy_reset)) {
ret = gpio_request(phy_reset, "phy-reset");
if (ret)
diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c
index d183ab55c9..a13e94e164 100644
--- a/drivers/net/dm9k.c
+++ b/drivers/net/dm9k.c
@@ -722,7 +722,7 @@ static int dm9k_init_dev(struct eth_device *edev)
static int dm9000_parse_dt(struct device_d *dev, struct dm9k *priv)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
uint32_t prop;
if (!IS_ENABLED(CONFIG_OFDEVICE) || !np)
diff --git a/drivers/net/dsa.c b/drivers/net/dsa.c
index bc33892f39..1d34221dcb 100644
--- a/drivers/net/dsa.c
+++ b/drivers/net/dsa.c
@@ -59,7 +59,7 @@ static int dsa_port_probe(struct eth_device *edev)
int ret;
if (ops->port_probe) {
- interface = of_get_phy_mode(dp->dev->device_node);
+ interface = of_get_phy_mode(dp->dev->of_node);
ret = ops->port_probe(dp, dp->index, interface);
if (ret)
return ret;
@@ -93,7 +93,7 @@ static int dsa_port_start(struct eth_device *edev)
if (dp->enabled)
return -EBUSY;
- interface = of_get_phy_mode(dp->dev->device_node);
+ interface = of_get_phy_mode(dp->dev->of_node);
if (ops->port_pre_enable) {
/* In case of RMII interface we need to enable RMII clock
@@ -416,7 +416,7 @@ int dsa_register_switch(struct dsa_switch *ds)
return -ENODEV;
}
- if (!ds->dev->device_node)
+ if (!ds->dev->of_node)
return -ENODEV;
if (!ds->num_ports || ds->num_ports > DSA_MAX_PORTS) {
@@ -424,7 +424,7 @@ int dsa_register_switch(struct dsa_switch *ds)
return -EINVAL;
}
- ret = dsa_switch_parse_ports_of(ds, ds->dev->device_node);
+ ret = dsa_switch_parse_ports_of(ds, ds->dev->of_node);
if (ret)
return ret;
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
index 27143bd6d0..d7f5afe66d 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -410,8 +410,7 @@ static void e1000_eeprom_uses_microwire(struct e1000_eeprom_info *eeprom,
static size_t e1000_igb_get_flash_size(struct e1000_hw *hw)
{
- struct device_node *node =
- hw->pdev->dev.device_node;
+ struct device_node *node = hw->pdev->dev.of_node;
u32 flash_size;
uint32_t fla;
int ret = 0;
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index a2fc02d6f9..5e34357371 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -657,15 +657,15 @@ static int fec_probe_dt(struct device_d *dev, struct fec_priv *fec)
struct device_node *mdiobus;
int ret;
- ret = of_get_phy_mode(dev->device_node);
+ ret = of_get_phy_mode(dev->of_node);
if (ret < 0)
fec->interface = PHY_INTERFACE_MODE_MII;
else
fec->interface = ret;
- mdiobus = of_get_child_by_name(dev->device_node, "mdio");
+ mdiobus = of_get_child_by_name(dev->of_node, "mdio");
if (mdiobus)
- fec->miibus.dev.device_node = mdiobus;
+ fec->miibus.dev.of_node = mdiobus;
return 0;
}
@@ -825,10 +825,11 @@ static int fec_probe(struct device_d *dev)
goto release_res;
}
- phy_reset = of_get_named_gpio(dev->device_node, "phy-reset-gpios", 0);
+ phy_reset = of_get_named_gpio(dev->of_node, "phy-reset-gpios", 0);
if (gpio_is_valid(phy_reset)) {
- of_property_read_u32(dev->device_node, "phy-reset-duration", &msec);
- of_property_read_u32(dev->device_node, "phy-reset-post-delay",
+ of_property_read_u32(dev->of_node, "phy-reset-duration",
+ &msec);
+ of_property_read_u32(dev->of_node, "phy-reset-post-delay",
&phy_post_delay);
/* valid reset duration should be less than 1s */
if (phy_post_delay > 1000)
@@ -873,7 +874,7 @@ static int fec_probe(struct device_d *dev)
if (ret < 0)
goto free_xbd;
- if (dev->device_node) {
+ if (dev->of_node) {
ret = fec_probe_dt(dev, fec);
fec->phy_addr = -1;
} else if (pdata) {
diff --git a/drivers/net/fsl-fman.c b/drivers/net/fsl-fman.c
index 4d72933105..617fd11e25 100644
--- a/drivers/net/fsl-fman.c
+++ b/drivers/net/fsl-fman.c
@@ -1121,7 +1121,7 @@ static int fsl_fman_port_probe(struct device_d *dev)
static int fsl_fman_memac_port_bind(struct fm_eth *fm_eth, enum fman_port_type type)
{
- struct device_node *macnp = fm_eth->dev->device_node;
+ struct device_node *macnp = fm_eth->dev->of_node;
struct device_node *portnp;
struct device_d *portdev;
struct fsl_fman_port *port;
@@ -1178,7 +1178,7 @@ static int fsl_fman_memac_probe(struct device_d *dev)
if (ret)
return ret;
- phy_mode = of_get_phy_mode(dev->device_node);
+ phy_mode = of_get_phy_mode(dev->of_node);
if (phy_mode < 0)
return phy_mode;
@@ -1306,7 +1306,7 @@ static int fsl_fman_probe(struct device_d *dev)
reg = IOMEM(iores->start);
dev->priv = reg;
- ret = of_platform_populate(dev->device_node, NULL, dev);
+ ret = of_platform_populate(dev->of_node, NULL, dev);
if (ret)
return ret;
diff --git a/drivers/net/liteeth.c b/drivers/net/liteeth.c
index 547f5486ae..c713d3412f 100644
--- a/drivers/net/liteeth.c
+++ b/drivers/net/liteeth.c
@@ -274,7 +274,7 @@ static int liteeth_set_ethaddr(struct eth_device *edev,
static int liteeth_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct eth_device *edev;
void __iomem *buf_base;
struct liteeth *priv;
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 5dbca1553e..7ccc112c0c 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -815,19 +815,19 @@ static int macb_probe(struct device_d *dev)
macb->phy_flags = pdata->phy_flags;
pclk_name = "macb_clk";
hclk_name = NULL;
- } else if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node) {
+ } else if (IS_ENABLED(CONFIG_OFDEVICE) && dev->of_node) {
int ret;
struct device_node *mdiobus;
- ret = of_get_phy_mode(dev->device_node);
+ ret = of_get_phy_mode(dev->of_node);
if (ret < 0)
macb->interface = PHY_INTERFACE_MODE_MII;
else
macb->interface = ret;
- mdiobus = of_get_child_by_name(dev->device_node, "mdio");
+ mdiobus = of_get_child_by_name(dev->of_node, "mdio");
if (mdiobus)
- macb->miibus.dev.device_node = mdiobus;
+ macb->miibus.dev.of_node = mdiobus;
macb->phy_addr = -1;
pclk_name = "pclk";
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 359c70c927..6dc0ceeafc 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -720,7 +720,7 @@ static int mvneta_probe(struct device_d *dev)
return PTR_ERR(priv->clk);
clk_enable(priv->clk);
- ret = of_get_phy_mode(dev->device_node);
+ ret = of_get_phy_mode(dev->of_node);
if (ret < 0)
return ret;
priv->intf = ret;
diff --git a/drivers/net/orion-gbe.c b/drivers/net/orion-gbe.c
index 0ae94e6840..99fde13f3e 100644
--- a/drivers/net/orion-gbe.c
+++ b/drivers/net/orion-gbe.c
@@ -451,7 +451,7 @@ static int port_probe(struct device_d *parent, struct port_priv *port)
dev_set_name(dev, "%08x.ethernet-port", (u32)gbe->regs);
dev->id = port->portno;
dev->parent = parent;
- dev->device_node = port->np;
+ dev->of_node = port->np;
ret = register_device(dev);
if (ret)
return ret;
@@ -499,13 +499,13 @@ static int orion_gbe_probe(struct device_d *dev)
* Although untested, the driver should also be able to
* deal with multi-port controllers.
*/
- for_each_child_of_node(dev->device_node, pnp)
+ for_each_child_of_node(dev->of_node, pnp)
gbe->num_ports++;
gbe->ports = xzalloc(gbe->num_ports * sizeof(*gbe->ports));
ppriv = gbe->ports;
- for_each_child_of_node(dev->device_node, pnp) {
+ for_each_child_of_node(dev->of_node, pnp) {
ppriv->np = pnp;
ret = port_probe(dev, ppriv);
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 93a8bb9df1..2e62d03bf9 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -139,7 +139,7 @@ static bool at803x_match_phy_id(struct phy_device *phydev, u32 phy_id)
static int at803x_parse_dt(struct phy_device *phydev)
{
const struct device_d *dev = &phydev->dev;
- const struct device_node *node = dev->device_node;
+ const struct device_node *node = dev->of_node;
struct at803x_priv *priv = phydev->priv;
unsigned int sel;
u32 freq, strength;
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 2435df1b47..df6ab74de6 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -165,7 +165,7 @@ static int dp83867_of_init(struct phy_device *phydev)
{
struct dp83867_private *dp83867 = phydev->priv;
struct device_d *dev = &phydev->dev;
- struct device_node *of_node = dev->device_node;
+ struct device_node *of_node = dev->of_node;
int ret;
if (!of_node)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index d81632dfc7..c0b819b109 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -188,10 +188,10 @@ static int marvell_of_reg_init(struct phy_device *phydev)
const __be32 *paddr;
int len, i, saved_page, current_page, page_changed, ret;
- if (!phydev->dev.device_node)
+ if (!phydev->dev.of_node)
return 0;
- paddr = of_get_property(phydev->dev.device_node,
+ paddr = of_get_property(phydev->dev.of_node,
"marvell,reg-init", &len);
if (!paddr || len < (4 * sizeof(*paddr)))
return 0;
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index c64f2b3925..f161685715 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -50,7 +50,7 @@ static struct mdio_gpio_info *mdio_gpio_of_get_info(struct device_d *dev)
info = xzalloc(sizeof(*info));
- ret = of_get_gpio_flags(dev->device_node, 0, &flags);
+ ret = of_get_gpio_flags(dev->of_node, 0, &flags);
if (ret < 0) {
dev_dbg(dev, "failed to get MDC information from DT\n");
goto free_info;
@@ -59,7 +59,7 @@ static struct mdio_gpio_info *mdio_gpio_of_get_info(struct device_d *dev)
info->mdc = ret;
info->mdc_active_low = flags & OF_GPIO_ACTIVE_LOW;
- ret = of_get_gpio_flags(dev->device_node, 1, &flags);
+ ret = of_get_gpio_flags(dev->of_node, 1, &flags);
if (ret < 0) {
dev_dbg(dev, "failed to get MDIO information from DT\n");
goto free_info;
@@ -68,7 +68,7 @@ static struct mdio_gpio_info *mdio_gpio_of_get_info(struct device_d *dev)
info->mdio = ret;
info->mdio_active_low = flags & OF_GPIO_ACTIVE_LOW;
- ret = of_get_gpio_flags(dev->device_node, 2, &flags);
+ ret = of_get_gpio_flags(dev->of_node, 2, &flags);
if (ret > 0) {
dev_dbg(dev, "found MDO information in DT\n");
info->mdo = ret;
@@ -145,7 +145,7 @@ static struct mdiobb_ops mdio_gpio_ops = {
static int mdio_gpio_probe(struct device_d *dev)
{
int ret;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct mdio_gpio_info *info;
struct mii_bus *bus;
@@ -202,7 +202,7 @@ static int mdio_gpio_probe(struct device_d *dev)
bus = alloc_mdio_bitbang(&info->ctrl);
bus->parent = dev;
- bus->dev.device_node = np;
+ bus->dev.of_node = np;
dev->priv = bus;
diff --git a/drivers/net/phy/mdio-mux-gpio.c b/drivers/net/phy/mdio-mux-gpio.c
index a36782c0b6..7d93fb2aa0 100644
--- a/drivers/net/phy/mdio-mux-gpio.c
+++ b/drivers/net/phy/mdio-mux-gpio.c
@@ -74,7 +74,7 @@ static int mdio_mux_gpio_probe(struct device_d *dev)
s = xzalloc(sizeof(*s));
- s->gpios_num = of_gpio_count(dev->device_node);
+ s->gpios_num = of_gpio_count(dev->of_node);
if (s->gpios_num <= 0) {
dev_err(dev, "No GPIOs specified\n");
r = -EINVAL;
@@ -86,7 +86,7 @@ static int mdio_mux_gpio_probe(struct device_d *dev)
for (i = 0; i < s->gpios_num; i++) {
enum of_gpio_flags flags;
- r = of_get_gpio_flags(dev->device_node, i, &flags);
+ r = of_get_gpio_flags(dev->of_node, i, &flags);
if (!gpio_is_valid(r)) {
r = (r < 0) ? r : -EINVAL;
goto free_mem;
@@ -105,7 +105,7 @@ static int mdio_mux_gpio_probe(struct device_d *dev)
goto free_gpios;
- r = mdio_mux_init(dev, dev->device_node,
+ r = mdio_mux_init(dev, dev->of_node,
mdio_mux_gpio_switch_fn, s, NULL);
if (r < 0)
goto free_gpios;
diff --git a/drivers/net/phy/mdio-mux.c b/drivers/net/phy/mdio-mux.c
index 1e6278ef35..67d5664de9 100644
--- a/drivers/net/phy/mdio-mux.c
+++ b/drivers/net/phy/mdio-mux.c
@@ -117,7 +117,7 @@ int mdio_mux_init(struct device_d *dev,
cb->mii_bus.parent = dev;
cb->mii_bus.read = mdio_mux_read;
cb->mii_bus.write = mdio_mux_write;
- cb->mii_bus.dev.device_node = child_bus_node;
+ cb->mii_bus.dev.of_node = child_bus_node;
r = mdiobus_register(&cb->mii_bus);
if (r) {
diff --git a/drivers/net/phy/mdio-mvebu.c b/drivers/net/phy/mdio-mvebu.c
index 289ff4b05d..0672481fea 100644
--- a/drivers/net/phy/mdio-mvebu.c
+++ b/drivers/net/phy/mdio-mvebu.c
@@ -119,7 +119,7 @@ static int mvebu_mdio_probe(struct device_d *dev)
return PTR_ERR(priv->clk);
clk_enable(priv->clk);
- priv->miibus.dev.device_node = dev->device_node;
+ priv->miibus.dev.of_node = dev->of_node;
priv->miibus.priv = priv;
priv->miibus.parent = dev;
priv->miibus.read = mvebu_mdio_read;
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index a68b0e47c0..ee38143096 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -119,7 +119,7 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi
* Associate the OF node with the device structure so it
* can be looked up later
*/
- phy->dev.device_node = child;
+ phy->dev.of_node = child;
/*
* All data is now stored in the phy struct;
@@ -145,7 +145,7 @@ static int of_mdiobus_register_device(struct mii_bus *mdio,
if (IS_ERR(mdiodev))
return PTR_ERR(mdiodev);
- mdiodev->dev.device_node = child;
+ mdiodev->dev.of_node = child;
ret = mdio_register_device(mdiodev);
if (ret)
@@ -314,16 +314,16 @@ int mdiobus_register(struct mii_bus *bus)
pr_info("%s: probed\n", dev_name(&bus->dev));
- if (bus->dev.device_node) {
+ if (bus->dev.of_node) {
/* Register PHY's as child node to mdio node */
- of_mdiobus_register(bus, bus->dev.device_node);
+ of_mdiobus_register(bus, bus->dev.of_node);
}
- else if (bus->parent->device_node) {
+ else if (bus->parent->of_node) {
/*
* Register PHY's as child node to the ethernet node,
* if there was no mdio node
*/
- of_mdiobus_register(bus, bus->parent->device_node);
+ of_mdiobus_register(bus, bus->parent->of_node);
}
return 0;
@@ -399,7 +399,7 @@ struct mii_bus *of_mdio_find_bus(struct device_node *mdio_bus_np)
return NULL;
for_each_mii_bus(mii)
- if (mii->dev.device_node == mdio_bus_np)
+ if (mii->dev.of_node == mdio_bus_np)
return mii;
return NULL;
@@ -509,7 +509,7 @@ static struct cdev_operations phydev_ops = {
static void of_set_phy_supported(struct phy_device *phydev)
{
- struct device_node *node = phydev->dev.device_node;
+ struct device_node *node = phydev->dev.of_node;
u32 max_speed;
if (!IS_ENABLED(CONFIG_OFDEVICE))
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 8a30faa92b..7b551969ab 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -129,7 +129,7 @@ static int kszphy_rmii_clk_sel(struct phy_device *phydev, bool val)
static int kszphy_led_mode(struct phy_device *phydev, int reg, int shift)
{
const struct device_d *dev = &phydev->dev;
- const struct device_node *of_node = dev->device_node ? : dev->parent->device_node;
+ const struct device_node *of_node = dev->of_node ? : dev->parent->of_node;
u32 val;
if (!of_property_read_u32(of_node, "micrel,led-mode", &val)) {
@@ -279,7 +279,7 @@ static int ksz9021_load_values_from_of(struct phy_device *phydev,
static int ksz9021_config_init(struct phy_device *phydev)
{
const struct device_d *dev = &phydev->dev;
- const struct device_node *of_node = dev->device_node;
+ const struct device_node *of_node = dev->of_node;
const char *clk_pad_skew_names[] = {
"txen-skew-ps", "txc-skew-ps",
"rxdv-skew-ps", "rxc-skew-ps"
@@ -293,8 +293,8 @@ static int ksz9021_config_init(struct phy_device *phydev)
"txd2-skew-ps", "txd3-skew-ps"
};
- if (!of_node && dev->parent->device_node)
- of_node = dev->parent->device_node;
+ if (!of_node && dev->parent->of_node)
+ of_node = dev->parent->of_node;
if (of_node) {
ksz9021_load_values_from_of(phydev, of_node,
@@ -472,7 +472,7 @@ static int ksz9031_config_rgmii_delay(struct phy_device *phydev)
static int ksz9031_config_init(struct phy_device *phydev)
{
const struct device_d *dev = &phydev->dev;
- const struct device_node *of_node = dev->device_node;
+ const struct device_node *of_node = dev->of_node;
static const char *clk_skews[2] = {"rxc-skew-ps", "txc-skew-ps"};
static const char *rx_data_skews[4] = {
"rxd0-skew-ps", "rxd1-skew-ps",
@@ -485,8 +485,8 @@ static int ksz9031_config_init(struct phy_device *phydev)
static const char *control_skews[2] = {"txen-skew-ps", "rxdv-skew-ps"};
int ret;
- if (!of_node && dev->parent->device_node)
- of_node = dev->parent->device_node;
+ if (!of_node && dev->parent->of_node)
+ of_node = dev->parent->of_node;
if (of_node) {
if (phy_interface_is_rgmii(phydev)) {
@@ -612,7 +612,7 @@ static int ksz8873mll_config_init(struct phy_device *phydev)
static int kszphy_probe(struct phy_device *phydev)
{
struct device_d *dev = &phydev->dev;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct phy_driver *drv = to_phy_driver(dev->driver);
const struct kszphy_type *type = drv->driver_data;
struct kszphy_priv *priv;
diff --git a/drivers/net/phy/mv88e6xxx/chip.c b/drivers/net/phy/mv88e6xxx/chip.c
index a7d707095b..07df19e99b 100644
--- a/drivers/net/phy/mv88e6xxx/chip.c
+++ b/drivers/net/phy/mv88e6xxx/chip.c
@@ -839,7 +839,7 @@ static const struct nvmem_bus mv88e6xxx_eeprom_nvmem_bus = {
static int mv88e6xxx_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct device_node *mdio_node;
struct mv88e6xxx_chip *chip;
enum of_gpio_flags of_flags;
@@ -941,7 +941,7 @@ static int mv88e6xxx_probe(struct device_d *dev)
mdio_node = of_get_child_by_name(np, "mdio");
if (mdio_node)
- chip->miibus.dev.device_node = mdio_node;
+ chip->miibus.dev.of_node = mdio_node;
err = mv88e6xxx_port_probe(chip);
if (err)
diff --git a/drivers/net/phy/mv88e6xxx/port.c b/drivers/net/phy/mv88e6xxx/port.c
index 93a789e658..5a00802361 100644
--- a/drivers/net/phy/mv88e6xxx/port.c
+++ b/drivers/net/phy/mv88e6xxx/port.c
@@ -565,7 +565,7 @@ device_phy_driver(mv88e6xxx_port_driver);
int mv88e6xxx_port_probe(struct mv88e6xxx_chip *chip)
{
struct device_d *dev = chip->dev;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct device_node *port_node, *switch_node;
struct device_node *port_nodes[DSA_MAX_PORTS] = { NULL };
int err, i;
@@ -659,7 +659,7 @@ int mv88e6xxx_port_probe(struct mv88e6xxx_chip *chip)
phydev = phy_device_create(chip->parent_miibus,
chip->info->port_base_addr + i,
MV88E6XXX_SWITCH_PORT_PHY_ID);
- phydev->dev.device_node = port_nodes[i];
+ phydev->dev.of_node = port_nodes[i];
phydev->dev.priv = chip;
phydev->duplex = DUPLEX_UNFORCED;
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 56ec8a28df..7377cb014d 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -338,16 +338,18 @@ static struct phy_device *of_mdio_find_phy(struct eth_device *edev)
if (!IS_ENABLED(CONFIG_OFDEVICE))
return NULL;
- if (!edev->parent || !edev->parent->device_node)
+ if (!edev->parent || !edev->parent->of_node)
return NULL;
- phy_node = of_parse_phandle(edev->parent->device_node, "phy-handle", 0);
+ phy_node = of_parse_phandle(edev->parent->of_node, "phy-handle", 0);
if (!phy_node)
- phy_node = of_parse_phandle(edev->parent->device_node, "phy", 0);
+ phy_node = of_parse_phandle(edev->parent->of_node, "phy", 0);
if (!phy_node)
- phy_node = of_parse_phandle(edev->parent->device_node, "phy-device", 0);
+ phy_node = of_parse_phandle(edev->parent->of_node,
+ "phy-device", 0);
if (!phy_node) {
- phy_node = of_get_child_by_name(edev->parent->device_node, "fixed-link");
+ phy_node = of_get_child_by_name(edev->parent->of_node,
+ "fixed-link");
if (phy_node)
return of_phy_register_fixed_link(phy_node, edev);
}
@@ -358,7 +360,7 @@ static struct phy_device *of_mdio_find_phy(struct eth_device *edev)
if (!of_property_read_u32(phy_node, "reg", &addr)) {
of_device_ensure_probed(phy_node->parent);
for_each_mii_bus(bus) {
- if (bus->parent->device_node == phy_node->parent) {
+ if (bus->parent->of_node == phy_node->parent) {
struct phy_device *phy = mdiobus_scan(bus, addr);
if (!IS_ERR(phy))
return phy;
@@ -367,7 +369,7 @@ static struct phy_device *of_mdio_find_phy(struct eth_device *edev)
}
bus_for_each_device(&mdio_bus_type, dev) {
- if (dev->device_node == phy_node)
+ if (dev->of_node == phy_node)
return container_of(dev, struct phy_device, dev);
}
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 7fd5c2aadb..c660b1d13f 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -505,18 +505,18 @@ static int smc911x_probe(struct device_d *dev)
priv->shift = pdata->shift;
priv->flags = pdata->flags;
priv->phy_mask = pdata->phy_mask;
- } else if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node) {
- ret = of_property_read_u32(dev->device_node, "reg-io-width", &val);
+ } else if (IS_ENABLED(CONFIG_OFDEVICE) && dev->of_node) {
+ ret = of_property_read_u32(dev->of_node, "reg-io-width", &val);
if (ret)
return ret;
is_32bit = (val == 4);
- of_property_read_u32(dev->device_node, "reg-shift", &priv->shift);
+ of_property_read_u32(dev->of_node, "reg-shift", &priv->shift);
- if (of_property_read_bool(dev->device_node, "smsc,force-internal-phy"))
+ if (of_property_read_bool(dev->of_node, "smsc,force-internal-phy"))
priv->flags |= SMC911X_FORCE_INTERNAL_PHY;
- if (of_property_read_bool(dev->device_node, "smsc,force-external-phy"))
+ if (of_property_read_bool(dev->of_node, "smsc,force-external-phy"))
priv->flags |= SMC911X_FORCE_EXTERNAL_PHY;
}
diff --git a/drivers/nvmem/bsec.c b/drivers/nvmem/bsec.c
index 86b943a45d..937a1b223c 100644
--- a/drivers/nvmem/bsec.c
+++ b/drivers/nvmem/bsec.c
@@ -111,7 +111,7 @@ static int stm32_bsec_read_mac(struct bsec_priv *priv, int offset, u8 *mac)
static void stm32_bsec_init_dt(struct bsec_priv *priv, struct device_d *dev,
struct regmap *map)
{
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
struct device_node *rnode;
u32 phandle, offset;
char mac[ETH_ALEN];
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index fded8b6f4b..c056b3b63a 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -100,7 +100,7 @@ static int nvmem_register_cdev(struct nvmem_device *nvmem, const char *name)
const char *alias;
int ret;
- alias = of_alias_get(dev->device_node);
+ alias = of_alias_get(dev->of_node);
cdev->name = xstrdup(alias ?: name);
cdev->ops = &nvmem_chrdev_ops;
@@ -111,7 +111,7 @@ static int nvmem_register_cdev(struct nvmem_device *nvmem, const char *name)
if (ret)
return ret;
- of_parse_partitions(cdev, dev->device_node);
+ of_parse_partitions(cdev, dev->of_node);
of_partitions_register_fixup(cdev);
return 0;
@@ -125,7 +125,7 @@ static struct nvmem_device *of_nvmem_find(struct device_node *nvmem_np)
return NULL;
list_for_each_entry(dev, &nvmem_devs, node)
- if (dev->dev.device_node == nvmem_np)
+ if (dev->dev.of_node == nvmem_np)
return dev;
return NULL;
@@ -206,8 +206,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
nvmem->size = config->size;
nvmem->dev.parent = config->dev;
nvmem->bus = config->bus;
- np = config->cdev ? config->cdev->device_node : config->dev->device_node;
- nvmem->dev.device_node = np;
+ np = config->cdev ? config->cdev->device_node : config->dev->of_node;
+ nvmem->dev.of_node = np;
nvmem->priv = config->priv;
if (config->read_only || !config->bus->write || of_property_read_bool(np, "read-only"))
@@ -327,10 +327,10 @@ EXPORT_SYMBOL_GPL(of_nvmem_device_get);
*/
struct nvmem_device *nvmem_device_get(struct device_d *dev, const char *dev_name)
{
- if (dev->device_node) { /* try dt first */
+ if (dev->of_node) { /* try dt first */
struct nvmem_device *nvmem;
- nvmem = of_nvmem_device_get(dev->device_node, dev_name);
+ nvmem = of_nvmem_device_get(dev->of_node, dev_name);
if (!IS_ERR(nvmem) || PTR_ERR(nvmem) == -EPROBE_DEFER)
return nvmem;
@@ -467,8 +467,8 @@ struct nvmem_cell *nvmem_cell_get(struct device_d *dev, const char *cell_id)
{
struct nvmem_cell *cell;
- if (dev->device_node) { /* try dt first */
- cell = of_nvmem_cell_get(dev->device_node, cell_id);
+ if (dev->of_node) { /* try dt first */
+ cell = of_nvmem_cell_get(dev->of_node, cell_id);
if (!IS_ERR(cell) || PTR_ERR(cell) == -EPROBE_DEFER)
return cell;
}
@@ -826,7 +826,7 @@ int nvmem_cell_read_variable_le_u32(struct device_d *dev, const char *cell_id,
len = sizeof(*val);
- buf = nvmem_cell_get_and_read(dev->device_node, cell_id, len);
+ buf = nvmem_cell_get_and_read(dev->of_node, cell_id, len);
if (IS_ERR(buf))
return PTR_ERR(buf);
diff --git a/drivers/nvmem/eeprom_93xx46.c b/drivers/nvmem/eeprom_93xx46.c
index 0d19bc2877..0340697f2a 100644
--- a/drivers/nvmem/eeprom_93xx46.c
+++ b/drivers/nvmem/eeprom_93xx46.c
@@ -305,7 +305,7 @@ static int eeprom_93xx46_probe_dt(struct spi_device *spi)
{
const struct of_device_id *of_id =
of_match_device(eeprom_93xx46_of_table, &spi->dev);
- struct device_node *np = spi->dev.device_node;
+ struct device_node *np = spi->dev.of_node;
struct eeprom_93xx46_platform_data *pd;
enum of_gpio_flags of_flags;
unsigned long flags = GPIOF_OUT_INIT_INACTIVE;
@@ -374,7 +374,7 @@ static int eeprom_93xx46_probe(struct device_d *dev)
struct eeprom_93xx46_dev *edev;
int err;
- if (dev->device_node) {
+ if (dev->of_node) {
err = eeprom_93xx46_probe_dt(spi);
if (err < 0)
return err;
diff --git a/drivers/nvmem/ocotp.c b/drivers/nvmem/ocotp.c
index 08171cb5cd..d3d05fe46f 100644
--- a/drivers/nvmem/ocotp.c
+++ b/drivers/nvmem/ocotp.c
@@ -644,7 +644,7 @@ static int imx_ocotp_init_dt(struct ocotp_priv *priv)
{
char mac[MAC_BYTES];
const __be32 *prop;
- struct device_node *node = priv->dev.parent->device_node;
+ struct device_node *node = priv->dev.parent->of_node;
u32 tester4;
int ret, len;
diff --git a/drivers/nvmem/rave-sp-eeprom.c b/drivers/nvmem/rave-sp-eeprom.c
index 2345b24936..7aef0d90a9 100644
--- a/drivers/nvmem/rave-sp-eeprom.c
+++ b/drivers/nvmem/rave-sp-eeprom.c
@@ -293,7 +293,7 @@ static int rave_sp_eeprom_probe(struct device_d *dev)
struct nvmem_device *nvmem;
u32 reg[2], size;
- if (of_property_read_u32_array(dev->device_node,
+ if (of_property_read_u32_array(dev->of_node,
"reg", reg, ARRAY_SIZE(reg))) {
dev_err(dev, "Failed to parse \"reg\" property\n");
return -EINVAL;
@@ -322,7 +322,7 @@ static int rave_sp_eeprom_probe(struct device_d *dev)
/*
* If a name is specified via DT, override the above with it.
*/
- of_property_read_string(dev->device_node, "zii,eeprom-name",
+ of_property_read_string(dev->of_node, "zii,eeprom-name",
&config.name);
config.dev = dev;
config.priv = eeprom;
diff --git a/drivers/nvmem/snvs_lpgpr.c b/drivers/nvmem/snvs_lpgpr.c
index ddfc15e147..4d0d5779c0 100644
--- a/drivers/nvmem/snvs_lpgpr.c
+++ b/drivers/nvmem/snvs_lpgpr.c
@@ -80,7 +80,7 @@ static const struct nvmem_bus snvs_lpgpr_nvmem_bus = {
static int snvs_lpgpr_probe(struct device_d *dev)
{
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
struct device_node *syscon_node;
struct snvs_lpgpr_priv *priv;
struct nvmem_config *cfg;
diff --git a/drivers/nvmem/starfive-otp.c b/drivers/nvmem/starfive-otp.c
index 52c5292839..0f668abdcc 100644
--- a/drivers/nvmem/starfive-otp.c
+++ b/drivers/nvmem/starfive-otp.c
@@ -162,7 +162,7 @@ static int starfive_otp_probe(struct device_d *dev)
if (IS_ERR(iores))
return PTR_ERR(iores);
- ret = of_property_read_u32(dev->device_node, "fuse-count", &total_fuses);
+ ret = of_property_read_u32(dev->of_node, "fuse-count", &total_fuses);
if (ret < 0) {
dev_err(dev, "missing required fuse-count property\n");
return ret;
diff --git a/drivers/of/barebox.c b/drivers/of/barebox.c
index d3a5ae04dc..23319c336a 100644
--- a/drivers/of/barebox.c
+++ b/drivers/of/barebox.c
@@ -26,7 +26,7 @@ static int environment_check_mount(struct device_d *dev, char **devpath)
if (!IS_ENABLED(CONFIG_OF_BAREBOX_ENV_IN_FS))
return 0;
- ret = of_property_read_string(dev->device_node, "file-path", &filepath);
+ ret = of_property_read_string(dev->of_node, "file-path", &filepath);
if (ret == -EINVAL) {
/* No file-path so just use device-path */
return 0;
@@ -57,7 +57,8 @@ static int environment_probe(struct device_d *dev)
char *path;
int ret;
- ret = of_find_path(dev->device_node, "device-path", &path, OF_FIND_PATH_FLAGS_BB);
+ ret = of_find_path(dev->of_node, "device-path", &path,
+ OF_FIND_PATH_FLAGS_BB);
if (ret)
return ret;
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 221050a197..447cbb0e2f 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -743,7 +743,7 @@ int of_match(struct device_d *dev, struct driver_d *drv)
{
const struct of_device_id *id;
- id = of_match_node(drv->of_compatible, dev->device_node);
+ id = of_match_node(drv->of_compatible, dev->of_node);
if (!id)
return 1;
@@ -2522,7 +2522,7 @@ static void of_platform_device_create_root(struct device_node *np)
dev = xzalloc(sizeof(*dev));
dev->id = DEVICE_ID_SINGLE;
- dev->device_node = np;
+ dev->of_node = np;
dev_set_name(dev, "machine");
ret = platform_device_register(dev);
@@ -2702,7 +2702,7 @@ int of_device_is_stdout_path(struct device_d *dev, unsigned int *baudrate)
{
unsigned int tmp = *baudrate;
- if (!dev || !dev->device_node || dev->device_node != of_get_stdoutpath(&tmp))
+ if (!dev || !dev->of_node || dev->of_node != of_get_stdoutpath(&tmp))
return false;
*baudrate = tmp;
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 5cc288efbe..5d3d016e03 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -14,10 +14,10 @@
const struct of_device_id *of_match_device(const struct of_device_id *matches,
const struct device_d *dev)
{
- if ((!matches) || (!dev->device_node))
+ if ((!matches) || (!dev->of_node))
return NULL;
- return of_match_node(matches, dev->device_node);
+ return of_match_node(matches, dev->of_node);
}
EXPORT_SYMBOL(of_match_device);
diff --git a/drivers/of/of_path.c b/drivers/of/of_path.c
index 05c28bf052..bac95a6edf 100644
--- a/drivers/of/of_path.c
+++ b/drivers/of/of_path.c
@@ -17,9 +17,9 @@ struct device_d *of_find_device_by_node_path(const char *path)
struct device_d *dev;
for_each_device(dev) {
- if (!dev->device_node)
+ if (!dev->of_node)
continue;
- if (!strcmp(path, dev->device_node->full_name))
+ if (!strcmp(path, dev->of_node->full_name))
return dev;
}
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 2b5ad08c12..ac51a6f8e1 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -32,7 +32,7 @@ struct device_d *of_find_device_by_node(struct device_node *np)
return np->dev;
for_each_device(dev)
- if (dev->device_node == np)
+ if (dev->of_node == np)
return dev;
return NULL;
}
@@ -48,7 +48,7 @@ EXPORT_SYMBOL(of_find_device_by_node);
*/
static void of_device_make_bus_id(struct device_d *dev)
{
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
const __be32 *reg;
u64 addr;
@@ -176,7 +176,7 @@ struct device_d *of_platform_device_create(struct device_node *np,
/* setup generic device info */
dev = xzalloc(sizeof(*dev));
dev->id = DEVICE_ID_SINGLE;
- dev->device_node = np;
+ dev->of_node = np;
dev->parent = parent;
dev->resource = res;
dev->num_resources = num_reg;
@@ -298,7 +298,7 @@ static struct device_d *of_amba_device_create(struct device_node *np)
/* setup generic device info */
dev->dev.id = DEVICE_ID_SINGLE;
- dev->dev.device_node = np;
+ dev->dev.of_node = np;
of_device_make_bus_id(&dev->dev);
ret = of_address_to_resource(np, 0, &dev->res);
diff --git a/drivers/pci/pci-ecam-generic.c b/drivers/pci/pci-ecam-generic.c
index 58c81ecbb6..61de58f7d8 100644
--- a/drivers/pci/pci-ecam-generic.c
+++ b/drivers/pci/pci-ecam-generic.c
@@ -129,7 +129,7 @@ static inline bool is_64bit(const struct resource *res)
static int pcie_ecam_parse_dt(struct generic_ecam_pcie *ecam)
{
struct device_d *dev = ecam->pci.parent;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct of_pci_range_parser parser;
struct of_pci_range range;
struct resource res;
diff --git a/drivers/pci/pci-imx6.c b/drivers/pci/pci-imx6.c
index e7ea0ebb94..a65c251669 100644
--- a/drivers/pci/pci-imx6.c
+++ b/drivers/pci/pci-imx6.c
@@ -691,7 +691,7 @@ static int imx6_pcie_probe(struct device_d *dev)
struct resource *iores;
struct dw_pcie *pci;
struct imx6_pcie *imx6_pcie;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
int ret;
imx6_pcie = xzalloc(sizeof(*imx6_pcie));
diff --git a/drivers/pci/pci-layerscape.c b/drivers/pci/pci-layerscape.c
index b0a1ce8135..130d1dccdb 100644
--- a/drivers/pci/pci-layerscape.c
+++ b/drivers/pci/pci-layerscape.c
@@ -221,7 +221,7 @@ static int ls1021_pcie_host_init(struct pcie_port *pp)
u32 index[2];
int ret;
- pcie->scfg = syscon_regmap_lookup_by_phandle(dev->device_node,
+ pcie->scfg = syscon_regmap_lookup_by_phandle(dev->of_node,
"fsl,pcie-scfg");
if (IS_ERR(pcie->scfg)) {
ret = PTR_ERR(pcie->scfg);
@@ -230,7 +230,7 @@ static int ls1021_pcie_host_init(struct pcie_port *pp)
return ret;
}
- if (of_property_read_u32_array(dev->device_node,
+ if (of_property_read_u32_array(dev->of_node,
"fsl,pcie-scfg", index, 2)) {
pcie->scfg = NULL;
return -EINVAL;
@@ -378,7 +378,7 @@ static int ls_pcie_of_fixup(struct device_node *root, void *ctx)
int ret, i;
u32 devid, stream_id;
- name = of_get_reproducible_name(dev->device_node);
+ name = of_get_reproducible_name(dev->of_node);
np = root;
do {
diff --git a/drivers/pci/pci-mvebu.c b/drivers/pci/pci-mvebu.c
index 41bccd2783..ea07aa734f 100644
--- a/drivers/pci/pci-mvebu.c
+++ b/drivers/pci/pci-mvebu.c
@@ -292,14 +292,14 @@ static struct mvebu_pcie *mvebu_pcie_port_probe(struct device_d *dev,
return ERR_PTR(-EINVAL);
}
- if (mvebu_get_target_attr(dev->device_node, devfn, IORESOURCE_MEM,
+ if (mvebu_get_target_attr(dev->of_node, devfn, IORESOURCE_MEM,
&mem_target, &mem_attr)) {
dev_err(dev, "unable to get target/attr for mem window\n");
return ERR_PTR(-EINVAL);
}
/* I/O windows are optional */
- mvebu_get_target_attr(dev->device_node, devfn, IORESOURCE_IO,
+ mvebu_get_target_attr(dev->of_node, devfn, IORESOURCE_IO,
&io_target, &io_attr);
reset_gpio = of_get_named_gpio_flags(np, "reset-gpios", 0, &flags);
@@ -398,7 +398,7 @@ static struct of_device_id mvebu_pcie_dt_ids[] = {
static int mvebu_pcie_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
const struct of_device_id *match = of_match_node(mvebu_pcie_dt_ids, np);
struct mvebu_pcie_ops *ops = (struct mvebu_pcie_ops *)match->data;
struct device_node *pnp;
diff --git a/drivers/pci/pci-tegra.c b/drivers/pci/pci-tegra.c
index d3b8ab59b2..272f16d6d3 100644
--- a/drivers/pci/pci-tegra.c
+++ b/drivers/pci/pci-tegra.c
@@ -903,7 +903,7 @@ static int tegra_pcie_put_resources(struct tegra_pcie *pcie)
static int tegra_pcie_get_xbar_config(struct tegra_pcie *pcie, u32 lanes,
u32 *xbar)
{
- struct device_node *np = pcie->dev->device_node;
+ struct device_node *np = pcie->dev->of_node;
if (of_device_is_compatible(np, "nvidia,tegra124-pcie")) {
switch (lanes) {
@@ -954,7 +954,7 @@ static int tegra_pcie_get_xbar_config(struct tegra_pcie *pcie, u32 lanes,
static int tegra_pcie_parse_dt(struct tegra_pcie *pcie)
{
const struct tegra_pcie_soc_data *soc = pcie->soc_data;
- struct device_node *np = pcie->dev->device_node, *port;
+ struct device_node *np = pcie->dev->of_node, *port;
struct of_pci_range_parser parser;
struct of_pci_range range;
struct resource *rp_res;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 9b00a1c9eb..d46d996efd 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -346,10 +346,10 @@ pci_of_match_device(struct device_d *parent, unsigned int devfn)
struct device_node *np;
u32 reg;
- if (!IS_ENABLED(CONFIG_OFTREE) || !parent || !parent->device_node)
+ if (!IS_ENABLED(CONFIG_OFTREE) || !parent || !parent->of_node)
return NULL;
- for_each_child_of_node(parent->device_node, np) {
+ for_each_child_of_node(parent->of_node, np) {
if (!of_property_read_u32_array(np, "reg", ®, 1)) {
/*
* Only match device/function pair of the device
@@ -399,10 +399,10 @@ static unsigned int pci_scan_bus(struct pci_bus *bus)
dev->vendor = l & 0xffff;
dev->device = (l >> 16) & 0xffff;
dev->dev.parent = bus->parent;
- dev->dev.device_node = pci_of_match_device(bus->parent, devfn);
- if (dev->dev.device_node)
+ dev->dev.of_node = pci_of_match_device(bus->parent, devfn);
+ if (dev->dev.of_node)
pr_debug("found DT node %s for device %04x:%04x\n",
- dev->dev.device_node->full_name,
+ dev->dev.of_node->full_name,
dev->vendor, dev->device);
/* non-destructively determine if device can be a master: */
diff --git a/drivers/pci/pcie-designware-host.c b/drivers/pci/pcie-designware-host.c
index a8309653c6..34a6dd06d8 100644
--- a/drivers/pci/pcie-designware-host.c
+++ b/drivers/pci/pcie-designware-host.c
@@ -72,7 +72,7 @@ int __init dw_pcie_host_init(struct pcie_port *pp)
{
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct device_d *dev = pci->dev;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct of_pci_range range;
struct of_pci_range_parser parser;
struct resource *cfg_res;
diff --git a/drivers/pci/pcie-designware.c b/drivers/pci/pcie-designware.c
index ecfd6d5fa6..2b3a01c7b6 100644
--- a/drivers/pci/pcie-designware.c
+++ b/drivers/pci/pcie-designware.c
@@ -282,7 +282,7 @@ void dw_pcie_setup(struct dw_pcie *pci)
u32 val;
u32 lanes;
struct device_d *dev = pci->dev;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
if (pci->version >= 0x480A || (!pci->version &&
dw_pcie_iatu_unroll_enabled(pci))) {
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 3a36f0a1b2..1e6fa4d6c2 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -43,7 +43,7 @@ struct phy *phy_create(struct device_d *dev, struct device_node *node,
dev_set_name(&phy->dev, "phy");
phy->dev.id = id;
phy->dev.parent = dev;
- phy->dev.device_node = node ?: dev->device_node;
+ phy->dev.of_node = node ?: dev->of_node;
phy->id = id;
phy->ops = ops;
@@ -225,10 +225,10 @@ static struct phy_provider *of_phy_provider_lookup(struct device_node *node)
return ERR_PTR(ret);
list_for_each_entry(phy_provider, &phy_provider_list, list) {
- if (phy_provider->dev->device_node == node)
+ if (phy_provider->dev->of_node == node)
return phy_provider;
- for_each_child_of_node(phy_provider->dev->device_node, child)
+ for_each_child_of_node(phy_provider->dev->of_node, child)
if (child == node)
return phy_provider;
}
@@ -301,15 +301,15 @@ struct phy *of_phy_get_by_phandle(struct device_d *dev, const char *phandle,
struct device_node *np;
struct phy_provider *phy_provider;
- if (!dev->device_node) {
+ if (!dev->of_node) {
dev_dbg(dev, "device does not have a device node entry\n");
return ERR_PTR(-EINVAL);
}
- np = of_parse_phandle(dev->device_node, phandle, index);
+ np = of_parse_phandle(dev->of_node, phandle, index);
if (!np) {
dev_dbg(dev, "failed to get %s phandle in %s node\n", phandle,
- dev->device_node->full_name);
+ dev->of_node->full_name);
return ERR_PTR(-ENODEV);
}
@@ -341,10 +341,10 @@ struct phy *phy_get(struct device_d *dev, const char *string)
return ERR_PTR(-EINVAL);
}
- if (dev->device_node) {
- index = of_property_match_string(dev->device_node, "phy-names",
- string);
- phy = _of_phy_get(dev->device_node, index);
+ if (dev->of_node) {
+ index = of_property_match_string(dev->of_node, "phy-names",
+ string);
+ phy = _of_phy_get(dev->of_node, index);
}
return phy;
@@ -379,8 +379,8 @@ struct phy *phy_optional_get(struct device_d *dev, const char *string)
*/
struct phy *phy_get_by_index(struct device_d *dev, int index)
{
- if (!dev->device_node)
+ if (!dev->of_node)
return ERR_PTR(-ENODEV);
- return _of_phy_get(dev->device_node, index);
+ return _of_phy_get(dev->of_node, index);
}
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c
index 2fa1f0fd01..93547243b8 100644
--- a/drivers/phy/phy-stm32-usbphyc.c
+++ b/drivers/phy/phy-stm32-usbphyc.c
@@ -315,7 +315,7 @@ static struct phy *stm32_usbphyc_of_xlate(struct device_d *dev,
int port = 0;
for (port = 0; port < usbphyc->nphys; port++) {
- if (phynode == usbphyc->phys[port]->phy->dev.device_node) {
+ if (phynode == usbphyc->phys[port]->phy->dev.of_node) {
usbphyc_phy = usbphyc->phys[port];
break;
}
@@ -351,7 +351,7 @@ static struct phy *stm32_usbphyc_of_xlate(struct device_d *dev,
static int stm32_usbphyc_probe(struct device_d *dev)
{
struct stm32_usbphyc *usbphyc;
- struct device_node *child, *np = dev->device_node;
+ struct device_node *child, *np = dev->of_node;
struct resource *iores;
struct phy_provider *phy_provider;
u32 pllen, version;
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 459ad9b355..f20477cd67 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -267,7 +267,7 @@ static struct phy *rockchip_usb2phy_of_xlate(struct device_d *dev,
if (!rphy->phys[port].phy)
continue;
- if (phynode == rphy->phys[port].phy->dev.device_node) {
+ if (phynode == rphy->phys[port].phy->dev.of_node) {
p = &rphy->phys[port];
return p->phy;
}
@@ -338,7 +338,7 @@ static const struct clk_ops rockchip_usb2phy_clkout_ops = {
static int rockchip_usb2phy_clk480m_register(struct rockchip_usb2phy *rphy)
{
- struct device_node *node = rphy->dev->device_node;
+ struct device_node *node = rphy->dev->of_node;
struct clk_init_data init = {};
const char *clk_name;
int ret;
@@ -385,7 +385,7 @@ static int rockchip_usb2phy_probe(struct device_d *dev)
struct rockchip_usb2phy *rphy;
u32 reg, index;
int ret, port = 0;
- struct device_node *child, *np = dev->device_node;
+ struct device_node *child, *np = dev->of_node;
struct resource *iores;
rphy = xzalloc(sizeof(*rphy));
@@ -396,7 +396,7 @@ static int rockchip_usb2phy_probe(struct device_d *dev)
of_device_is_compatible(np, "rockchip,rk3568-usb2phy"))
rphy->grf_base = syscon_regmap_lookup_by_phandle(np, "rockchip,usbgrf");
else
- rphy->grf_base = syscon_node_to_regmap(dev->parent->device_node);
+ rphy->grf_base = syscon_node_to_regmap(dev->parent->of_node);
if (IS_ERR(rphy->grf_base))
return PTR_ERR(rphy->grf_base);
diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
index 2d86d86334..4d0fec6e7a 100644
--- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
+++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
@@ -287,7 +287,7 @@ static struct phy *rockchip_combphy_xlate(struct device_d *dev,
static int rockchip_combphy_parse_dt(struct device_d *dev,
struct rockchip_combphy_priv *priv)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
const struct rockchip_combphy_cfg *phy_cfg = priv->cfg;
int ret, mac_id;
@@ -386,7 +386,7 @@ static int rockchip_combphy_probe(struct device_d *dev)
static int rk3568_combphy_cfg(struct rockchip_combphy_priv *priv)
{
- struct device_node *np = priv->dev->device_node;
+ struct device_node *np = priv->dev->of_node;
const struct rockchip_combphy_grfcfg *cfg = priv->cfg->grfcfg;
struct clk *refclk = NULL;
unsigned long rate;
diff --git a/drivers/phy/usb-nop-xceiv.c b/drivers/phy/usb-nop-xceiv.c
index 06a1ff9791..86849120b8 100644
--- a/drivers/phy/usb-nop-xceiv.c
+++ b/drivers/phy/usb-nop-xceiv.c
@@ -80,7 +80,7 @@ static int nop_usbphy_probe(struct device_d *dev)
if (IS_ERR(nopphy->clk))
nopphy->clk = NULL;
- nopphy->reset = of_get_named_gpio_flags(dev->device_node,
+ nopphy->reset = of_get_named_gpio_flags(dev->of_node,
"reset-gpios", 0, &of_flags);
if (gpio_is_valid(nopphy->reset)) {
/* assert reset */
diff --git a/drivers/pinctrl/imx-iomux-v1.c b/drivers/pinctrl/imx-iomux-v1.c
index c82d716e1c..c276f51cb3 100644
--- a/drivers/pinctrl/imx-iomux-v1.c
+++ b/drivers/pinctrl/imx-iomux-v1.c
@@ -279,9 +279,9 @@ static int imx_iomux_v1_probe(struct device_d *dev)
if (IS_ERR(base))
return PTR_ERR(base);
- ret = of_platform_populate(dev->device_node, NULL, NULL);
+ ret = of_platform_populate(dev->of_node, NULL, NULL);
- if (IS_ENABLED(CONFIG_PINCTRL) && dev->device_node)
+ if (IS_ENABLED(CONFIG_PINCTRL) && dev->of_node)
ret = imx_pinctrl_dt(dev, base);
return ret;
diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c
index ecadff5e82..e09934fe85 100644
--- a/drivers/pinctrl/imx-iomux-v3.c
+++ b/drivers/pinctrl/imx-iomux-v3.c
@@ -198,7 +198,7 @@ static int imx_iomux_v3_probe(struct device_d *dev)
*/
iomuxv3_base = base;
- if (IS_ENABLED(CONFIG_PINCTRL) && dev->device_node)
+ if (IS_ENABLED(CONFIG_PINCTRL) && dev->of_node)
ret = imx_pinctrl_dt(dev, base);
return ret;
diff --git a/drivers/pinctrl/mvebu/armada-370.c b/drivers/pinctrl/mvebu/armada-370.c
index 8b574b89b9..23000986ff 100644
--- a/drivers/pinctrl/mvebu/armada-370.c
+++ b/drivers/pinctrl/mvebu/armada-370.c
@@ -389,7 +389,7 @@ static int armada_370_pinctrl_probe(struct device_d *dev)
{
struct resource *iores;
const struct of_device_id *match =
- of_match_node(armada_370_pinctrl_of_match, dev->device_node);
+ of_match_node(armada_370_pinctrl_of_match, dev->of_node);
struct mvebu_pinctrl_soc_info *soc =
(struct mvebu_pinctrl_soc_info *)match->data;
diff --git a/drivers/pinctrl/mvebu/armada-xp.c b/drivers/pinctrl/mvebu/armada-xp.c
index 31286c59ee..f0761c4d3d 100644
--- a/drivers/pinctrl/mvebu/armada-xp.c
+++ b/drivers/pinctrl/mvebu/armada-xp.c
@@ -371,7 +371,7 @@ static int armada_xp_pinctrl_probe(struct device_d *dev)
{
struct resource *iores;
const struct of_device_id *match =
- of_match_node(armada_xp_pinctrl_of_match, dev->device_node);
+ of_match_node(armada_xp_pinctrl_of_match, dev->of_node);
struct mvebu_pinctrl_soc_info *soc = &armada_xp_pinctrl_info;
iores = dev_request_mem_resource(dev, 0);
diff --git a/drivers/pinctrl/mvebu/dove.c b/drivers/pinctrl/mvebu/dove.c
index 49553f1b28..5177abed3b 100644
--- a/drivers/pinctrl/mvebu/dove.c
+++ b/drivers/pinctrl/mvebu/dove.c
@@ -694,7 +694,7 @@ static int dove_pinctrl_probe(struct device_d *dev)
{
struct resource *iores;
const struct of_device_id *match =
- of_match_node(dove_pinctrl_of_match, dev->device_node);
+ of_match_node(dove_pinctrl_of_match, dev->of_node);
struct mvebu_pinctrl_soc_info *soc =
(struct mvebu_pinctrl_soc_info *)match->data;
struct device_node *np;
diff --git a/drivers/pinctrl/mvebu/kirkwood.c b/drivers/pinctrl/mvebu/kirkwood.c
index 1df51e443d..bceb561c5f 100644
--- a/drivers/pinctrl/mvebu/kirkwood.c
+++ b/drivers/pinctrl/mvebu/kirkwood.c
@@ -430,7 +430,7 @@ static int kirkwood_pinctrl_probe(struct device_d *dev)
{
struct resource *iores;
const struct of_device_id *match =
- of_match_node(kirkwood_pinctrl_of_match, dev->device_node);
+ of_match_node(kirkwood_pinctrl_of_match, dev->of_node);
struct mvebu_pinctrl_soc_info *soc =
(struct mvebu_pinctrl_soc_info *)match->data;
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index c1eb4518dc..afe74a12c0 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -271,7 +271,7 @@ static struct pinctrl_ops pinctrl_at91_pio4_ops = {
static int pinctrl_at91_pio4_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct pinctrl_at91_pio4 *pinctrl;
struct resource *io;
int ret;
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 0295d928cf..1551b0eda9 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -376,9 +376,9 @@ static struct at91_pinctrl_mux_ops *at91_pinctrl_get_driver_data(struct device_d
struct at91_pinctrl_mux_ops *ops_data = NULL;
int rc;
- if (dev->device_node) {
+ if (dev->of_node) {
const struct of_device_id *match;
- match = of_match_node(at91_pinctrl_dt_ids, dev->device_node);
+ match = of_match_node(at91_pinctrl_dt_ids, dev->of_node);
if (!match)
ops_data = NULL;
else
@@ -623,8 +623,8 @@ static int at91_gpio_probe(struct device_d *dev)
int ret;
int alias_idx;
- if (dev->device_node)
- alias_idx = of_alias_get_id(dev->device_node, "gpio");
+ if (dev->of_node)
+ alias_idx = of_alias_get_id(dev->of_node, "gpio");
else
alias_idx = dev->id;
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index c99074407f..bd780399fe 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -333,7 +333,7 @@ static int rockchip_gpio_probe(struct device_d *dev)
void __iomem *reg_base;
int ret, bankno;
- bankno = of_alias_get_id(dev->device_node, "gpio");
+ bankno = of_alias_get_id(dev->of_node, "gpio");
if (bankno >= ctrl->nr_banks)
bankno = -EINVAL;
if (bankno < 0)
@@ -873,7 +873,7 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data(
struct rockchip_pinctrl *d, struct device_d *dev)
{
const struct of_device_id *match;
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
struct device_node *np;
struct rockchip_pin_ctrl *ctrl;
struct rockchip_pin_bank *bank;
@@ -1010,14 +1010,14 @@ static int rockchip_pinctrl_probe(struct device_d *dev)
}
info->ctrl = ctrl;
- info->reg_base = syscon_base_lookup_by_phandle(dev->device_node,
+ info->reg_base = syscon_base_lookup_by_phandle(dev->of_node,
"rockchip,grf");
if (IS_ERR(info->reg_base)) {
dev_err(dev, "Could not get grf syscon address\n");
return -ENODEV;
}
- info->reg_pmu = syscon_base_lookup_by_phandle(dev->device_node,
+ info->reg_pmu = syscon_base_lookup_by_phandle(dev->of_node,
"rockchip,pmu");
if (IS_ERR(info->reg_pmu)) {
dev_err(dev, "Could not get pmu syscon address\n");
@@ -1029,7 +1029,7 @@ static int rockchip_pinctrl_probe(struct device_d *dev)
dev->priv = info;
- of_platform_populate(dev->device_node, NULL, dev);
+ of_platform_populate(dev->of_node, NULL, dev);
if (!IS_ENABLED(CONFIG_PINCTRL))
return 0;
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index edf2d046f0..f45948a447 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -123,7 +123,7 @@ int pinctrl_single_probe(struct device_d *dev)
{
struct resource *iores;
struct pinctrl_single *pcs;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
int ret = 0;
pcs = xzalloc(sizeof(*pcs));
diff --git a/drivers/pinctrl/pinctrl-stm32.c b/drivers/pinctrl/pinctrl-stm32.c
index fc0cc78f43..deaec56b16 100644
--- a/drivers/pinctrl/pinctrl-stm32.c
+++ b/drivers/pinctrl/pinctrl-stm32.c
@@ -344,7 +344,7 @@ static int stm32_pinctrl_probe(struct device_d *dev)
struct stm32_pinctrl *pinctrl;
unsigned nbanks = 0;
struct stm32_gpio_bank *gpio_bank;
- struct device_node *np = dev->device_node, *child;
+ struct device_node *np = dev->of_node, *child;
int ret;
if (!of_find_property(np, "pins-are-numbered", NULL)) {
diff --git a/drivers/pinctrl/pinctrl-tegra20.c b/drivers/pinctrl/pinctrl-tegra20.c
index 04431e3875..53254d073e 100644
--- a/drivers/pinctrl/pinctrl-tegra20.c
+++ b/drivers/pinctrl/pinctrl-tegra20.c
@@ -316,7 +316,7 @@ static int pinctrl_tegra20_probe(struct device_d *dev)
return ret;
}
- of_pinctrl_select_state(dev->device_node, "boot");
+ of_pinctrl_select_state(dev->of_node, "boot");
return 0;
}
diff --git a/drivers/pinctrl/pinctrl-tegra30.c b/drivers/pinctrl/pinctrl-tegra30.c
index 78751f9f39..71c0a1357d 100644
--- a/drivers/pinctrl/pinctrl-tegra30.c
+++ b/drivers/pinctrl/pinctrl-tegra30.c
@@ -893,7 +893,7 @@ static int pinctrl_tegra30_probe(struct device_d *dev)
return ret;
}
- of_pinctrl_select_state(dev->device_node, "boot");
+ of_pinctrl_select_state(dev->of_node, "boot");
return 0;
}
diff --git a/drivers/pinctrl/pinctrl.c b/drivers/pinctrl/pinctrl.c
index 423040ecf3..a441adaf08 100644
--- a/drivers/pinctrl/pinctrl.c
+++ b/drivers/pinctrl/pinctrl.c
@@ -165,7 +165,7 @@ int pinctrl_select_state(struct device_d *dev, const char *name)
{
struct device_node *np;
- np = dev->device_node;
+ np = dev->of_node;
if (!np)
return 0;
@@ -182,11 +182,11 @@ int pinctrl_register(struct pinctrl_device *pdev)
if (!IS_ENABLED(CONFIG_PINCTRL))
return -ENOSYS;
- BUG_ON(!pdev->dev->device_node);
+ BUG_ON(!pdev->dev->of_node);
list_add_tail(&pdev->list, &pinctrl_list);
- pdev->node = pdev->dev->device_node;
+ pdev->node = pdev->dev->of_node;
pinctrl_select_state_default(pdev->dev);
diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
index 45b0d274e7..0cda8ceef6 100644
--- a/drivers/power/reset/gpio-poweroff.c
+++ b/drivers/power/reset/gpio-poweroff.c
@@ -45,7 +45,7 @@ static struct poweroff_handler handler;
static int gpio_poweroff_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
bool input = false;
enum gpiod_flags flags;
diff --git a/drivers/power/reset/gpio-restart.c b/drivers/power/reset/gpio-restart.c
index 72c690a3cf..65a4407a7d 100644
--- a/drivers/power/reset/gpio-restart.c
+++ b/drivers/power/reset/gpio-restart.c
@@ -45,7 +45,7 @@ static void __noreturn gpio_restart_handle(struct restart_handler *this)
static int gpio_restart_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct gpio_restart *gpio_restart;
bool open_source = false;
u32 property;
@@ -71,7 +71,7 @@ static int gpio_restart_probe(struct device_d *dev)
gpio_restart->inactive_delay_ms = 100;
gpio_restart->wait_delay_ms = 3000;
- ret = of_property_read_u32(dev->device_node, "priority", &property);
+ ret = of_property_read_u32(dev->of_node, "priority", &property);
if (!ret)
gpio_restart->restart_handler.priority = property;
diff --git a/drivers/power/reset/reboot-mode.c b/drivers/power/reset/reboot-mode.c
index 5761128f8e..70be774be0 100644
--- a/drivers/power/reset/reboot-mode.c
+++ b/drivers/power/reset/reboot-mode.c
@@ -53,7 +53,7 @@ static int of_reboot_mode_fixup(struct device_node *root, void *ctx)
struct reboot_mode_driver *reboot = ctx;
struct device_node *dstnp, *srcnp, *dstparent;
- srcnp = reboot->dev->device_node;
+ srcnp = reboot->dev->of_node;
dstnp = of_get_node_by_reproducible_name(root, srcnp);
if (dstnp) {
@@ -120,7 +120,7 @@ int reboot_mode_register(struct reboot_mode_driver *reboot,
const u32 *reboot_mode, size_t nelems)
{
struct property *prop;
- struct device_node *np = reboot->dev->device_node;
+ struct device_node *np = reboot->dev->of_node;
const char *alias;
size_t nmodes = 0;
int i = 0;
diff --git a/drivers/power/reset/syscon-poweroff.c b/drivers/power/reset/syscon-poweroff.c
index 3664c4d8bd..239e549819 100644
--- a/drivers/power/reset/syscon-poweroff.c
+++ b/drivers/power/reset/syscon-poweroff.c
@@ -30,19 +30,19 @@ static int syscon_poweroff_probe(struct device_d *dev)
{
int mask_err, value_err;
- map = syscon_regmap_lookup_by_phandle(dev->device_node, "regmap");
+ map = syscon_regmap_lookup_by_phandle(dev->of_node, "regmap");
if (IS_ERR(map)) {
dev_err(dev, "unable to get syscon");
return PTR_ERR(map);
}
- if (of_property_read_u32(dev->device_node, "offset", &offset)) {
+ if (of_property_read_u32(dev->of_node, "offset", &offset)) {
dev_err(dev, "unable to read 'offset'");
return -EINVAL;
}
- value_err = of_property_read_u32(dev->device_node, "value", &value);
- mask_err = of_property_read_u32(dev->device_node, "mask", &mask);
+ value_err = of_property_read_u32(dev->of_node, "value", &value);
+ mask_err = of_property_read_u32(dev->of_node, "mask", &mask);
if (value_err && mask_err) {
dev_err(dev, "unable to read 'value' and 'mask'");
return -EINVAL;
diff --git a/drivers/power/reset/syscon-reboot-mode.c b/drivers/power/reset/syscon-reboot-mode.c
index 0cbc9d0803..69530a409e 100644
--- a/drivers/power/reset/syscon-reboot-mode.c
+++ b/drivers/power/reset/syscon-reboot-mode.c
@@ -51,7 +51,7 @@ static int syscon_reboot_mode_probe(struct device_d *dev)
int ret, i, nelems;
struct syscon_reboot_mode *syscon_rbm;
struct reboot_mode_driver *reboot_template;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
u32 *magic;
nelems = of_property_count_elems_of_size(np, "offset", sizeof(__be32));
@@ -67,7 +67,7 @@ static int syscon_reboot_mode_probe(struct device_d *dev)
syscon_rbm->reboot = *reboot_template;
syscon_rbm->reboot.dev = dev;
- syscon_rbm->map = syscon_node_to_regmap(dev->parent->device_node);
+ syscon_rbm->map = syscon_node_to_regmap(dev->parent->of_node);
if (IS_ERR(syscon_rbm->map))
return PTR_ERR(syscon_rbm->map);
diff --git a/drivers/power/reset/syscon-reboot.c b/drivers/power/reset/syscon-reboot.c
index b6b8db75ca..1c3f7666ee 100644
--- a/drivers/power/reset/syscon-reboot.c
+++ b/drivers/power/reset/syscon-reboot.c
@@ -42,18 +42,18 @@ static int syscon_reboot_probe(struct device_d *dev)
if (!ctx)
return -ENOMEM;
- ctx->map = syscon_regmap_lookup_by_phandle(dev->device_node, "regmap");
+ ctx->map = syscon_regmap_lookup_by_phandle(dev->of_node, "regmap");
if (IS_ERR(ctx->map)) {
- ctx->map = syscon_node_to_regmap(dev->parent->device_node);
+ ctx->map = syscon_node_to_regmap(dev->parent->of_node);
if (IS_ERR(ctx->map))
return PTR_ERR(ctx->map);
}
- if (of_property_read_u32(dev->device_node, "offset", &ctx->offset))
+ if (of_property_read_u32(dev->of_node, "offset", &ctx->offset))
return -EINVAL;
- value_err = of_property_read_u32(dev->device_node, "value", &ctx->value);
- mask_err = of_property_read_u32(dev->device_node, "mask", &ctx->mask);
+ value_err = of_property_read_u32(dev->of_node, "value", &ctx->value);
+ mask_err = of_property_read_u32(dev->of_node, "mask", &ctx->mask);
if (value_err && mask_err) {
dev_err(dev, "unable to read 'value' and 'mask'");
return -EINVAL;
@@ -71,7 +71,7 @@ static int syscon_reboot_probe(struct device_d *dev)
ctx->restart_handler.name = "syscon-reboot";
ctx->restart_handler.restart = syscon_restart_handle;
ctx->restart_handler.priority = 192;
- ctx->restart_handler.of_node = dev->device_node;
+ ctx->restart_handler.of_node = dev->of_node;
err = restart_handler_register(&ctx->restart_handler);
if (err)
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index aba6c2a709..e61050050c 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -194,7 +194,7 @@ static struct pwm_device *of_node_to_pwm_device(struct device_node *np, int id)
struct pwm_device *pwm;
list_for_each_entry(pwm, &pwm_list, node) {
- if (pwm->hwdev && pwm->hwdev->device_node == np &&
+ if (pwm->hwdev && pwm->hwdev->of_node == np &&
pwm->chip->id == id)
return pwm;
}
diff --git a/drivers/pwm/pwm-atmel.c b/drivers/pwm/pwm-atmel.c
index 9ec81e18b1..21d07913ce 100644
--- a/drivers/pwm/pwm-atmel.c
+++ b/drivers/pwm/pwm-atmel.c
@@ -438,7 +438,7 @@ static int atmel_pwm_probe(struct device_d *dev)
return PTR_ERR(iores);
atmel_pwm->base = IOMEM(iores->start);
- alias = of_alias_get(dev->device_node);
+ alias = of_alias_get(dev->of_node);
if (!alias)
id++;
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index c542b72796..d6ddcc28a2 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -224,8 +224,8 @@ static int imx_pwm_probe(struct device_d *dev)
imx->mmio_base = IOMEM(iores->start);
imx->chip.ops = &imx_pwm_ops;
- if (dev->device_node) {
- imx->chip.devname = of_alias_get(dev->device_node);
+ if (dev->of_node) {
+ imx->chip.devname = of_alias_get(dev->of_node);
if (!imx->chip.devname)
imx->chip.devname = basprintf("pwm_%p",
imx->mmio_base);
diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
index 8f77ca07a6..007ff1cfee 100644
--- a/drivers/pwm/pwm-mxs.c
+++ b/drivers/pwm/pwm-mxs.c
@@ -96,7 +96,7 @@ static struct pwm_ops mxs_pwm_ops = {
static int mxs_pwm_probe(struct device_d *dev)
{
struct resource *iores;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct mxs_pwm *mxs;
int ret, i;
uint32_t npwm;
diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c
index 4e1a65207e..69baa88753 100644
--- a/drivers/pwm/pwm-stm32.c
+++ b/drivers/pwm/pwm-stm32.c
@@ -337,7 +337,7 @@ static int id = -1;
static int stm32_pwm_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct stm32_timers *ddata = dev->parent->priv;
struct stm32_pwm *priv;
const char *alias;
@@ -362,7 +362,7 @@ static int stm32_pwm_probe(struct device_d *dev)
npwms = stm32_pwm_detect_channels(priv);
- alias = of_alias_get(dev->device_node);
+ alias = of_alias_get(dev->of_node);
if (!alias)
id++;
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 3f8473ec07..6d54129523 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -35,7 +35,7 @@ static struct regulator_ops anatop_rops = {
static int anatop_regulator_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct device_node *anatop_np;
struct regulator_desc *rdesc;
struct regulator_dev *rdev;
@@ -131,7 +131,7 @@ static int anatop_regulator_probe(struct device_d *dev)
}
}
- return of_regulator_register(rdev, dev->device_node);
+ return of_regulator_register(rdev, dev->of_node);
}
static const struct of_device_id of_anatop_regulator_match_tbl[] = {
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index d25aba38c3..d25aea8d62 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -255,7 +255,7 @@ static struct regulator_internal *of_regulator_get(struct device_d *dev, const c
/*
* If the device does have a device node return the dummy regulator.
*/
- if (!dev->device_node)
+ if (!dev->of_node)
return NULL;
propname = basprintf("%s-supply", supply);
@@ -264,7 +264,7 @@ static struct regulator_internal *of_regulator_get(struct device_d *dev, const c
* If the device node does not contain a supply property, this device doesn't
* need a regulator. Return the dummy regulator in this case.
*/
- if (!of_get_property(dev->device_node, propname, NULL)) {
+ if (!of_get_property(dev->of_node, propname, NULL)) {
dev_dbg(dev, "No %s-supply node found, using dummy regulator\n",
supply);
ri = NULL;
@@ -275,7 +275,7 @@ static struct regulator_internal *of_regulator_get(struct device_d *dev, const c
* The device node specifies a supply, so it's mandatory. Return an error when
* something goes wrong below.
*/
- node = of_parse_phandle(dev->device_node, propname, 0);
+ node = of_parse_phandle(dev->of_node, propname, 0);
if (!node) {
dev_dbg(dev, "No %s node found\n", propname);
ri = ERR_PTR(-EINVAL);
@@ -388,7 +388,7 @@ struct regulator *regulator_get(struct device_d *dev, const char *supply)
struct regulator *r;
int ret;
- if (dev->device_node && supply) {
+ if (dev->of_node && supply) {
ri = of_regulator_get(dev, supply);
if (IS_ERR(ri))
return ERR_CAST(ri);
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index bdb01c0a95..65b0fba2fe 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -46,12 +46,12 @@ const static struct regulator_ops fixed_ops = {
static int regulator_fixed_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct regulator_fixed *fix;
u32 delay;
int ret;
- if (!dev->device_node)
+ if (!dev->of_node)
return -EINVAL;
fix = xzalloc(sizeof(*fix));
diff --git a/drivers/regulator/pfuze.c b/drivers/regulator/pfuze.c
index 5ef5dacc6f..d9450711e3 100644
--- a/drivers/regulator/pfuze.c
+++ b/drivers/regulator/pfuze.c
@@ -165,7 +165,7 @@ static int __init pfuze_probe(struct device_d *dev)
if (pfuze_init_callback)
pfuze_init_callback(pfuze_dev->map);
- if (of_property_read_bool(dev->device_node,
+ if (of_property_read_bool(dev->of_node,
"fsl,pmic-stby-poweroff"))
return poweroff_handler_register_fn(pfuze_power_off_prepare);
diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c
index f8bc31f354..e0e06acad4 100644
--- a/drivers/regulator/rk808-regulator.c
+++ b/drivers/regulator/rk808-regulator.c
@@ -889,7 +889,7 @@ static int rk808_regulator_dt_parse(struct device_d *dev,
struct of_regulator_match *matches,
int nregulators)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
np = of_get_child_by_name(np, "regulators");
if (!np)
diff --git a/drivers/regulator/scmi-regulator.c b/drivers/regulator/scmi-regulator.c
index 3e6fd3ec60..5bab296102 100644
--- a/drivers/regulator/scmi-regulator.c
+++ b/drivers/regulator/scmi-regulator.c
@@ -335,7 +335,7 @@ static int scmi_regulator_probe(struct scmi_device *sdev)
* plausible SCMI Voltage Domain number, all belonging to this SCMI
* platform instance node (handle->dev->of_node).
*/
- np = of_find_node_by_name(handle->dev->device_node, "regulators");
+ np = of_find_node_by_name(handle->dev->of_node, "regulators");
for_each_child_of_node(np, child) {
ret = process_scmi_regulator_of_node(sdev, ph, child, rinfo);
/* abort on any mem issue */
diff --git a/drivers/regulator/stm32-pwr.c b/drivers/regulator/stm32-pwr.c
index 8cb0b0c12e..ac738b4ee9 100644
--- a/drivers/regulator/stm32-pwr.c
+++ b/drivers/regulator/stm32-pwr.c
@@ -152,7 +152,7 @@ static int stm32_pwr_regulator_probe(struct device_d *dev)
if (IS_ERR(iores))
return PTR_ERR(iores);
- for_each_child_of_node(dev->device_node, child) {
+ for_each_child_of_node(dev->of_node, child) {
const struct stm32_pwr_desc *desc = NULL;
for (i = 0; i < STM32PWR_REG_NUM_REGS; i++) {
diff --git a/drivers/regulator/stm32-vrefbuf.c b/drivers/regulator/stm32-vrefbuf.c
index 77287c2b0e..80733fed3d 100644
--- a/drivers/regulator/stm32-vrefbuf.c
+++ b/drivers/regulator/stm32-vrefbuf.c
@@ -173,7 +173,7 @@ static int stm32_vrefbuf_probe(struct device_d *dev)
rdev->dev = dev;
rdev->desc = &stm32_vrefbuf_regu.desc;
- ret = of_regulator_register(rdev, dev->device_node);
+ ret = of_regulator_register(rdev, dev->of_node);
if (ret) {
ret = PTR_ERR(rdev);
dev_err(dev, "register failed with error %d\n", ret);
diff --git a/drivers/regulator/stpmic1_regulator.c b/drivers/regulator/stpmic1_regulator.c
index 63ed4468ed..ee4abb5b81 100644
--- a/drivers/regulator/stpmic1_regulator.c
+++ b/drivers/regulator/stpmic1_regulator.c
@@ -408,7 +408,7 @@ static int stpmic1_regulator_probe(struct device_d *dev)
{
int i, ret;
- ret = of_regulator_match(dev, dev->device_node, stpmic1_matches,
+ ret = of_regulator_match(dev, dev->of_node, stpmic1_matches,
ARRAY_SIZE(stpmic1_matches));
if (ret < 0) {
dev_err(dev, "Error in PMIC regulator device tree node");
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index ff74adb112..5e575bac5c 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -387,7 +387,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
struct device_d *dev)
{
const struct imx_rproc_dcfg *dcfg = priv->dcfg;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
int a, b = 0, err, nph;
/* remap required addresses */
@@ -451,7 +451,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
static int imx_rproc_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct imx_rproc *priv;
struct rproc *rproc;
const struct imx_rproc_dcfg *dcfg;
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index a81787bc6c..8dff3c72ae 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -127,8 +127,8 @@ int rproc_add(struct rproc *rproc)
const char *alias = NULL;
int ret;
- if (dev->device_node)
- alias = of_alias_get(dev->device_node);
+ if (dev->of_node)
+ alias = of_alias_get(dev->of_node);
ret = rproc_register_dev(rproc, alias);
if (ret)
diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index d29b59bcdc..fbbc7dff89 100644
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -40,7 +40,7 @@ static void *stm32_rproc_da_to_va(struct rproc *rproc, u64 da, int len)
struct device_d *dev = &rproc->dev;
u64 paddr;
- paddr = of_translate_dma_address(dev->parent->device_node, &in_addr);
+ paddr = of_translate_dma_address(dev->parent->of_node, &in_addr);
if (paddr == OF_BAD_ADDR)
return NULL;
@@ -130,7 +130,7 @@ out:
static int stm32_rproc_parse_dt(struct device_d *dev, struct stm32_rproc *ddata)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct stm32_syscon tz;
unsigned int tzen;
int err;
diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index b252f94d6e..fe9a6ea7cf 100644
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -164,7 +164,8 @@ EXPORT_SYMBOL_GPL(reset_control_deassert);
*/
int reset_control_get_count(struct device_d *dev)
{
- return of_count_phandle_with_args(dev->device_node, "resets", "#reset-cells");
+ return of_count_phandle_with_args(dev->of_node, "resets",
+ "#reset-cells");
}
/**
@@ -255,10 +256,10 @@ gpio_reset_control_get(struct device_d *dev, const char *id)
if (id)
return ERR_PTR(-EINVAL);
- if (!of_get_property(dev->device_node, "reset-gpios", NULL))
+ if (!of_get_property(dev->of_node, "reset-gpios", NULL))
return NULL;
- gpio = of_get_named_gpio_flags(dev->device_node, "reset-gpios", 0, &flags);
+ gpio = of_get_named_gpio_flags(dev->of_node, "reset-gpios", 0, &flags);
if (gpio < 0)
return ERR_PTR(gpio);
@@ -285,7 +286,7 @@ struct reset_control *reset_control_get(struct device_d *dev, const char *id)
if (!dev)
return ERR_PTR(-EINVAL);
- rstc = of_reset_control_get(dev->device_node, id);
+ rstc = of_reset_control_get(dev->of_node, id);
if (IS_ERR(rstc))
return ERR_CAST(rstc);
@@ -360,7 +361,7 @@ int device_reset_all(struct device_d *dev)
for (i = 0; i < reset_control_get_count(dev); i++) {
int ret;
- rstc = of_reset_control_get_by_index(dev->device_node, i);
+ rstc = of_reset_control_get_by_index(dev->of_node, i);
if (IS_ERR(rstc))
return PTR_ERR(rstc);
diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
index 1591ace2cd..23d371f0c5 100644
--- a/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@ -260,7 +260,7 @@ static int imx7_reset_probe(struct device_d *dev)
imx7src = xzalloc(sizeof(*imx7src));
imx7src->signals = variant->signals;
- imx7src->regmap = syscon_node_to_regmap(dev->device_node);
+ imx7src->regmap = syscon_node_to_regmap(dev->of_node);
if (IS_ERR(imx7src->regmap)) {
dev_err(dev, "Unable to get imx7-src regmap");
return PTR_ERR(imx7src->regmap);
@@ -268,7 +268,7 @@ static int imx7_reset_probe(struct device_d *dev)
imx7src->rcdev.nr_resets = variant->signals_num;
imx7src->rcdev.ops = &variant->ops;
- imx7src->rcdev.of_node = dev->device_node;
+ imx7src->rcdev.of_node = dev->of_node;
return reset_controller_register(&imx7src->rcdev);
}
diff --git a/drivers/reset/reset-scmi.c b/drivers/reset/reset-scmi.c
index c33bbc5c8a..5f8473690d 100644
--- a/drivers/reset/reset-scmi.c
+++ b/drivers/reset/reset-scmi.c
@@ -90,7 +90,7 @@ static int scmi_reset_probe(struct scmi_device *sdev)
{
struct scmi_reset_data *data;
struct device_d *dev = &sdev->dev;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
const struct scmi_handle *handle = sdev->handle;
struct scmi_protocol_handle *ph;
diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c
index 9db00f64f4..0f3f6a53fe 100644
--- a/drivers/reset/reset-simple.c
+++ b/drivers/reset/reset-simple.c
@@ -167,7 +167,7 @@ static int reset_simple_probe(struct device_d *dev)
data->membase = IOMEM(res->start);
data->rcdev.nr_resets = resource_size(res) * BITS_PER_BYTE;
data->rcdev.ops = &reset_simple_ops;
- data->rcdev.of_node = dev->device_node;
+ data->rcdev.of_node = dev->of_node;
if (devdata) {
reg_offset = devdata->reg_offset;
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 146cc92eb3..c33e4d3c51 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -78,7 +78,7 @@ static int socfpga_reset_probe(struct device_d *dev)
{
struct socfpga_reset_data *data;
struct resource *res;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
u32 modrst_offset;
data = xzalloc(sizeof(*data));
diff --git a/drivers/reset/reset-starfive-vic.c b/drivers/reset/reset-starfive-vic.c
index 960e82e824..01765b00d0 100644
--- a/drivers/reset/reset-starfive-vic.c
+++ b/drivers/reset/reset-starfive-vic.c
@@ -216,7 +216,7 @@ static int starfive_rstgen_probe(struct device_d *dev)
priv->base = IOMEM(iores->start);
priv->rcdev.nr_resets = RSTN_END;
priv->rcdev.ops = &starfive_rstgen_ops;
- priv->rcdev.of_node = dev->device_node;
+ priv->rcdev.of_node = dev->of_node;
return reset_controller_register(&priv->rcdev);
}
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 314d794f11..680611fea7 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -288,7 +288,7 @@ static int ds1307_probe(struct device_d *dev)
int tmp;
unsigned char *buf;
unsigned long driver_data;
- const struct device_node *np = dev->device_node;
+ const struct device_node *np = dev->of_node;
ds1307 = xzalloc(sizeof(struct ds1307));
diff --git a/drivers/serial/serial_clps711x.c b/drivers/serial/serial_clps711x.c
index 81eb85429e..a348c625f3 100644
--- a/drivers/serial/serial_clps711x.c
+++ b/drivers/serial/serial_clps711x.c
@@ -148,7 +148,7 @@ static int clps711x_probe(struct device_d *dev)
goto out_err;
}
- syscon = of_parse_phandle(dev->device_node, "syscon", 0);
+ syscon = of_parse_phandle(dev->of_node, "syscon", 0);
s->regmap = syscon_node_to_regmap(syscon);
if (IS_ERR(s->regmap)) {
err = PTR_ERR(s->regmap);
@@ -164,7 +164,7 @@ static int clps711x_probe(struct device_d *dev)
s->cdev.setbrg = clps711x_setbaudrate;
s->cdev.linux_console_name = "ttyCL";
- devname = of_alias_get(dev->device_node);
+ devname = of_alias_get(dev->of_node);
if (devname) {
s->cdev.devname = xstrdup(devname);
s->cdev.devid = DEVICE_ID_SINGLE;
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index cf9c3f02a7..225049e52a 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -236,19 +236,19 @@ static int imx_serial_probe(struct device_d *dev)
cdev->linux_console_name = "ttymxc";
cdev->linux_earlycon_name = "ec_imx6q";
cdev->phys_base = priv->regs;
- if (dev->device_node) {
- devname = of_alias_get(dev->device_node);
+ if (dev->of_node) {
+ devname = of_alias_get(dev->of_node);
if (devname) {
cdev->devname = xstrdup(devname);
cdev->devid = DEVICE_ID_SINGLE;
}
}
- if (of_property_read_bool(dev->device_node, "fsl,dte-mode"))
+ if (of_property_read_bool(dev->of_node, "fsl,dte-mode"))
priv->dte_mode = 1;
- if (of_property_read_bool(dev->device_node, "linux,rs485-enabled-at-boot-time") &&
- !of_property_read_bool(dev->device_node, "rs485-rts-active-low"))
+ if (of_property_read_bool(dev->of_node, "linux,rs485-enabled-at-boot-time") &&
+ !of_property_read_bool(dev->of_node, "rs485-rts-active-low"))
priv->rs485_mode = 1;
imx_serial_init_port(cdev);
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 720018c9ac..2f51221a03 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -151,8 +151,8 @@ static int lpuart_serial_probe(struct device_d *dev)
cdev->flush = lpuart_serial_flush;
cdev->setbrg = lpuart_serial_setbaudrate;
- if (dev->device_node) {
- devname = of_alias_get(dev->device_node);
+ if (dev->of_node) {
+ devname = of_alias_get(dev->of_node);
if (devname) {
cdev->devname = xstrdup(devname);
cdev->devid = DEVICE_ID_SINGLE;
diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index 931269f2e3..9257363fd1 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -130,7 +130,8 @@ static int sifive_serial_probe(struct device_d *dev)
} else {
dev_dbg(dev, "failed to get clock. Fallback to device tree.\n");
- ret = of_property_read_u32(dev->device_node, "clock-frequency", &freq);
+ ret = of_property_read_u32(dev->of_node, "clock-frequency",
+ &freq);
if (ret) {
dev_warn(dev, "unknown clock frequency\n");
return ret;
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index f1d4c6de90..f0571f986b 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -186,8 +186,8 @@ static int stm32_serial_probe(struct device_d *dev)
cdev->setbrg = stm32_serial_setbaudrate;
cdev->linux_console_name = "ttySTM";
- if (dev->device_node) {
- devname = of_alias_get(dev->device_node);
+ if (dev->of_node) {
+ devname = of_alias_get(dev->of_node);
if (devname) {
cdev->devname = xstrdup(devname);
cdev->devid = DEVICE_ID_SINGLE;
diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c
index 304f6d81eb..248763db54 100644
--- a/drivers/soc/imx/gpcv2.c
+++ b/drivers/soc/imx/gpcv2.c
@@ -1178,7 +1178,7 @@ static int imx_pgc_domain_probe(struct device_d *dev)
goto out_domain_unmap;
}
- ret = of_genpd_add_provider_simple(domain->dev->device_node,
+ ret = of_genpd_add_provider_simple(domain->dev->of_node,
&domain->genpd);
if (ret) {
dev_err(domain->dev, "Failed to add genpd provider\n");
@@ -1222,7 +1222,7 @@ static int imx_gpcv2_probe(struct device_d *dev)
struct regmap *regmap;
int ret, pass = 0;
- pgc_np = of_get_child_by_name(dev->device_node, "pgc");
+ pgc_np = of_get_child_by_name(dev->of_node, "pgc");
if (!pgc_np) {
dev_err(dev, "No power domains specified in DT\n");
return -EINVAL;
@@ -1277,8 +1277,8 @@ again:
domain->genpd.power_off = imx_pgc_power_down;
pd_dev = xzalloc(sizeof(*pd_dev));
- pd_dev->device_node = np;
- pd_dev->device_node->dev = pd_dev;
+ pd_dev->of_node = np;
+ pd_dev->of_node->dev = pd_dev;
pd_dev->id = domain_index;
pd_dev->parent = dev;
pd_dev->priv = domain;
diff --git a/drivers/soc/kvx/kvx_socinfo.c b/drivers/soc/kvx/kvx_socinfo.c
index 100faae766..9e3a167fc7 100644
--- a/drivers/soc/kvx/kvx_socinfo.c
+++ b/drivers/soc/kvx/kvx_socinfo.c
@@ -125,7 +125,7 @@ static int kvx_socinfo_probe(struct device_d *dev)
{
kvx_soc_info_read_revision();
- return kvx_read_serial(dev->device_node);
+ return kvx_read_serial(dev->of_node);
}
static const struct of_device_id kvx_socinfo_dt_ids[] = {
diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c
index ac5724c0e7..7ff6bd38a2 100644
--- a/drivers/soc/rockchip/io-domain.c
+++ b/drivers/soc/rockchip/io-domain.c
@@ -128,7 +128,7 @@ static const struct of_device_id rockchip_iodomain_match[] = {
static int rockchip_iodomain_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node, *parent;
+ struct device_node *np = dev->of_node, *parent;
struct rockchip_iodomain *iod;
int i, ret = 0;
diff --git a/drivers/sound/gpio-beeper.c b/drivers/sound/gpio-beeper.c
index 300998d607..714bbee3c3 100644
--- a/drivers/sound/gpio-beeper.c
+++ b/drivers/sound/gpio-beeper.c
@@ -24,7 +24,7 @@ static int gpio_beeper_beep(struct sound_card *card, unsigned freq, unsigned dur
static int gpio_beeper_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct gpio_beeper *beeper;
struct sound_card *card;
int gpio;
diff --git a/drivers/sound/pwm-beeper.c b/drivers/sound/pwm-beeper.c
index ef053f97cf..83401f5dad 100644
--- a/drivers/sound/pwm-beeper.c
+++ b/drivers/sound/pwm-beeper.c
@@ -60,7 +60,7 @@ static int pwm_beeper_probe(struct device_d *dev)
beeper = xzalloc(sizeof(*beeper));
dev->priv = beeper;
- beeper->pwm = of_pwm_request(dev->device_node, NULL);
+ beeper->pwm = of_pwm_request(dev->of_node, NULL);
if (IS_ERR(beeper->pwm)) {
error = PTR_ERR(beeper->pwm);
if (error != -EPROBE_DEFER)
@@ -88,7 +88,8 @@ static int pwm_beeper_probe(struct device_d *dev)
return error;
}
- error = of_property_read_u32(dev->device_node, "beeper-hz", &bell_frequency);
+ error = of_property_read_u32(dev->of_node, "beeper-hz",
+ &bell_frequency);
if (error) {
bell_frequency = 1000;
dev_dbg(dev, "failed to parse 'beeper-hz' property, using default: %uHz\n",
@@ -96,7 +97,7 @@ static int pwm_beeper_probe(struct device_d *dev)
}
card = &beeper->card;
- card->name = dev->device_node->full_name;
+ card->name = dev->of_node->full_name;
card->bell_frequency = bell_frequency;
card->beep = pwm_beeper_beep;
diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c
index 383570b253..5b1f984be4 100644
--- a/drivers/spi/ath79_spi.c
+++ b/drivers/spi/ath79_spi.c
@@ -238,7 +238,7 @@ static int ath79_spi_probe(struct device_d *dev)
master->num_chipselect = 3;
if (IS_ENABLED(CONFIG_OFDEVICE)) {
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
u32 num_cs;
int ret;
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index ec90330e53..6c2809cfff 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -389,7 +389,7 @@ static int atmel_spi_probe(struct device_d *dev)
int ret = 0;
int i;
struct spi_master *master;
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
struct atmel_spi *as;
struct at91_spi_platform_data *pdata = dev->platform_data;
diff --git a/drivers/spi/dspi_spi.c b/drivers/spi/dspi_spi.c
index fcfa2a830d..6e498dd67e 100644
--- a/drivers/spi/dspi_spi.c
+++ b/drivers/spi/dspi_spi.c
@@ -319,7 +319,7 @@ static int dspi_probe(struct device_d *dev)
struct resource *io;
struct fsl_dspi *dspi;
struct spi_master *master;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
int ret = 0;
uint32_t bus_num = 0;
@@ -351,9 +351,9 @@ static int dspi_probe(struct device_d *dev)
else
master->bus_num = dev->id;
- of_property_read_u32(dev->device_node, "fsl,spi-cs-sck-delay",
+ of_property_read_u32(dev->of_node, "fsl,spi-cs-sck-delay",
&dspi->cs_sck_delay);
- of_property_read_u32(dev->device_node, "fsl,spi-sck-cs-delay",
+ of_property_read_u32(dev->of_node, "fsl,spi-sck-cs-delay",
&dspi->sck_cs_delay);
io = dev_request_mem_resource(dev, 0);
diff --git a/drivers/spi/gpio_spi.c b/drivers/spi/gpio_spi.c
index 1956eed9cc..8434c37cc9 100644
--- a/drivers/spi/gpio_spi.c
+++ b/drivers/spi/gpio_spi.c
@@ -128,7 +128,7 @@ static int gpio_spi_setup(struct spi_device *spi)
static int gpio_spi_of_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct gpio_spi_pdata *pdata;
int n, sck;
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c
index 3e0ad2db00..f70b543b4c 100644
--- a/drivers/spi/imx_spi.c
+++ b/drivers/spi/imx_spi.c
@@ -562,7 +562,7 @@ static __maybe_unused struct spi_imx_devtype_data spi_imx_devtype_data_2_3 = {
static int imx_spi_dt_probe(struct imx_spi *imx)
{
- struct device_node *node = imx->master.dev->device_node;
+ struct device_node *node = imx->master.dev->of_node;
int i;
if (!node)
@@ -603,7 +603,7 @@ static int imx_spi_probe(struct device_d *dev)
master->num_chipselect = pdata->num_chipselect;
imx->cs_array = pdata->chipselect;
} else if (IS_ENABLED(CONFIG_OFDEVICE)) {
- ret = of_alias_get_id(dev->device_node, "spi");
+ ret = of_alias_get_id(dev->of_node, "spi");
if (ret < 0)
goto err_free;
master->bus_num = ret;
diff --git a/drivers/spi/mvebu_spi.c b/drivers/spi/mvebu_spi.c
index 3325138604..8584adfd07 100644
--- a/drivers/spi/mvebu_spi.c
+++ b/drivers/spi/mvebu_spi.c
@@ -356,7 +356,7 @@ static int mvebu_spi_probe(struct device_d *dev)
const struct of_device_id *match;
int ret = 0;
- match = of_match_node(mvebu_spi_dt_ids, dev->device_node);
+ match = of_match_node(mvebu_spi_dt_ids, dev->of_node);
if (!match)
return -EINVAL;
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 44c35673d8..ca79eaf111 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -334,10 +334,10 @@ static int omap3_spi_setup(struct spi_device *spi)
static int omap3_spi_probe_dt(struct device_d *dev, struct omap3_spi_master *omap3_master)
{
- if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->device_node)
+ if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->of_node)
return -ENODEV;
- if (of_property_read_bool(dev->device_node, "ti,pindir-d0-out-d1-in"))
+ if (of_property_read_bool(dev->of_node, "ti,pindir-d0-out-d1-in"))
omap3_master->swap_miso_mosi = 1;
return 0;
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 21cf84233b..5c8469576b 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -462,10 +462,10 @@ static int dspi_setup(struct spi_device *spi)
return -ENOMEM;
}
- of_property_read_u32(spi->dev.device_node, "fsl,spi-cs-sck-delay",
+ of_property_read_u32(spi->dev.of_node, "fsl,spi-cs-sck-delay",
&cs_sck_delay);
- of_property_read_u32(spi->dev.device_node, "fsl,spi-sck-cs-delay",
+ of_property_read_u32(spi->dev.of_node, "fsl,spi-sck-cs-delay",
&sck_cs_delay);
chip->void_write_data = 0;
@@ -555,7 +555,7 @@ static void dspi_init(struct fsl_dspi *dspi)
static int dspi_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
const struct regmap_config *regmap_config;
struct spi_master *master;
int ret, cs_num, bus_num = -1;
diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c
index f9bf888603..835c93565c 100644
--- a/drivers/spi/spi-fsl-qspi.c
+++ b/drivers/spi/spi-fsl-qspi.c
@@ -751,7 +751,7 @@ static const char *fsl_qspi_get_name(struct spi_mem *mem)
* mtd/spi-nor/fsl-quadspi.c, we set a custom name derived from the
* platform_device of the controller.
*/
- if (of_get_available_child_count(q->dev->device_node) == 1)
+ if (of_get_available_child_count(q->dev->of_node) == 1)
return dev_name(q->dev);
name = basprintf("%s-%d", dev_name(q->dev), mem->spi->chip_select);
diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c
index 673b91d6dc..b0378126a3 100644
--- a/drivers/spi/spi-nxp-fspi.c
+++ b/drivers/spi/spi-nxp-fspi.c
@@ -942,7 +942,7 @@ static const char *nxp_fspi_get_name(struct spi_mem *mem)
/* Set custom name derived from the platform_device of the controller.
*/
- if (of_get_available_child_count(f->dev->device_node) == 1)
+ if (of_get_available_child_count(f->dev->of_node) == 1)
return dev_name(f->dev);
name = basprintf("%s-%d", dev_name(f->dev), mem->spi->chip_select);
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index 713bcc0c3b..eb87ba1d8c 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -457,7 +457,7 @@ static const struct spi_controller_mem_ops sifive_spi_mem_ops = {
static void sifive_spi_dt_probe(struct sifive_spi *spi)
{
- struct device_node *node = spi->ctlr.dev->device_node;
+ struct device_node *node = spi->ctlr.dev->of_node;
spi->fifo_depth = SIFIVE_SPI_DEFAULT_DEPTH;
of_property_read_u32(node, "sifive,fifo-depth", &spi->fifo_depth);
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index b840dbe286..15c8a9f447 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -71,7 +71,7 @@ struct spi_device *spi_new_device(struct spi_controller *ctrl,
/* allocate a free id for this chip */
proxy->dev.id = DEVICE_ID_DYNAMIC;
proxy->dev.type_data = proxy;
- proxy->dev.device_node = chip->device_node;
+ proxy->dev.of_node = chip->device_node;
proxy->dev.parent = ctrl->dev;
proxy->master = proxy->controller = ctrl;
@@ -110,7 +110,7 @@ static void spi_of_register_slaves(struct spi_controller *ctrl)
struct device_node *n;
struct spi_board_info chip;
struct property *reg;
- struct device_node *node = ctrl->dev->device_node;
+ struct device_node *node = ctrl->dev->of_node;
if (!IS_ENABLED(CONFIG_OFDEVICE))
return;
@@ -259,8 +259,8 @@ int spi_register_controller(struct spi_controller *ctrl)
if (ctrl->num_chipselect == 0)
return -EINVAL;
- if ((ctrl->bus_num < 0) && ctrl->dev->device_node)
- ctrl->bus_num = of_alias_get_id(ctrl->dev->device_node, "spi");
+ if ((ctrl->bus_num < 0) && ctrl->dev->of_node)
+ ctrl->bus_num = of_alias_get_id(ctrl->dev->of_node, "spi");
/* convention: dynamically assigned bus IDs count down from the max */
if (ctrl->bus_num < 0)
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index f0edc41c37..f8073d8f90 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -541,7 +541,7 @@ static const struct spi_controller_mem_ops zynq_qspi_mem_ops = {
static int zynq_qspi_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct spi_controller *ctlr;
struct zynq_qspi *xqspi;
struct resource *iores;
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 7be3b18df9..77e225e47a 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -654,7 +654,7 @@ static void dwc3_set_incr_burst_type(struct dwc3 *dwc)
* result = 1, means INCRx burst mode supported.
* result > 1, means undefined length burst mode supported.
*/
- of_find_property(dev->device_node, "snps,incr-burst-type-adjustment",
+ of_find_property(dev->of_node, "snps,incr-burst-type-adjustment",
&ntype);
ntype /= sizeof(u32);
@@ -669,7 +669,7 @@ static void dwc3_set_incr_burst_type(struct dwc3 *dwc)
}
/* Get INCR burst type, and parse it */
- ret = of_property_read_u32_array(dev->device_node,
+ ret = of_property_read_u32_array(dev->of_node,
"snps,incr-burst-type-adjustment",
vals, ntype);
if (ret) {
@@ -997,20 +997,20 @@ static void dwc3_get_properties(struct dwc3 *dwc)
*/
hird_threshold = 12;
- dwc->maximum_speed = of_usb_get_maximum_speed(dev->device_node, NULL);
- dwc->dr_mode = of_usb_get_dr_mode(dev->device_node, NULL);
- dwc->hsphy_mode = of_usb_get_phy_mode(dev->device_node, NULL);
+ dwc->maximum_speed = of_usb_get_maximum_speed(dev->of_node, NULL);
+ dwc->dr_mode = of_usb_get_dr_mode(dev->of_node, NULL);
+ dwc->hsphy_mode = of_usb_get_phy_mode(dev->of_node, NULL);
- dwc->dis_u2_freeclk_exists_quirk = of_property_read_bool(dev->device_node,
- "snps,dis-u2-freeclk-exists-quirk");
+ dwc->dis_u2_freeclk_exists_quirk = of_property_read_bool(dev->of_node,
+ "snps,dis-u2-freeclk-exists-quirk");
dwc->lpm_nyet_threshold = lpm_nyet_threshold;
dwc->tx_de_emphasis = tx_de_emphasis;
- if (of_get_property(dev->device_node, "snps,dis_rxdet_inp3_quirk",
+ if (of_get_property(dev->of_node, "snps,dis_rxdet_inp3_quirk",
NULL))
dwc->dis_rxdet_inp3_quirk = 1;
- of_property_read_u32_array(dev->device_node,
+ of_property_read_u32_array(dev->of_node,
"snps,quirk-frame-length-adjustment",
&dwc->fladj, 1);
@@ -1114,10 +1114,10 @@ static int dwc3_probe(struct device_d *dev)
dwc3_get_properties(dwc);
- if (dev->device_node) {
+ if (dev->of_node) {
dwc->num_clks = match->num_clks;
- if (of_find_property(dev->device_node, "clocks", NULL)) {
+ if (of_find_property(dev->of_node, "clocks", NULL)) {
ret = clk_bulk_get(dev, dwc->num_clks, dwc->clks);
if (ret)
return ret;
diff --git a/drivers/usb/dwc3/dwc3-of-simple.c b/drivers/usb/dwc3/dwc3-of-simple.c
index 6261122a12..c2785a5336 100644
--- a/drivers/usb/dwc3/dwc3-of-simple.c
+++ b/drivers/usb/dwc3/dwc3-of-simple.c
@@ -28,7 +28,7 @@ struct dwc3_of_simple {
static int dwc3_of_simple_probe(struct device_d *dev)
{
struct dwc3_of_simple *simple;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
int ret;
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 80cbd36118..c026e49dd9 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1407,12 +1407,12 @@ static int __init at91udc_probe(struct device_d *dev)
iclk_name = "udc_clk";
fclk_name = "udpck";
} else {
- if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->device_node) {
+ if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->of_node) {
dev_err(dev, "no DT and no platform_data\n");
return -ENODEV;
}
- at91udc_of_init(udc, dev->device_node);
+ at91udc_of_init(udc, dev->of_node);
iclk_name = "pclk";
fclk_name = "hclk";
}
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index ba24709e13..914c0486de 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -56,7 +56,7 @@ static int atmel_ehci_probe(struct device_d *dev)
const char *uclk_name;
struct ehci_host *ehci;
- uclk_name = (dev->device_node) ? "usb_clk" : "uhpck";
+ uclk_name = (dev->of_node) ? "usb_clk" : "uhpck";
atehci = xzalloc(sizeof(*atehci));
atehci->dev = dev;
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 068504557b..8989c57f4c 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1403,7 +1403,7 @@ static int ehci_probe(struct device_d *dev)
struct resource *iores;
struct ehci_data data = {};
struct ehci_platform_data *pdata = dev->platform_data;
- struct device_node *dn = dev->device_node;
+ struct device_node *dn = dev->of_node;
struct ehci_host *ehci;
struct clk_bulk_data *clks;
int num_clocks, ret;
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index a77e2cae14..8fd55b4cdf 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -60,7 +60,7 @@ static int at91_ohci_probe_dt(struct device_d *dev)
int i, ret, gpio;
enum of_gpio_flags flags;
struct at91_usbh_data *pdata;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
pdata = xzalloc(sizeof(*pdata));
dev->platform_data = pdata;
@@ -116,7 +116,7 @@ static int at91_ohci_probe(struct device_d *dev)
dev->priv = ohci_at91;
ohci_at91->dev = dev;
- if (dev->device_node) {
+ if (dev->of_node) {
ret = at91_ohci_probe_dt(dev);
if (ret < 0)
return ret;
diff --git a/drivers/usb/imx/chipidea-imx.c b/drivers/usb/imx/chipidea-imx.c
index f71cf80b7d..75fe81f068 100644
--- a/drivers/usb/imx/chipidea-imx.c
+++ b/drivers/usb/imx/chipidea-imx.c
@@ -104,7 +104,7 @@ static int imx_chipidea_probe_dt(struct imx_chipidea *ci)
struct of_phandle_args out_args;
if (ci->have_usb_misc) {
- if (of_parse_phandle_with_args(ci->dev->device_node, "fsl,usbmisc",
+ if (of_parse_phandle_with_args(ci->dev->of_node, "fsl,usbmisc",
"#index-cells", 0, &out_args))
return -ENODEV;
@@ -117,7 +117,7 @@ static int imx_chipidea_probe_dt(struct imx_chipidea *ci)
ci->flags = MXC_EHCI_MODE_UTMI_8BIT;
- ci->mode = of_usb_get_dr_mode(ci->dev->device_node, NULL);
+ ci->mode = of_usb_get_dr_mode(ci->dev->of_node, NULL);
if (ci->mode == USB_DR_MODE_UNKNOWN) {
/*
@@ -130,7 +130,7 @@ static int imx_chipidea_probe_dt(struct imx_chipidea *ci)
ci->mode = USB_DR_MODE_HOST;
}
- ci->phymode = of_usb_get_phy_mode(ci->dev->device_node, NULL);
+ ci->phymode = of_usb_get_phy_mode(ci->dev->of_node, NULL);
switch (ci->phymode) {
case USBPHY_INTERFACE_MODE_UTMI:
ci->flags = MXC_EHCI_MODE_UTMI_8BIT;
@@ -151,18 +151,18 @@ static int imx_chipidea_probe_dt(struct imx_chipidea *ci)
dev_dbg(ci->dev, "no phy_type setting. Relying on reset default\n");
}
- if (of_find_property(ci->dev->device_node,
+ if (of_find_property(ci->dev->of_node,
"disable-over-current", NULL))
ci->flags |= MXC_EHCI_DISABLE_OVERCURRENT;
- else if (!of_find_property(ci->dev->device_node,
+ else if (!of_find_property(ci->dev->of_node,
"over-current-active-high", NULL))
ci->flags |= MXC_EHCI_OC_PIN_ACTIVE_LOW;
- if (of_find_property(ci->dev->device_node, "power-active-high", NULL))
+ if (of_find_property(ci->dev->of_node, "power-active-high", NULL))
ci->flags |= MXC_EHCI_PWR_PIN_ACTIVE_HIGH;
- if (of_usb_get_maximum_speed(ci->dev->device_node, NULL) ==
+ if (of_usb_get_maximum_speed(ci->dev->of_node, NULL) ==
USB_SPEED_FULL)
ci->flags |= MXC_EHCI_PFSC;
@@ -232,7 +232,7 @@ static int imx_chipidea_probe(struct device_d *dev)
if (!ret)
ci->have_usb_misc = imx_data->have_usb_misc;
- if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node) {
+ if (IS_ENABLED(CONFIG_OFDEVICE) && dev->of_node) {
ret = imx_chipidea_probe_dt(ci);
if (ret)
return ret;
@@ -265,9 +265,9 @@ static int imx_chipidea_probe(struct device_d *dev)
* more modern former one but fall back to the old one.
*
* Code should be removed when all devicetrees are using "phys" */
- if (of_property_read_bool(dev->device_node, "phys"))
+ if (of_property_read_bool(dev->of_node, "phys"))
phynode_name = "phys";
- else if (of_property_read_bool(dev->device_node, "fsl,usbphy"))
+ else if (of_property_read_bool(dev->of_node, "fsl,usbphy"))
phynode_name = "fsl,usbphy";
else
phynode_name = NULL;
diff --git a/drivers/usb/imx/imx-usb-phy.c b/drivers/usb/imx/imx-usb-phy.c
index fc7f84d064..e3c6832cc8 100644
--- a/drivers/usb/imx/imx-usb-phy.c
+++ b/drivers/usb/imx/imx-usb-phy.c
@@ -146,7 +146,7 @@ static int imx_usbphy_get_vbus_state(struct param_d *p, void *priv)
static int imx_usbphy_probe(struct device_d *dev)
{
struct resource *iores;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
int ret;
struct imx_usbphy *imxphy;
diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index 4871faf451..b5b5e97c06 100644
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -338,7 +338,7 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
struct usb251xb_data *data)
{
struct device_d *dev = hub->dev;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
int len, i;
u32 port, property_u32 = 0;
const u32 *cproperty_u32;
@@ -619,7 +619,7 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
static int usb251xb_probe(struct usb251xb *hub)
{
struct device_d *dev = hub->dev;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
const struct of_device_id *of_id = of_match_device(usb251xb_of_match,
dev);
int err;
diff --git a/drivers/usb/musb/musb_am335x.c b/drivers/usb/musb/musb_am335x.c
index 03f30d92aa..14307c95d5 100644
--- a/drivers/usb/musb/musb_am335x.c
+++ b/drivers/usb/musb/musb_am335x.c
@@ -7,7 +7,7 @@ static int am335x_child_probe(struct device_d *dev)
{
int ret;
- ret = of_platform_populate(dev->device_node, NULL, dev);
+ ret = of_platform_populate(dev->of_node, NULL, dev);
if (ret)
return ret;
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index ee0215024a..397a5792e2 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -264,7 +264,7 @@ static int get_musb_port_mode(struct device_d *dev)
{
enum usb_dr_mode mode;
- mode = of_usb_get_dr_mode(dev->device_node, NULL);
+ mode = of_usb_get_dr_mode(dev->of_node, NULL);
switch (mode) {
case USB_DR_MODE_HOST:
return MUSB_PORT_MODE_HOST;
@@ -302,7 +302,7 @@ static int dsps_probe(struct device_d *dev)
struct resource *iores[2];
struct musb_hdrc_platform_data *pdata;
struct musb_hdrc_config *config;
- struct device_node *dn = dev->device_node;
+ struct device_node *dn = dev->of_node;
const struct dsps_musb_wrapper *wrp;
struct device_node *phy_node;
struct device_d *phy_dev;
diff --git a/drivers/usb/musb/phy-am335x-control.c b/drivers/usb/musb/phy-am335x-control.c
index bc0f6b9485..2cdf8a2105 100644
--- a/drivers/usb/musb/phy-am335x-control.c
+++ b/drivers/usb/musb/phy-am335x-control.c
@@ -108,7 +108,7 @@ struct phy_control *am335x_get_phy_control(struct device_d *dev)
struct device_node *node;
struct am335x_control_usb *ctrl_usb;
- node = of_parse_phandle(dev->device_node, "ti,ctrl_mod", 0);
+ node = of_parse_phandle(dev->of_node, "ti,ctrl_mod", 0);
if (!node)
return ERR_PTR(-ENOENT);
diff --git a/drivers/usb/musb/phy-am335x.c b/drivers/usb/musb/phy-am335x.c
index 67787cfec3..aa0aec70d4 100644
--- a/drivers/usb/musb/phy-am335x.c
+++ b/drivers/usb/musb/phy-am335x.c
@@ -43,7 +43,7 @@ static int am335x_phy_probe(struct device_d *dev)
goto err_release;
}
- am_usbphy->id = of_alias_get_id(dev->device_node, "phy");
+ am_usbphy->id = of_alias_get_id(dev->of_node, "phy");
if (am_usbphy->id < 0) {
dev_err(dev, "Missing PHY id: %d\n", am_usbphy->id);
ret = am_usbphy->id;
diff --git a/drivers/video/atmel_lcdfb_core.c b/drivers/video/atmel_lcdfb_core.c
index 17f754b566..f6ff9ab8fa 100644
--- a/drivers/video/atmel_lcdfb_core.c
+++ b/drivers/video/atmel_lcdfb_core.c
@@ -328,7 +328,7 @@ static int lcdfb_of_init(struct device_d *dev, struct atmel_lcdfb_info *sinfo)
}
/* Required properties */
- display = of_parse_phandle(dev->device_node, "display", 0);
+ display = of_parse_phandle(dev->of_node, "display", 0);
if (!display) {
dev_err(dev, "no display phandle\n");
return -ENOENT;
@@ -450,7 +450,7 @@ int atmel_lcdc_register(struct device_d *dev, struct atmel_lcdfb_devdata *data)
}
bus_clk_name = "hck1";
} else {
- if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->device_node)
+ if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->of_node)
return -EINVAL;
ret = lcdfb_of_init(dev, sinfo);
diff --git a/drivers/video/backlight-pwm.c b/drivers/video/backlight-pwm.c
index ffa58c2b2d..bbacddec87 100644
--- a/drivers/video/backlight-pwm.c
+++ b/drivers/video/backlight-pwm.c
@@ -104,7 +104,7 @@ static int backlight_pwm_set(struct backlight_device *backlight,
static int pwm_backlight_parse_dt(struct device_d *dev,
struct pwm_backlight *pwm_backlight)
{
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
struct property *prop;
int length;
u32 value;
@@ -170,7 +170,7 @@ static int backlight_pwm_of_probe(struct device_d *dev)
struct pwm_backlight *pwm_backlight;
struct pwm_device *pwm;
- pwm = of_pwm_request(dev->device_node, NULL);
+ pwm = of_pwm_request(dev->of_node, NULL);
if (IS_ERR(pwm)) {
dev_err(dev, "Cannot find PWM device\n");
return PTR_ERR(pwm);
@@ -193,7 +193,7 @@ static int backlight_pwm_of_probe(struct device_d *dev)
pwm_backlight->backlight.slew_time_ms = 100;
pwm_backlight->backlight.brightness_set = backlight_pwm_set;
pwm_backlight->backlight.dev.parent = dev;
- pwm_backlight->backlight.node = dev->device_node;
+ pwm_backlight->backlight.node = dev->of_node;
ret = backlight_register(&pwm_backlight->backlight);
if (ret)
diff --git a/drivers/video/imx-ipu-v3/imx-hdmi.c b/drivers/video/imx-ipu-v3/imx-hdmi.c
index d63f2c2111..285034270d 100644
--- a/drivers/video/imx-ipu-v3/imx-hdmi.c
+++ b/drivers/video/imx-ipu-v3/imx-hdmi.c
@@ -1251,7 +1251,7 @@ static int dw_hdmi_ioctl(struct vpl *vpl, unsigned int port,
static int dw_hdmi_probe(struct device_d *dev)
{
struct resource *iores;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct dw_hdmi *hdmi;
int ret;
diff --git a/drivers/video/imx-ipu-v3/imx-ldb.c b/drivers/video/imx-ipu-v3/imx-ldb.c
index 4c934bc72e..08b5e5950c 100644
--- a/drivers/video/imx-ipu-v3/imx-ldb.c
+++ b/drivers/video/imx-ipu-v3/imx-ldb.c
@@ -304,7 +304,7 @@ static int imx_ldb_ioctl(struct vpl *vpl, unsigned int port,
static int imx_ldb_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct device_node *child;
struct imx_ldb *imx_ldb;
int ret, i;
diff --git a/drivers/video/imx-ipu-v3/imx-pd.c b/drivers/video/imx-ipu-v3/imx-pd.c
index 92fa4ed4b4..ee30d3b57d 100644
--- a/drivers/video/imx-ipu-v3/imx-pd.c
+++ b/drivers/video/imx-ipu-v3/imx-pd.c
@@ -63,7 +63,7 @@ static int imx_pd_ioctl(struct vpl *vpl, unsigned int port,
static int imx_pd_probe(struct device_d *dev)
{
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
struct imx_pd *imx_pd;
struct device_node *port;
const char *fmt;
diff --git a/drivers/video/imx-ipu-v3/ipu-common.c b/drivers/video/imx-ipu-v3/ipu-common.c
index 3d7a19e9c0..556f737fc5 100644
--- a/drivers/video/imx-ipu-v3/ipu-common.c
+++ b/drivers/video/imx-ipu-v3/ipu-common.c
@@ -714,7 +714,7 @@ static int ipu_add_subdevice_pdata(struct device_d *ipu_dev,
dev = device_alloc(reg->name, ipu_client_id++);
dev->parent = ipu_dev;
device_add_data(dev, ®->pdata, sizeof(reg->pdata));
- ((struct ipu_client_platformdata *)dev->platform_data)->device_node = ipu_dev->device_node;
+ ((struct ipu_client_platformdata *)dev->platform_data)->device_node = ipu_dev->of_node;
ret = platform_device_register(dev);
diff --git a/drivers/video/imx-ipu-v3/ipufb.c b/drivers/video/imx-ipu-v3/ipufb.c
index f8bb69da06..f880622787 100644
--- a/drivers/video/imx-ipu-v3/ipufb.c
+++ b/drivers/video/imx-ipu-v3/ipufb.c
@@ -282,7 +282,7 @@ static int ipufb_probe(struct device_d *dev)
fbi = xzalloc(sizeof(*fbi));
info = &fbi->info;
- ipuid = of_alias_get_id(dev->parent->device_node, "ipu");
+ ipuid = of_alias_get_id(dev->parent->of_node, "ipu");
fbi->name = basprintf("ipu%d-di%d", ipuid + 1, pdata->di);
fbi->id = ipuid * 2 + pdata->di;
fbi->dino = pdata->di;
@@ -305,11 +305,12 @@ static int ipufb_probe(struct device_d *dev)
if (ret)
return ret;
- node = of_graph_get_port_by_id(dev->parent->device_node, 2 + pdata->di);
+ node = of_graph_get_port_by_id(dev->parent->of_node, 2 + pdata->di);
if (node && of_graph_port_is_available(node)) {
- dev_dbg(fbi->dev, "register vpl for %s\n", dev->parent->device_node->full_name);
+ dev_dbg(fbi->dev, "register vpl for %s\n",
+ dev->parent->of_node->full_name);
- fbi->vpl.node = dev->parent->device_node;
+ fbi->vpl.node = dev->parent->of_node;
ret = vpl_register(&fbi->vpl);
if (ret)
return ret;
diff --git a/drivers/video/mtl017.c b/drivers/video/mtl017.c
index 46c826be21..f5b6178967 100644
--- a/drivers/video/mtl017.c
+++ b/drivers/video/mtl017.c
@@ -225,7 +225,7 @@ static int mtl017_probe(struct device_d *dev)
enum of_gpio_flags flags;
mtl017 = xzalloc(sizeof(struct mtl017));
- mtl017->vpl.node = dev->device_node;
+ mtl017->vpl.node = dev->of_node;
mtl017->vpl.ioctl = mtl017_ioctl;
mtl017->dev = dev;
mtl017->client = to_i2c_client(dev);
@@ -234,15 +234,16 @@ static int mtl017_probe(struct device_d *dev)
if (IS_ERR(mtl017->regulator))
mtl017->regulator = NULL;
- mtl017->enable_gpio = of_get_named_gpio_flags(dev->device_node,
- "enable-gpios", 0, &flags);
+ mtl017->enable_gpio = of_get_named_gpio_flags(dev->of_node,
+ "enable-gpios", 0,
+ &flags);
if (gpio_is_valid(mtl017->enable_gpio)) {
if (!(flags & OF_GPIO_ACTIVE_LOW))
mtl017->enable_active_high = 1;
}
- mtl017->reset_gpio = of_get_named_gpio_flags(dev->device_node,
- "reset-gpios", 0, &flags);
+ mtl017->reset_gpio = of_get_named_gpio_flags(dev->of_node,
+ "reset-gpios", 0, &flags);
if (gpio_is_valid(mtl017->reset_gpio)) {
if (!(flags & OF_GPIO_ACTIVE_LOW))
mtl017->reset_active_high = 1;
diff --git a/drivers/video/panel-ilitek-ili9341.c b/drivers/video/panel-ilitek-ili9341.c
index d877442022..dde9a61d59 100644
--- a/drivers/video/panel-ilitek-ili9341.c
+++ b/drivers/video/panel-ilitek-ili9341.c
@@ -499,7 +499,7 @@ static int ili9341_dpi_probe(struct spi_device *spi, int dc, int reset)
ili->dev = dev;
ili->max_spi_speed = ili->conf->max_spi_speed;
- ili->vpl.node = dev->device_node;
+ ili->vpl.node = dev->of_node;
ili->vpl.ioctl = ili9341_ioctl;
return vpl_register(&ili->vpl);
diff --git a/drivers/video/simple-panel.c b/drivers/video/simple-panel.c
index a87adcca64..ffbfa067d2 100644
--- a/drivers/video/simple-panel.c
+++ b/drivers/video/simple-panel.c
@@ -99,7 +99,7 @@ static int simple_panel_get_modes(struct simple_panel *panel, struct display_tim
}
}
- modes = of_get_display_timings(panel->dev->device_node);
+ modes = of_get_display_timings(panel->dev->of_node);
if (modes) {
timings->modes = modes->modes;
timings->num_modes = modes->num_modes;
@@ -132,7 +132,7 @@ static int simple_panel_ioctl(struct vpl *vpl, unsigned int port,
static int simple_panel_probe(struct device_d *dev)
{
struct simple_panel *panel;
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
enum of_gpio_flags flags;
int ret;
diff --git a/drivers/video/simplefb-client.c b/drivers/video/simplefb-client.c
index 2367713ba4..e89bf22681 100644
--- a/drivers/video/simplefb-client.c
+++ b/drivers/video/simplefb-client.c
@@ -38,7 +38,7 @@ struct simplefb {
static int simplefb_parse_dt(struct device_d *dev,
struct simplefb_params *params)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
int ret;
const char *format;
int i;
@@ -90,7 +90,7 @@ static int simplefb_probe(struct device_d *dev)
struct resource *mem;
ret = -ENODEV;
- if (dev->device_node)
+ if (dev->of_node)
ret = simplefb_parse_dt(dev, ¶ms);
if (ret)
diff --git a/drivers/video/ssd1307fb.c b/drivers/video/ssd1307fb.c
index 9e141a851f..4e98b4277b 100644
--- a/drivers/video/ssd1307fb.c
+++ b/drivers/video/ssd1307fb.c
@@ -427,9 +427,9 @@ static const struct of_device_id ssd1307fb_of_match[] = {
static int ssd1307fb_probe(struct device_d *dev)
{
struct fb_info *info;
- struct device_node *node = dev->device_node;
+ struct device_node *node = dev->of_node;
const struct of_device_id *match =
- of_match_node(ssd1307fb_of_match, dev->device_node);
+ of_match_node(ssd1307fb_of_match, dev->of_node);
u32 vmem_size;
struct ssd1307fb_par *par;
struct ssd1307fb_array *array;
diff --git a/drivers/video/stm.c b/drivers/video/stm.c
index 14182f8c46..154145bd1d 100644
--- a/drivers/video/stm.c
+++ b/drivers/video/stm.c
@@ -532,10 +532,10 @@ static int stmfb_probe(struct device_d *hw_dev)
struct display_timings *modes;
struct device_node *display;
- if (!IS_ENABLED(CONFIG_OFDEVICE) || !hw_dev->device_node)
+ if (!IS_ENABLED(CONFIG_OFDEVICE) || !hw_dev->of_node)
return -EINVAL;
- display = of_parse_phandle(hw_dev->device_node, "display", 0);
+ display = of_parse_phandle(hw_dev->of_node, "display", 0);
if (!display) {
dev_err(hw_dev, "no display phandle\n");
return -EINVAL;
diff --git a/drivers/video/stm32_ltdc.c b/drivers/video/stm32_ltdc.c
index 9dc35ade61..5bbf9c1093 100644
--- a/drivers/video/stm32_ltdc.c
+++ b/drivers/video/stm32_ltdc.c
@@ -273,7 +273,7 @@ static int ltdc_probe(struct device_d *dev)
return PTR_ERR(hw->pclk);
}
- for_each_available_child_of_node(dev->device_node, np) {
+ for_each_available_child_of_node(dev->of_node, np) {
struct ltdc_fb *priv;
struct of_endpoint ep;
struct fb_info *info;
@@ -290,7 +290,7 @@ static int ltdc_probe(struct device_d *dev)
priv = xzalloc(sizeof(*priv));
priv->hw = hw;
priv->id = ep.id;
- priv->vpl.node = dev->device_node;
+ priv->vpl.node = dev->of_node;
ret = vpl_register(&priv->vpl);
if (ret)
diff --git a/drivers/video/tc358767.c b/drivers/video/tc358767.c
index 36f4125414..ad0d753235 100644
--- a/drivers/video/tc358767.c
+++ b/drivers/video/tc358767.c
@@ -1347,16 +1347,16 @@ static int tc_probe(struct device_d *dev)
tc->dev = dev;
/* Shut down GPIO is optional */
- tc->sd_gpio = of_get_named_gpio_flags(dev->device_node,
- "shutdown-gpios", 0, &flags);
+ tc->sd_gpio = of_get_named_gpio_flags(dev->of_node,
+ "shutdown-gpios", 0, &flags);
if (gpio_is_valid(tc->sd_gpio)) {
if (!(flags & OF_GPIO_ACTIVE_LOW))
tc->sd_active_high = 1;
}
/* Reset GPIO is optional */
- tc->reset_gpio = of_get_named_gpio_flags(dev->device_node,
- "reset-gpios", 0, &flags);
+ tc->reset_gpio = of_get_named_gpio_flags(dev->of_node,
+ "reset-gpios", 0, &flags);
if (gpio_is_valid(tc->reset_gpio)) {
if (!(flags & OF_GPIO_ACTIVE_LOW))
tc->reset_active_high = 1;
@@ -1371,7 +1371,7 @@ static int tc_probe(struct device_d *dev)
gpio_direction_output(tc->sd_gpio, 0);
}
- tc->refclk = of_clk_get_by_name(dev->device_node, "ref");
+ tc->refclk = of_clk_get_by_name(dev->of_node, "ref");
if (IS_ERR(tc->refclk)) {
ret = PTR_ERR(tc->refclk);
dev_err(dev, "Failed to get refclk: %d\n", ret);
@@ -1410,7 +1410,7 @@ static int tc_probe(struct device_d *dev)
}
/* add vlp */
- tc->vpl.node = dev->device_node;
+ tc->vpl.node = dev->of_node;
tc->vpl.ioctl = tc_ioctl;
return vpl_register(&tc->vpl);
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index 8f2f772c6e..9e38dc361c 100644
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -42,7 +42,7 @@ static u8 w1_gpio_read_bit(struct w1_bus *bus)
static int w1_gpio_probe_dt(struct device_d *dev)
{
struct w1_gpio_platform_data *pdata;
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
int gpio;
if (dev->platform_data)
diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c
index 4de49dcee3..c5da28467b 100644
--- a/drivers/watchdog/gpio_wdt.c
+++ b/drivers/watchdog/gpio_wdt.c
@@ -83,7 +83,7 @@ static int gpio_wdt_set_timeout(struct watchdog *wdd, unsigned int new_timeout)
static int gpio_wdt_probe(struct device_d *dev)
{
- struct device_node *np = dev->device_node;
+ struct device_node *np = dev->of_node;
struct gpio_wdt_priv *priv;
enum gpiod_flags gflags;
unsigned int hw_margin;
diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c
index 5e9962866f..0cc1d07ba2 100644
--- a/drivers/watchdog/imxwd.c
+++ b/drivers/watchdog/imxwd.c
@@ -269,9 +269,9 @@ static int imx_wd_probe(struct device_d *dev)
priv->wd.timeout_max = priv->ops->timeout_max;
priv->wd.hwdev = dev;
priv->dev = dev;
- priv->bigendian = of_device_is_big_endian(dev->device_node);
+ priv->bigendian = of_device_is_big_endian(dev->of_node);
- priv->ext_reset = of_property_read_bool(dev->device_node,
+ priv->ext_reset = of_property_read_bool(dev->of_node,
"fsl,ext-reset-output");
if (IS_ENABLED(CONFIG_WATCHDOG_IMX)) {
diff --git a/drivers/watchdog/rave-sp-wdt.c b/drivers/watchdog/rave-sp-wdt.c
index 26540395cb..f5531d9d37 100644
--- a/drivers/watchdog/rave-sp-wdt.c
+++ b/drivers/watchdog/rave-sp-wdt.c
@@ -286,7 +286,7 @@ static int rave_sp_wdt_get_boot_source(struct param_d *param, void *priv)
static int rave_sp_wdt_add_params(struct rave_sp_wdt *sp_wd)
{
struct watchdog *wdd = &sp_wd->wdd;
- struct device_node *np = wdd->hwdev->device_node;
+ struct device_node *np = wdd->hwdev->of_node;
struct param_d *p;
sp_wd->boot_source_cell = of_nvmem_cell_get(np, "boot-source");
diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c
index aa5dee8d20..a872580d78 100644
--- a/drivers/watchdog/wd_core.c
+++ b/drivers/watchdog/wd_core.c
@@ -144,7 +144,7 @@ static unsigned int dev_get_watchdog_priority(struct device_d *dev)
unsigned int priority = WATCHDOG_DEFAULT_PRIORITY;
if (dev)
- of_property_read_u32(dev->device_node, "watchdog-priority",
+ of_property_read_u32(dev->of_node, "watchdog-priority",
&priority);
return priority;
@@ -194,7 +194,7 @@ int watchdog_register(struct watchdog *wd)
int ret = 0;
if (wd->hwdev)
- alias = of_alias_get(wd->hwdev->device_node);
+ alias = of_alias_get(wd->hwdev->of_node);
if (alias)
ret = watchdog_register_dev(wd, alias, DEVICE_ID_SINGLE);
@@ -309,7 +309,7 @@ EXPORT_SYMBOL(watchdog_get_default);
int watchdog_get_alias_id_from(struct watchdog *wd, struct device_node *root)
{
- struct device_node *dstnp, *srcnp = wd->hwdev ? wd->hwdev->device_node : NULL;
+ struct device_node *dstnp, *srcnp = wd->hwdev ? wd->hwdev->of_node : NULL;
char *name;
if (!srcnp)
@@ -322,7 +322,7 @@ int watchdog_get_alias_id_from(struct watchdog *wd, struct device_node *root)
if (!dstnp)
return -ENODEV;
- return of_alias_get_id_from(root, wd->hwdev->device_node, "watchdog");
+ return of_alias_get_id_from(root, wd->hwdev->of_node, "watchdog");
}
EXPORT_SYMBOL(watchdog_get_alias_id_from);
diff --git a/fs/devfs-core.c b/fs/devfs-core.c
index 1d8b2664f2..93de976fb6 100644
--- a/fs/devfs-core.c
+++ b/fs/devfs-core.c
@@ -315,7 +315,7 @@ int devfs_create(struct cdev *new)
if (new->dev) {
list_add_tail(&new->devices_list, &new->dev->cdevs);
if (!new->device_node)
- new->device_node = new->dev->device_node;
+ new->device_node = new->dev->of_node;
}
return 0;
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 29585bff59..c1c8b0caab 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -416,7 +416,7 @@ static int ramoops_parse_dt_size(struct device_d *dev,
u32 val32 = 0;
int ret;
- ret = of_property_read_u32(dev->device_node, propname, &val32);
+ ret = of_property_read_u32(dev->of_node, propname, &val32);
if (ret < 0 && ret != -EINVAL) {
dev_err(dev, "failed to parse property %s: %d\n",
propname, ret);
@@ -435,7 +435,7 @@ static int ramoops_parse_dt_size(struct device_d *dev,
static int ramoops_parse_dt(struct device_d *dev,
struct ramoops_platform_data *pdata)
{
- struct device_node *of_node = dev->device_node;
+ struct device_node *of_node = dev->of_node;
struct resource *res;
u32 value;
int ret;
diff --git a/include/console.h b/include/console.h
index 7fea8eeb9e..d3b62f3f9f 100644
--- a/include/console.h
+++ b/include/console.h
@@ -79,9 +79,9 @@ static inline struct device_node *
console_is_serdev_node(struct console_device *cdev)
{
struct device_d *dev = cdev->dev;
- if (dev && dev->device_node &&
- of_get_child_count(dev->device_node))
- return dev->device_node;
+ if (dev && dev->of_node &&
+ of_get_child_count(dev->of_node))
+ return dev->of_node;
return NULL;
}
diff --git a/include/driver.h b/include/driver.h
index 2386949c31..b52b5c47cf 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -74,7 +74,7 @@ struct device_d {
struct list_head cdevs;
const struct platform_device_id *id_entry;
- struct device_node *device_node;
+ struct device_node *of_node;
const struct of_device_id *of_id_entry;
@@ -612,7 +612,7 @@ struct device_d *device_find_child(struct device_d *parent, void *data,
static inline struct device_node *dev_of_node(struct device_d *dev)
{
- return IS_ENABLED(CONFIG_OFDEVICE) ? dev->device_node : NULL;
+ return IS_ENABLED(CONFIG_OFDEVICE) ? dev->of_node : NULL;
}
static inline void *dev_get_priv(struct device_d *dev)
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index f9c4645180..3fe3bdb678 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -288,15 +288,15 @@ int mtd_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops);
static inline void mtd_set_of_node(struct mtd_info *mtd,
struct device_node *np)
{
- mtd->dev.device_node = np;
+ mtd->dev.of_node = np;
}
static inline struct device_node *mtd_get_of_node(struct mtd_info *mtd)
{
- if (mtd->dev.device_node)
- return mtd->dev.device_node;
+ if (mtd->dev.of_node)
+ return mtd->dev.of_node;
if (mtd->dev.parent)
- return mtd->dev.parent->device_node;
+ return mtd->dev.parent->of_node;
return NULL;
}
diff --git a/net/eth.c b/net/eth.c
index 19654cdd51..82fd629905 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -69,7 +69,7 @@ static int eth_get_registered_ethaddr(struct eth_device *edev, void *buf)
struct device_node *node = NULL;
if (edev->parent)
- node = edev->parent->device_node;
+ node = edev->parent->of_node;
list_for_each_entry(addr, ðaddr_list, list) {
if ((node && node == addr->node) ||
@@ -121,9 +121,9 @@ static struct eth_device *eth_get_by_node(struct device_node *node)
for_each_netdev(edev) {
if (!edev->parent)
continue;
- if (!edev->parent->device_node)
+ if (!edev->parent->of_node)
continue;
- if (edev->parent->device_node == node)
+ if (edev->parent->of_node == node)
return edev;
}
return NULL;
@@ -399,8 +399,9 @@ int eth_register(struct eth_device *edev)
if (edev->parent)
edev->dev.parent = edev->parent;
- if (edev->dev.parent && edev->dev.parent->device_node) {
- edev->dev.id = of_alias_get_id(edev->dev.parent->device_node, "ethernet");
+ if (edev->dev.parent && edev->dev.parent->of_node) {
+ edev->dev.id = of_alias_get_id(edev->dev.parent->of_node,
+ "ethernet");
if (edev->dev.id < 0)
edev->dev.id = DEVICE_ID_DYNAMIC;
} else {
@@ -450,8 +451,8 @@ int eth_register(struct eth_device *edev)
register_preset_mac_address(edev, ethaddr);
if (IS_ENABLED(CONFIG_OFDEVICE) && edev->parent &&
- edev->parent->device_node)
- edev->nodepath = xstrdup(edev->parent->device_node->full_name);
+ edev->parent->of_node)
+ edev->nodepath = xstrdup(edev->parent->of_node->full_name);
return 0;
}
@@ -524,7 +525,7 @@ struct eth_device *of_find_eth_device_by_node(struct device_node *np)
return NULL;
list_for_each_entry(edev, &netdev_list, list)
- if (edev->parent->device_node == np)
+ if (edev->parent->of_node == np)
return edev;
return NULL;
}
@@ -548,7 +549,8 @@ static int of_populate_ethaddr(void)
if (!edev->parent || is_valid_ether_addr(edev->ethaddr))
continue;
- ret = of_get_mac_addr_nvmem(edev->parent->device_node, edev->ethaddr);
+ ret = of_get_mac_addr_nvmem(edev->parent->of_node,
+ edev->ethaddr);
if (ret)
continue;
--
2.30.2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/5] Rename struct device_d to device
2022-12-14 12:35 [PATCH 0/5] Rename some structs Sascha Hauer
2022-12-14 12:35 ` [PATCH 1/5] Rename device_d::device_node to device_d::of_node Sascha Hauer
@ 2022-12-14 12:35 ` Sascha Hauer
2022-12-14 12:35 ` [PATCH 3/5] Rename struct driver_d to driver Sascha Hauer
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2022-12-14 12:35 UTC (permalink / raw)
To: Barebox List
The '_d' suffix was originally introduced in case we want to import
Linux struct device as a separate struct into barebox. Over time it
became clear that this won't happen, instead barebox struct device_d
is basically the same as Linux struct device. Rename the struct name
accordingly to make porting Linux code easier.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
Documentation/devel/porting.rst | 2 +-
arch/arm/boards/animeo_ip/init.c | 4 +-
arch/arm/boards/at91sam9m10ihd/hw_version.c | 2 +-
arch/arm/boards/at91sam9x5ek/hw_version.c | 2 +-
arch/arm/boards/embest-marsboard/board.c | 2 +-
.../boards/freescale-mx6-sabrelite/board.c | 2 +-
arch/arm/boards/grinn-liteboard/board.c | 2 +-
arch/arm/boards/innocomm-imx8mm-wb15/board.c | 2 +-
arch/arm/boards/kindle-mx50/board.c | 2 +-
arch/arm/boards/lxa-mc1/board.c | 2 +-
arch/arm/boards/mnt-reform/board.c | 2 +-
arch/arm/boards/nhk8815/setup.c | 2 +-
arch/arm/boards/nxp-imx8mm-evk/board.c | 2 +-
arch/arm/boards/nxp-imx8mn-evk/board.c | 2 +-
arch/arm/boards/nxp-imx8mp-evk/board.c | 2 +-
arch/arm/boards/phytec-phycore-imx27/pcm970.c | 2 +-
.../boards/phytec-phycore-stm32mp1/board.c | 2 +-
arch/arm/boards/phytec-som-imx6/board.c | 2 +-
arch/arm/boards/pine64-quartz64/board.c | 2 +-
arch/arm/boards/protonic-imx6/board.c | 20 +-
arch/arm/boards/protonic-imx8m/board.c | 2 +-
arch/arm/boards/protonic-stm32mp1/board.c | 2 +-
arch/arm/boards/radxa-rock3/board.c | 2 +-
arch/arm/boards/raspberry-pi/rpi-common.c | 4 +-
.../boards/rockchip-rk3568-bpi-r2pro/board.c | 2 +-
arch/arm/boards/rockchip-rk3568-evb/board.c | 2 +-
arch/arm/boards/sama5d3_xplained/board.c | 2 +-
arch/arm/boards/sama5d3xek/hw_version.c | 2 +-
arch/arm/boards/seeed-odyssey/board.c | 2 +-
arch/arm/boards/skov-arm9cpu/board.c | 2 +-
arch/arm/boards/skov-imx6/board.c | 8 +-
arch/arm/boards/stm32mp15x-ev1/board.c | 2 +-
arch/arm/boards/stm32mp15xx-dkx/board.c | 2 +-
arch/arm/boards/tqma6ulx/board.c | 2 +-
arch/arm/boards/tqma8mpxl/board.c | 2 +-
arch/arm/boards/usb-a926x/init.c | 2 +-
arch/arm/boards/vexpress/init.c | 2 +-
arch/arm/boards/webasto-ccbv2/board.c | 2 +-
arch/arm/boards/zii-common/board.c | 2 +-
arch/arm/boards/zii-common/switch-cmd.c | 2 +-
arch/arm/boards/zii-imx8mq-dev/board.c | 2 +-
arch/arm/cpu/psci-client.c | 2 +-
arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
arch/arm/mach-at91/at91sam9_rst.c | 4 +-
arch/arm/mach-at91/ddramc.c | 2 +-
arch/arm/mach-at91/generic.h | 8 +-
arch/arm/mach-at91/include/mach/board.h | 4 +-
arch/arm/mach-at91/sam9_smc.c | 2 +-
arch/arm/mach-at91/setup.c | 2 +-
arch/arm/mach-clps711x/clock.c | 2 +-
arch/arm/mach-clps711x/common.c | 2 +-
arch/arm/mach-imx/devices.c | 36 +--
arch/arm/mach-imx/esdctl.c | 2 +-
arch/arm/mach-imx/iim.c | 8 +-
arch/arm/mach-imx/include/mach/devices-imx1.h | 4 +-
.../arm/mach-imx/include/mach/devices-imx21.h | 12 +-
.../arm/mach-imx/include/mach/devices-imx25.h | 32 +-
.../arm/mach-imx/include/mach/devices-imx27.h | 34 +--
.../arm/mach-imx/include/mach/devices-imx31.h | 36 +--
.../arm/mach-imx/include/mach/devices-imx35.h | 28 +-
.../arm/mach-imx/include/mach/devices-imx50.h | 32 +-
.../arm/mach-imx/include/mach/devices-imx51.h | 38 +--
.../arm/mach-imx/include/mach/devices-imx53.h | 34 +--
arch/arm/mach-imx/include/mach/devices-imx6.h | 36 +--
arch/arm/mach-imx/include/mach/devices.h | 34 +--
arch/arm/mach-imx/src.c | 2 +-
arch/arm/mach-mxs/include/mach/devices.h | 8 +-
arch/arm/mach-mxs/ocotp.c | 4 +-
arch/arm/mach-omap/am33xx_generic.c | 2 +-
arch/arm/mach-omap/am33xx_scrm.c | 2 +-
arch/arm/mach-omap/include/mach/devices.h | 4 +-
.../mach-omap/include/mach/omap3-devices.h | 30 +-
.../mach-omap/include/mach/omap4-devices.h | 26 +-
arch/arm/mach-omap/omap_devices.c | 6 +-
arch/arm/mach-pxa/devices.c | 12 +-
arch/arm/mach-pxa/include/mach/devices.h | 10 +-
arch/arm/mach-pxa/include/mach/mci_pxa2xx.h | 4 +-
arch/arm/mach-socfpga/cyclone5-generic.c | 6 +-
arch/arm/mach-stm32mp/ddrctrl.c | 2 +-
arch/arm/mach-tegra/tegra20-pmc.c | 2 +-
arch/arm/mach-tegra/tegra20-timer.c | 2 +-
arch/arm/mach-zynqmp/firmware-zynqmp.c | 2 +-
arch/kvx/lib/poweroff.c | 2 +-
arch/mips/mach-ar231x/ar231x_reset.c | 2 +-
arch/mips/mach-ath79/art.c | 6 +-
arch/mips/mach-xburst/include/mach/devices.h | 2 +-
arch/riscv/boards/beaglev/board.c | 2 +-
arch/riscv/boards/riscvemu/board.c | 2 +-
arch/riscv/cpu/core.c | 6 +-
arch/sandbox/board/board.c | 8 +-
arch/sandbox/board/console.c | 4 +-
arch/sandbox/board/devices.c | 4 +-
arch/sandbox/board/hostfile.c | 4 +-
arch/sandbox/board/led.c | 4 +-
arch/sandbox/board/power.c | 2 +-
arch/sandbox/board/watchdog.c | 2 +-
.../sandbox/mach-sandbox/include/mach/linux.h | 4 +-
arch/x86/mach-efi/clocksource.c | 2 +-
commands/detect.c | 2 +-
commands/devinfo.c | 6 +-
commands/devunbind.c | 2 +-
commands/drvinfo.c | 2 +-
commands/gpio.c | 2 +-
commands/miitool.c | 2 +-
common/blspec.c | 10 +-
common/boards/qemu-virt/board.c | 2 +-
common/complete.c | 6 +-
common/console.c | 4 +-
common/console_common.c | 6 +-
common/efi/payload/init.c | 2 +-
common/env.c | 4 +-
common/globalvar.c | 32 +-
common/oftree.c | 2 +-
common/partitions/efi.c | 3 +-
common/reset_source.c | 8 +-
common/serdev.c | 4 +-
common/state/backend_bucket_circular.c | 4 +-
common/state/backend_bucket_direct.c | 4 +-
common/state/backend_format_dtb.c | 4 +-
common/state/backend_format_raw.c | 4 +-
common/state/state.h | 14 +-
common/usbgadget.c | 2 +-
drivers/aiodev/am335x_adc.c | 2 +-
drivers/aiodev/core.c | 2 +-
drivers/aiodev/imx7d_adc.c | 12 +-
drivers/aiodev/imx_thermal.c | 2 +-
drivers/aiodev/lm75.c | 4 +-
drivers/aiodev/mc13xxx_adc.c | 2 +-
drivers/aiodev/qoriq_thermal.c | 4 +-
drivers/aiodev/rockchip_saradc.c | 2 +-
drivers/aiodev/st_gyro.c | 2 +-
drivers/aiodev/stm32-adc-core.c | 4 +-
drivers/aiodev/stm32-adc.c | 8 +-
drivers/amba/bus.c | 8 +-
drivers/ata/ahci.c | 6 +-
drivers/ata/ahci.h | 4 +-
drivers/ata/disk_ata_drive.c | 6 +-
drivers/ata/intf_platform_ide.c | 2 +-
drivers/ata/pata-imx.c | 4 +-
drivers/ata/sata-imx.c | 2 +-
drivers/ata/sata_mv.c | 2 +-
drivers/base/bus.c | 4 +-
drivers/base/driver.c | 79 ++---
drivers/base/platform.c | 6 +-
drivers/base/power.c | 4 +-
drivers/base/regmap/internal.h | 4 +-
drivers/base/regmap/regmap-mmio.c | 8 +-
drivers/base/regmap/regmap.c | 8 +-
drivers/base/resource.c | 28 +-
drivers/block/efi-block-io.c | 8 +-
drivers/bus/acpi.c | 16 +-
drivers/bus/imx-weim.c | 4 +-
drivers/bus/omap-gpmc.c | 10 +-
drivers/bus/ti-sysc.c | 2 +-
drivers/clk/bcm/clk-bcm2835-aux.c | 2 +-
drivers/clk/clk-ar933x.c | 2 +-
drivers/clk/clk-ar9344.c | 2 +-
drivers/clk/clk-bulk.c | 8 +-
drivers/clk/clk-composite.c | 18 +-
drivers/clk/clk-divider.c | 44 +--
drivers/clk/clk-fixed-factor.c | 16 +-
drivers/clk/clk-fixed.c | 2 +-
drivers/clk/clk-gate.c | 8 +-
drivers/clk/clk-mux.c | 22 +-
drivers/clk/clk-rpi.c | 6 +-
drivers/clk/clk-scmi.c | 4 +-
drivers/clk/clk-stm32f4.c | 23 +-
drivers/clk/clk-stm32mp1.c | 48 +--
drivers/clk/clk.c | 2 +-
drivers/clk/clkdev.c | 6 +-
drivers/clk/imx/clk-imx1.c | 2 +-
drivers/clk/imx/clk-imx21.c | 2 +-
drivers/clk/imx/clk-imx25.c | 2 +-
drivers/clk/imx/clk-imx27.c | 2 +-
drivers/clk/imx/clk-imx31.c | 2 +-
drivers/clk/imx/clk-imx35.c | 2 +-
drivers/clk/imx/clk-imx5.c | 15 +-
drivers/clk/imx/clk-imx6.c | 2 +-
drivers/clk/imx/clk-imx6sl.c | 2 +-
drivers/clk/imx/clk-imx6sx.c | 2 +-
drivers/clk/imx/clk-imx6ul.c | 2 +-
drivers/clk/imx/clk-imx7.c | 2 +-
drivers/clk/loongson/clk-ls1b200.c | 2 +-
drivers/clk/mvebu/common.c | 4 +-
drivers/clk/mvebu/corediv.c | 2 +-
drivers/clk/mxs/clk-imx23.c | 2 +-
drivers/clk/mxs/clk-imx28.c | 4 +-
drivers/clk/rockchip/clk-rk3399.c | 2 +-
drivers/clk/rockchip/clk-rk3568.c | 2 +-
drivers/clk/sifive/sifive-prci.c | 4 +-
drivers/clk/socfpga/clk.c | 5 +-
drivers/clk/starfive/jh7100-clkgen.c | 2 +-
drivers/clk/tegra/clk-tegra124.c | 2 +-
drivers/clk/tegra/clk-tegra20.c | 2 +-
drivers/clk/tegra/clk-tegra30.c | 2 +-
drivers/clk/zynq/clkc.c | 2 +-
drivers/clk/zynqmp/clkc.c | 4 +-
drivers/clocksource/arm_architected_timer.c | 2 +-
drivers/clocksource/arm_global_timer.c | 2 +-
drivers/clocksource/arm_smp_twd.c | 2 +-
drivers/clocksource/armv7m_systick.c | 2 +-
drivers/clocksource/bcm2835.c | 2 +-
drivers/clocksource/clps711x.c | 2 +-
drivers/clocksource/digic.c | 2 +-
drivers/clocksource/dw_apb_timer.c | 2 +-
drivers/clocksource/efi.c | 2 +-
drivers/clocksource/efi_x86.c | 2 +-
drivers/clocksource/kvx_timer.c | 2 +-
drivers/clocksource/mvebu.c | 2 +-
drivers/clocksource/nomadik.c | 2 +-
drivers/clocksource/orion.c | 2 +-
drivers/clocksource/rk_timer.c | 2 +-
drivers/clocksource/timer-atmel-pit.c | 2 +-
drivers/clocksource/timer-clint.c | 2 +-
drivers/clocksource/timer-imx-gpt.c | 2 +-
drivers/clocksource/timer-riscv.c | 2 +-
drivers/clocksource/timer-stm32.c | 2 +-
drivers/clocksource/timer-ti-32k.c | 2 +-
drivers/clocksource/timer-ti-dm.c | 2 +-
drivers/clocksource/uemd.c | 2 +-
drivers/crypto/caam/caam-blobgen.c | 8 +-
drivers/crypto/caam/caamrng.c | 10 +-
drivers/crypto/caam/ctrl.c | 14 +-
drivers/crypto/caam/error.c | 16 +-
drivers/crypto/caam/error.h | 2 +-
drivers/crypto/caam/intern.h | 14 +-
drivers/crypto/caam/jr.c | 12 +-
drivers/crypto/caam/jr.h | 4 +-
drivers/crypto/caam/rng_self_test.c | 6 +-
drivers/crypto/caam/rng_self_test.h | 3 +-
drivers/crypto/imx-scc/scc-blobgen.c | 2 +-
drivers/crypto/imx-scc/scc.c | 4 +-
drivers/crypto/imx-scc/scc.h | 2 +-
drivers/dma/apbh_dma.c | 2 +-
drivers/dma/map.c | 9 +-
drivers/eeprom/at24.c | 2 +-
drivers/eeprom/at25.c | 4 +-
drivers/efi/efi-device.c | 16 +-
drivers/firmware/altera_serial.c | 12 +-
drivers/firmware/arm_scmi/base.c | 4 +-
drivers/firmware/arm_scmi/bus.c | 14 +-
drivers/firmware/arm_scmi/common.h | 12 +-
drivers/firmware/arm_scmi/driver.c | 22 +-
drivers/firmware/arm_scmi/smc.c | 6 +-
drivers/firmware/arm_scmi/voltage.c | 4 +-
drivers/firmware/socfpga.c | 2 +-
drivers/firmware/zynqmp-fpga.c | 8 +-
drivers/fpga/fpga-bridge.c | 4 +-
drivers/fpga/socfpga-fpga2sdram-bridge.c | 4 +-
drivers/fpga/socfpga-hps2fpga-bridge.c | 4 +-
drivers/gpio/gpio-74164.c | 2 +-
drivers/gpio/gpio-74xx-mmio.c | 2 +-
drivers/gpio/gpio-ath79.c | 2 +-
drivers/gpio/gpio-clps711x.c | 2 +-
drivers/gpio/gpio-davinci.c | 2 +-
drivers/gpio/gpio-digic.c | 2 +-
drivers/gpio/gpio-dw.c | 4 +-
drivers/gpio/gpio-generic.c | 12 +-
drivers/gpio/gpio-imx.c | 2 +-
drivers/gpio/gpio-jz4740.c | 2 +-
drivers/gpio/gpio-latch.c | 2 +-
drivers/gpio/gpio-libftdi1.c | 4 +-
drivers/gpio/gpio-malta-fpga-i2c.c | 2 +-
drivers/gpio/gpio-mpc8xxx.c | 2 +-
drivers/gpio/gpio-mxs.c | 2 +-
drivers/gpio/gpio-omap.c | 2 +-
drivers/gpio/gpio-orion.c | 2 +-
drivers/gpio/gpio-pca953x.c | 2 +-
drivers/gpio/gpio-pcf857x.c | 2 +-
drivers/gpio/gpio-raspberrypi-exp.c | 2 +-
drivers/gpio/gpio-sifive.c | 2 +-
drivers/gpio/gpio-starfive-vic.c | 2 +-
drivers/gpio/gpio-stmpe.c | 2 +-
drivers/gpio/gpio-sx150x.c | 2 +-
drivers/gpio/gpio-tegra.c | 2 +-
drivers/gpio/gpio-vf610.c | 2 +-
drivers/gpio/gpio-zynq.c | 2 +-
drivers/gpio/gpiolib.c | 9 +-
drivers/hw_random/core.c | 4 +-
drivers/hw_random/dev-random.c | 2 +-
drivers/hw_random/mxc-rngc.c | 4 +-
drivers/hw_random/starfive-vic-rng.c | 4 +-
drivers/hw_random/stm32-rng.c | 4 +-
drivers/i2c/algos/i2c-algo-bit.c | 2 +-
drivers/i2c/busses/i2c-at91.c | 4 +-
drivers/i2c/busses/i2c-bcm283x.c | 6 +-
drivers/i2c/busses/i2c-cadence.c | 2 +-
drivers/i2c/busses/i2c-designware.c | 2 +-
drivers/i2c/busses/i2c-gpio.c | 2 +-
drivers/i2c/busses/i2c-imx.c | 5 +-
drivers/i2c/busses/i2c-mv64xxx.c | 4 +-
drivers/i2c/busses/i2c-omap.c | 2 +-
drivers/i2c/busses/i2c-rockchip.c | 16 +-
drivers/i2c/busses/i2c-stm32.c | 10 +-
drivers/i2c/busses/i2c-tegra.c | 4 +-
drivers/i2c/busses/i2c-versatile.c | 2 +-
drivers/i2c/i2c-mux.c | 4 +-
drivers/i2c/i2c.c | 18 +-
drivers/i2c/muxes/i2c-mux-pca954x.c | 2 +-
drivers/input/gpio_keys.c | 8 +-
drivers/input/imx_keypad.c | 4 +-
drivers/input/matrix-keymap.c | 9 +-
drivers/input/qt1070.c | 4 +-
drivers/input/twl6030_pwrbtn.c | 2 +-
drivers/input/virtio_input.c | 2 +-
drivers/led/led-gpio.c | 2 +-
drivers/led/led-pca955x.c | 2 +-
drivers/led/led-pwm.c | 2 +-
drivers/mci/arasan-sdhci.c | 4 +-
drivers/mci/atmel-mci-regs.h | 4 +-
drivers/mci/atmel-sdhci.c | 4 +-
drivers/mci/atmel-sdhci.h | 2 +-
drivers/mci/atmel_mci.c | 4 +-
drivers/mci/atmel_mci_common.c | 2 +-
drivers/mci/bcm2835-sdhost.c | 4 +-
drivers/mci/dove-sdhci.c | 4 +-
drivers/mci/dw_mmc.c | 6 +-
drivers/mci/imx-esdhc.c | 4 +-
drivers/mci/imx-esdhc.h | 2 +-
drivers/mci/imx.c | 4 +-
drivers/mci/mci-bcm2835.c | 6 +-
drivers/mci/mci-core.c | 10 +-
drivers/mci/mci_spi.c | 6 +-
drivers/mci/mmci.c | 6 +-
drivers/mci/mxs.c | 6 +-
drivers/mci/omap_hsmmc.c | 6 +-
drivers/mci/pxamci.c | 4 +-
drivers/mci/rockchip-dwcmshc-sdhci.c | 4 +-
drivers/mci/s3c.c | 9 +-
drivers/mci/sdhci.c | 6 +-
drivers/mci/stm32_sdmmc2.c | 6 +-
drivers/mci/tegra-sdmmc.c | 4 +-
drivers/memory/mc-tegra124.c | 2 +-
drivers/mfd/act8846.c | 2 +-
drivers/mfd/atmel-flexcom.c | 2 +-
drivers/mfd/axp20x-i2c.c | 2 +-
drivers/mfd/axp20x.c | 2 +-
drivers/mfd/core.c | 5 +-
drivers/mfd/da9053.c | 6 +-
drivers/mfd/da9063.c | 6 +-
drivers/mfd/lp3972.c | 2 +-
drivers/mfd/mc13xxx.c | 4 +-
drivers/mfd/mc34704.c | 2 +-
drivers/mfd/mc9sdz60.c | 2 +-
drivers/mfd/rave-sp.c | 18 +-
drivers/mfd/rk808.c | 2 +-
drivers/mfd/rn5t568.c | 5 +-
drivers/mfd/stm32-timers.c | 2 +-
drivers/mfd/stmpe-i2c.c | 4 +-
drivers/mfd/stpmic1.c | 2 +-
drivers/mfd/superio.c | 4 +-
drivers/mfd/syscon.c | 4 +-
drivers/mfd/twl4030.c | 2 +-
drivers/mfd/twl6030.c | 2 +-
drivers/misc/jtag.c | 6 +-
drivers/misc/mem.c | 4 +-
drivers/misc/sram.c | 2 +-
drivers/misc/starfive-pwrseq.c | 2 +-
drivers/misc/state.c | 2 +-
drivers/misc/storage-by-uuid.c | 6 +-
drivers/misc/ubootvar.c | 12 +-
drivers/mtd/core.c | 2 +-
drivers/mtd/devices/docg3.c | 4 +-
drivers/mtd/devices/docg3.h | 2 +-
drivers/mtd/devices/m25p80.c | 2 +-
drivers/mtd/devices/mtd_dataflash.c | 2 +-
drivers/mtd/devices/mtdram.c | 2 +-
drivers/mtd/nand/atmel_nand.c | 10 +-
drivers/mtd/nand/denali.h | 2 +-
drivers/mtd/nand/nand_denali_dt.c | 2 +-
drivers/mtd/nand/nand_fsl_ifc.c | 4 +-
drivers/mtd/nand/nand_imx.c | 4 +-
drivers/mtd/nand/nand_mrvl_nfc.c | 6 +-
drivers/mtd/nand/nand_mxs.c | 7 +-
drivers/mtd/nand/nand_omap_gpmc.c | 4 +-
drivers/mtd/nand/nand_orion.c | 2 +-
drivers/mtd/nand/nand_s3c24xx.c | 4 +-
drivers/mtd/nand/nomadik_nand.c | 2 +-
drivers/mtd/nand/omap_elm.c | 4 +-
drivers/mtd/nor/cfi_flash.c | 4 +-
drivers/mtd/nor/cfi_flash.h | 2 +-
drivers/mtd/spi-nor/cadence-quadspi.c | 10 +-
drivers/mtd/spi-nor/spi-nor.c | 2 +-
drivers/mtd/ubi/ubi.h | 4 +-
drivers/net/ag71xx.c | 12 +-
drivers/net/ar231x.c | 2 +-
drivers/net/arc_emac.c | 2 +-
drivers/net/at91_ether.c | 2 +-
drivers/net/bcmgenet.c | 6 +-
drivers/net/cpsw.c | 22 +-
drivers/net/cs8900.c | 4 +-
drivers/net/davinci_emac.c | 10 +-
drivers/net/designware.c | 8 +-
drivers/net/designware.h | 4 +-
drivers/net/designware_eqos.c | 14 +-
drivers/net/designware_eqos.h | 8 +-
drivers/net/designware_generic.c | 2 +-
drivers/net/designware_rockchip.c | 14 +-
drivers/net/designware_socfpga.c | 5 +-
drivers/net/designware_starfive.c | 2 +-
drivers/net/designware_stm32.c | 6 +-
drivers/net/designware_tegra186.c | 6 +-
drivers/net/dm9k.c | 24 +-
drivers/net/dsa.c | 2 +-
drivers/net/e1000/e1000.h | 4 +-
drivers/net/efi-snp.c | 2 +-
drivers/net/enc28j60.c | 4 +-
drivers/net/ep93xx.c | 2 +-
drivers/net/ethoc.c | 2 +-
drivers/net/fec_imx.c | 8 +-
drivers/net/fec_imx.h | 2 +-
drivers/net/fec_mpc5200.c | 4 +-
drivers/net/fsl-fman.c | 20 +-
drivers/net/gianfar.c | 12 +-
drivers/net/gianfar.h | 2 +-
drivers/net/ks8851_mll.c | 14 +-
drivers/net/ksz8864rmn.c | 2 +-
drivers/net/ksz8873.c | 8 +-
drivers/net/ksz9477.c | 10 +-
drivers/net/liteeth.c | 4 +-
drivers/net/macb.c | 12 +-
drivers/net/mvneta.c | 4 +-
drivers/net/orion-gbe.c | 10 +-
drivers/net/phy/ar8327.c | 4 +-
drivers/net/phy/at803x.c | 2 +-
drivers/net/phy/dp83867.c | 2 +-
drivers/net/phy/mdio-gpio.c | 4 +-
drivers/net/phy/mdio-mux-gpio.c | 2 +-
drivers/net/phy/mdio-mux.c | 2 +-
drivers/net/phy/mdio-mvebu.c | 4 +-
drivers/net/phy/mdio_bus.c | 8 +-
drivers/net/phy/micrel.c | 14 +-
drivers/net/phy/mv88e6xxx/chip.c | 2 +-
drivers/net/phy/mv88e6xxx/chip.h | 2 +-
drivers/net/phy/mv88e6xxx/port.c | 2 +-
drivers/net/phy/phy.c | 2 +-
drivers/net/phy/realtek.c | 2 +-
drivers/net/rtl8139.c | 2 +-
drivers/net/rtl8169.c | 2 +-
drivers/net/sja1105.c | 14 +-
drivers/net/smc91111.c | 2 +-
drivers/net/smc911x.c | 2 +-
drivers/net/tap.c | 2 +-
drivers/nvme/host/core.c | 2 +-
drivers/nvme/host/nvme.h | 4 +-
drivers/nvme/host/pci.c | 2 +-
drivers/nvmem/bsec.c | 6 +-
drivers/nvmem/core.c | 11 +-
drivers/nvmem/eeprom_93xx46.c | 2 +-
drivers/nvmem/kvx-otp-nv.c | 2 +-
drivers/nvmem/ocotp.c | 4 +-
drivers/nvmem/rave-sp-eeprom.c | 2 +-
drivers/nvmem/rmem.c | 4 +-
drivers/nvmem/snvs_lpgpr.c | 4 +-
drivers/nvmem/starfive-otp.c | 2 +-
drivers/of/barebox.c | 4 +-
drivers/of/base.c | 6 +-
drivers/of/device.c | 6 +-
drivers/of/of_gpio.c | 2 +-
drivers/of/of_path.c | 6 +-
drivers/of/platform.c | 40 +--
drivers/pci/bus.c | 8 +-
drivers/pci/pci-ecam-generic.c | 4 +-
drivers/pci/pci-efi.c | 6 +-
drivers/pci/pci-imx6.c | 18 +-
drivers/pci/pci-layerscape.c | 8 +-
drivers/pci/pci-mvebu.c | 4 +-
drivers/pci/pci-tegra.c | 6 +-
drivers/pci/pci.c | 2 +-
drivers/pci/pcie-designware-host.c | 2 +-
drivers/pci/pcie-designware.c | 2 +-
drivers/pci/pcie-designware.h | 2 +-
drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 4 +-
drivers/phy/phy-core.c | 16 +-
drivers/phy/phy-stm32-usbphyc.c | 10 +-
drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 10 +-
.../rockchip/phy-rockchip-naneng-combphy.c | 8 +-
drivers/phy/usb-nop-xceiv.c | 4 +-
drivers/pinctrl/imx-iomux-v1.c | 4 +-
drivers/pinctrl/imx-iomux-v2.c | 2 +-
drivers/pinctrl/imx-iomux-v3.c | 4 +-
drivers/pinctrl/mvebu/armada-370.c | 2 +-
drivers/pinctrl/mvebu/armada-xp.c | 2 +-
drivers/pinctrl/mvebu/common.c | 2 +-
drivers/pinctrl/mvebu/common.h | 2 +-
drivers/pinctrl/mvebu/dove.c | 2 +-
drivers/pinctrl/mvebu/kirkwood.c | 2 +-
drivers/pinctrl/pinctrl-at91-pio4.c | 4 +-
drivers/pinctrl/pinctrl-at91.c | 8 +-
drivers/pinctrl/pinctrl-bcm2835.c | 2 +-
drivers/pinctrl/pinctrl-mxs.c | 2 +-
drivers/pinctrl/pinctrl-rockchip.c | 8 +-
drivers/pinctrl/pinctrl-single.c | 2 +-
drivers/pinctrl/pinctrl-stm32.c | 11 +-
drivers/pinctrl/pinctrl-tegra-xusb.c | 6 +-
drivers/pinctrl/pinctrl-tegra20.c | 2 +-
drivers/pinctrl/pinctrl-tegra30.c | 2 +-
drivers/pinctrl/pinctrl-vf610.c | 2 +-
drivers/pinctrl/pinctrl.c | 4 +-
drivers/power/reset/gpio-poweroff.c | 2 +-
drivers/power/reset/gpio-restart.c | 2 +-
drivers/power/reset/htif-poweroff.c | 2 +-
drivers/power/reset/nvmem-reboot-mode.c | 2 +-
drivers/power/reset/reboot-mode.c | 2 +-
drivers/power/reset/stm32-reboot.c | 2 +-
drivers/power/reset/syscon-poweroff.c | 2 +-
drivers/power/reset/syscon-reboot-mode.c | 2 +-
drivers/power/reset/syscon-reboot.c | 2 +-
drivers/pwm/core.c | 6 +-
drivers/pwm/pwm-atmel.c | 4 +-
drivers/pwm/pwm-imx.c | 2 +-
drivers/pwm/pwm-mxs.c | 2 +-
drivers/pwm/pwm-stm32.c | 2 +-
drivers/pwm/pxa_pwm.c | 2 +-
drivers/regulator/anatop-regulator.c | 2 +-
drivers/regulator/bcm2835.c | 2 +-
drivers/regulator/core.c | 15 +-
drivers/regulator/fixed.c | 2 +-
drivers/regulator/of_regulator.c | 2 +-
drivers/regulator/pfuze.c | 4 +-
drivers/regulator/rk808-regulator.c | 6 +-
drivers/regulator/scmi-regulator.c | 2 +-
drivers/regulator/stm32-pwr.c | 2 +-
drivers/regulator/stm32-vrefbuf.c | 6 +-
drivers/regulator/stpmic1_regulator.c | 4 +-
drivers/remoteproc/imx_rproc.c | 6 +-
drivers/remoteproc/remoteproc_core.c | 8 +-
drivers/remoteproc/remoteproc_elf_loader.c | 2 +-
drivers/remoteproc/stm32_rproc.c | 6 +-
drivers/reset/core.c | 14 +-
drivers/reset/reset-imx7.c | 2 +-
drivers/reset/reset-scmi.c | 2 +-
drivers/reset/reset-simple.c | 2 +-
drivers/reset/reset-socfpga.c | 2 +-
drivers/reset/reset-starfive-vic.c | 2 +-
drivers/rtc/class.c | 2 +-
drivers/rtc/rtc-abracon.c | 2 +-
drivers/rtc/rtc-ds1307.c | 6 +-
drivers/rtc/rtc-imxdi.c | 4 +-
drivers/rtc/rtc-jz4740.c | 2 +-
drivers/rtc/rtc-pcf85363.c | 4 +-
drivers/serial/arm_dcc.c | 4 +-
drivers/serial/atmel.c | 4 +-
drivers/serial/efi-stdio.c | 2 +-
drivers/serial/linux_console.c | 8 +-
drivers/serial/serial_altera.c | 2 +-
drivers/serial/serial_altera_jtag.c | 2 +-
drivers/serial/serial_ar933x.c | 2 +-
drivers/serial/serial_auart.c | 2 +-
drivers/serial/serial_cadence.c | 2 +-
drivers/serial/serial_clps711x.c | 2 +-
drivers/serial/serial_digic.c | 2 +-
drivers/serial/serial_imx.c | 2 +-
drivers/serial/serial_litex.c | 2 +-
drivers/serial/serial_lpuart.c | 2 +-
drivers/serial/serial_mpc5xxx.c | 12 +-
drivers/serial/serial_ns16550.c | 8 +-
drivers/serial/serial_ns16550_pci.c | 2 +-
drivers/serial/serial_omap4_usbboot.c | 2 +-
drivers/serial/serial_pl010.c | 2 +-
drivers/serial/serial_pxa.c | 2 +-
drivers/serial/serial_s3c.c | 2 +-
drivers/serial/serial_sbi.c | 2 +-
drivers/serial/serial_sifive.c | 2 +-
drivers/serial/serial_stm32.c | 2 +-
drivers/serial/stm-serial.c | 2 +-
drivers/soc/imx/gpcv2.c | 8 +-
drivers/soc/imx/imx8m-featctrl.c | 2 +-
drivers/soc/kvx/kvx_socinfo.c | 2 +-
drivers/soc/rockchip/io-domain.c | 4 +-
drivers/soc/sifive/sifive_l2_cache.c | 4 +-
drivers/sound/gpio-beeper.c | 4 +-
drivers/sound/pwm-beeper.c | 4 +-
drivers/sound/sdl.c | 2 +-
drivers/spi/altera_spi.c | 4 +-
drivers/spi/ath79_spi.c | 6 +-
drivers/spi/atmel-quadspi.c | 2 +-
drivers/spi/atmel_spi.c | 2 +-
drivers/spi/dspi_spi.c | 6 +-
drivers/spi/gpio_spi.c | 4 +-
drivers/spi/imx_spi.c | 2 +-
drivers/spi/litex_spiflash.c | 6 +-
drivers/spi/mvebu_spi.c | 2 +-
drivers/spi/mxs_spi.c | 2 +-
drivers/spi/omap3_spi.c | 5 +-
drivers/spi/spi-fsl-dspi.c | 4 +-
drivers/spi/spi-fsl-qspi.c | 6 +-
drivers/spi/spi-nxp-fspi.c | 11 +-
drivers/spi/spi-sifive.c | 6 +-
drivers/spi/spi.c | 4 +-
drivers/spi/stm32_spi.c | 8 +-
drivers/spi/zynq_qspi.c | 4 +-
drivers/usb/core/hub.c | 2 +-
drivers/usb/core/usb.c | 8 +-
drivers/usb/dwc2/core.h | 2 +-
drivers/usb/dwc2/dwc2.c | 4 +-
drivers/usb/dwc2/host.c | 4 +-
drivers/usb/dwc3/core.c | 16 +-
drivers/usb/dwc3/core.h | 4 +-
drivers/usb/dwc3/dwc3-of-simple.c | 6 +-
drivers/usb/dwc3/gadget.c | 2 +-
drivers/usb/dwc3/host.c | 2 +-
drivers/usb/gadget/at91_udc.c | 2 +-
drivers/usb/gadget/at91_udc.h | 2 +-
drivers/usb/gadget/fsl_udc.c | 8 +-
drivers/usb/gadget/pxa27x_udc.c | 2 +-
drivers/usb/gadget/pxa27x_udc.h | 2 +-
drivers/usb/gadget/storage_common.h | 2 +-
drivers/usb/gadget/udc-core.c | 9 +-
drivers/usb/host/ehci-atmel.c | 6 +-
drivers/usb/host/ehci-hcd.c | 10 +-
drivers/usb/host/ohci-at91.c | 8 +-
drivers/usb/host/ohci-hcd.c | 2 +-
drivers/usb/host/xhci.c | 6 +-
drivers/usb/host/xhci.h | 2 +-
drivers/usb/imx/chipidea-imx.c | 8 +-
drivers/usb/imx/imx-usb-misc.c | 6 +-
drivers/usb/imx/imx-usb-phy.c | 4 +-
drivers/usb/misc/usb251xb.c | 10 +-
drivers/usb/musb/am35x-phy-control.h | 2 +-
drivers/usb/musb/musb_am335x.c | 2 +-
drivers/usb/musb/musb_core.h | 2 +-
drivers/usb/musb/musb_dsps.c | 10 +-
drivers/usb/musb/phy-am335x-control.c | 6 +-
drivers/usb/musb/phy-am335x.c | 2 +-
drivers/usb/otg/otgdev.c | 8 +-
drivers/usb/storage/transport.c | 6 +-
drivers/usb/storage/usb.c | 24 +-
drivers/video/atmel_hlcdfb.c | 2 +-
drivers/video/atmel_lcdfb.c | 2 +-
drivers/video/atmel_lcdfb.h | 4 +-
drivers/video/atmel_lcdfb_core.c | 13 +-
drivers/video/backlight-pwm.c | 6 +-
drivers/video/bcm2835.c | 2 +-
drivers/video/bochs/bochs_hw.c | 3 +-
drivers/video/bochs/bochs_hw.h | 4 +-
drivers/video/bochs/bochs_isa.c | 2 +-
drivers/video/efi_gop.c | 2 +-
drivers/video/fb.c | 6 +-
drivers/video/imx-ipu-fb.c | 4 +-
drivers/video/imx-ipu-v3/imx-hdmi.c | 4 +-
drivers/video/imx-ipu-v3/imx-ldb.c | 4 +-
drivers/video/imx-ipu-v3/imx-pd.c | 4 +-
drivers/video/imx-ipu-v3/ipu-common.c | 10 +-
drivers/video/imx-ipu-v3/ipu-dc.c | 4 +-
drivers/video/imx-ipu-v3/ipu-di.c | 2 +-
drivers/video/imx-ipu-v3/ipu-dmfc.c | 6 +-
drivers/video/imx-ipu-v3/ipu-dp.c | 4 +-
drivers/video/imx-ipu-v3/ipu-prv.h | 15 +-
drivers/video/imx-ipu-v3/ipufb.c | 6 +-
drivers/video/imx-ipu-v3/ipuv3-plane.c | 2 +-
drivers/video/imx.c | 6 +-
drivers/video/mipi_dbi.c | 2 +-
drivers/video/mtl017.c | 4 +-
drivers/video/omap.c | 4 +-
drivers/video/panel-ilitek-ili9341.c | 10 +-
drivers/video/pxa.c | 4 +-
drivers/video/rave-sp-backlight.c | 2 +-
drivers/video/s3c24xx.c | 6 +-
drivers/video/sdl.c | 4 +-
drivers/video/simple-panel.c | 4 +-
drivers/video/simplefb-client.c | 6 +-
drivers/video/ssd1307fb.c | 2 +-
drivers/video/stm.c | 4 +-
drivers/video/stm32_ltdc.c | 4 +-
drivers/video/tc358767.c | 6 +-
drivers/virtio/virtio.c | 8 +-
drivers/virtio/virtio_mmio.c | 4 +-
drivers/virtio/virtio_pci_modern.c | 2 +-
drivers/virtio/virtio_ring.c | 2 +-
drivers/w1/masters/w1-gpio.c | 4 +-
drivers/w1/w1.c | 8 +-
drivers/w1/w1.h | 6 +-
drivers/watchdog/ar9344_wdt.c | 4 +-
drivers/watchdog/at91sam9_wdt.c | 2 +-
drivers/watchdog/bcm2835_wdt.c | 4 +-
drivers/watchdog/davinci_wdt.c | 2 +-
drivers/watchdog/dw_wdt.c | 2 +-
drivers/watchdog/efi_wdt.c | 4 +-
drivers/watchdog/f71808e_wdt.c | 4 +-
drivers/watchdog/gpio_wdt.c | 2 +-
drivers/watchdog/im28wd.c | 4 +-
drivers/watchdog/imxwd.c | 4 +-
drivers/watchdog/jz4740.c | 2 +-
drivers/watchdog/kvx_wdt.c | 2 +-
drivers/watchdog/omap_wdt.c | 2 +-
drivers/watchdog/orion_wdt.c | 2 +-
drivers/watchdog/rave-sp-wdt.c | 2 +-
drivers/watchdog/rn5t568_wdt.c | 2 +-
drivers/watchdog/starfive_wdt.c | 2 +-
drivers/watchdog/stm32_iwdg.c | 2 +-
drivers/watchdog/stpmic1_wdt.c | 2 +-
drivers/watchdog/wd_core.c | 4 +-
drivers/watchdog/wdat_wdt.c | 2 +-
fs/bpkfs.c | 22 +-
fs/cramfs/cramfs.c | 6 +-
fs/devfs-core.c | 10 +-
fs/devfs.c | 31 +-
fs/efi.c | 44 +--
fs/efivarfs.c | 30 +-
fs/ext4/ext4fs.h | 2 +-
fs/ext4/ext_barebox.c | 6 +-
fs/fat/fat.c | 33 +-
fs/fs.c | 10 +-
fs/jffs2/fs.c | 10 +-
fs/nfs.c | 18 +-
fs/omap4_usbbootfs.c | 25 +-
fs/pstore/fs.c | 20 +-
fs/pstore/ram.c | 6 +-
fs/ramfs.c | 13 +-
fs/ratpfs.c | 44 +--
fs/smhfs.c | 26 +-
fs/squashfs/squashfs.c | 12 +-
fs/squashfs/squashfs_fs_sb.h | 2 +-
fs/tftp.c | 23 +-
fs/ubifs/super.c | 3 +-
fs/ubifs/ubifs.c | 10 +-
fs/ubifs/ubifs.h | 5 +-
fs/ubootvarfs.c | 12 +-
fs/uimagefs.c | 24 +-
include/aiodev.h | 6 +-
include/ata_drive.h | 6 +-
include/blobgen.h | 4 +-
include/block.h | 2 +-
include/blspec.h | 2 +-
include/console.h | 10 +-
include/dirent.h | 2 +-
include/dma.h | 8 +-
include/driver.h | 131 ++++----
include/dsa.h | 4 +-
include/efi/efi-device.h | 4 +-
include/fb.h | 2 +-
include/featctrl.h | 2 +-
include/firmware.h | 2 +-
include/fpga-bridge.h | 4 +-
include/fpga-mgr.h | 2 +-
include/fs.h | 55 ++--
include/globalvar.h | 7 +-
include/gpio.h | 9 +-
include/gpiod.h | 2 +-
include/hwspinlock.h | 2 +-
include/i2c/i2c-mux.h | 2 +-
include/i2c/i2c.h | 7 +-
include/input/matrix_keypad.h | 2 +-
include/linux/amba/bus.h | 8 +-
include/linux/basic_mmio_gpio.h | 2 +-
include/linux/clk.h | 161 +++++-----
include/linux/clkdev.h | 4 +-
include/linux/font.h | 8 +-
include/linux/hw_random.h | 4 +-
include/linux/mdio-mux.h | 2 +-
include/linux/mfd/axp20x.h | 2 +-
include/linux/mfd/core.h | 5 +-
include/linux/mtd/mtd.h | 2 +-
include/linux/mtd/spi-nor.h | 2 +-
include/linux/nvmem-consumer.h | 14 +-
include/linux/nvmem-provider.h | 2 +-
include/linux/pci.h | 6 +-
include/linux/phy.h | 8 +-
include/linux/phy/phy.h | 39 ++-
include/linux/printk.h | 14 +-
include/linux/reboot-mode.h | 4 +-
include/linux/regulator/of_regulator.h | 6 +-
include/linux/remoteproc.h | 4 +-
include/linux/reset.h | 25 +-
include/linux/rtc.h | 4 +-
include/linux/scmi_protocol.h | 14 +-
include/linux/virtio.h | 6 +-
include/mci.h | 6 +-
include/mfd/mc13xxx.h | 5 +-
include/net.h | 6 +-
include/of.h | 45 +--
include/of_device.h | 18 +-
include/param.h | 286 ++++++++++--------
include/pinctrl.h | 14 +-
include/pm_domain.h | 8 +-
include/printk.h | 4 +-
include/pwm.h | 4 +-
include/regmap.h | 10 +-
include/regulator.h | 13 +-
include/reset_source.h | 8 +-
include/serdev.h | 2 +-
include/soc/imx8m/featctrl.h | 4 +-
include/soc/stm32/reboot.h | 6 +-
include/spi/spi.h | 6 +-
include/superio.h | 4 +-
include/usb/chipidea-imx.h | 8 +-
include/usb/ehci.h | 4 +-
include/usb/fsl_usb2.h | 2 +-
include/usb/gadget.h | 12 +-
include/usb/musb.h | 2 +-
include/usb/phy.h | 2 +-
include/usb/usb.h | 6 +-
include/video/backlight.h | 2 +-
include/video/mipi_dbi.h | 2 +-
include/watchdog.h | 4 +-
lib/blobgen.c | 4 +-
lib/fonts/fonts.c | 8 +-
lib/hexdump.c | 2 +-
lib/parameter.c | 143 +++++----
net/eth.c | 2 +-
802 files changed, 2766 insertions(+), 2596 deletions(-)
diff --git a/Documentation/devel/porting.rst b/Documentation/devel/porting.rst
index 7702fee7bb..8af0456ab2 100644
--- a/Documentation/devel/porting.rst
+++ b/Documentation/devel/porting.rst
@@ -247,7 +247,7 @@ If you need board-specific setup that's not covered by any upstream device
tree binding, you can write a driver that matches against your board's
``/compatible``::
- static int my_board_probe(struct device_d *dev)
+ static int my_board_probe(struct device *dev)
{
/* Do some board-specific setup */
return 0;
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);
}
diff --git a/commands/detect.c b/commands/detect.c
index 70eca57537..ad1745adce 100644
--- a/commands/detect.c
+++ b/commands/detect.c
@@ -12,7 +12,7 @@
static int do_detect(int argc, char *argv[])
{
- struct device_d *dev;
+ struct device *dev;
int opt, i, ret, err;
int option_list = 0;
int option_all = 0;
diff --git a/commands/devinfo.c b/commands/devinfo.c
index a0addfbcf1..2487786c71 100644
--- a/commands/devinfo.c
+++ b/commands/devinfo.c
@@ -6,9 +6,9 @@
#include <complete.h>
#include <driver.h>
-static int do_devinfo_subtree(struct device_d *dev, int depth)
+static int do_devinfo_subtree(struct device *dev, int depth)
{
- struct device_d *child;
+ struct device *child;
struct cdev *cdev, *cdevl;
int i;
@@ -46,7 +46,7 @@ static int do_devinfo_subtree(struct device_d *dev, int depth)
static int do_devinfo(int argc, char *argv[])
{
- struct device_d *dev;
+ struct device *dev;
struct param_d *param;
int i;
int first;
diff --git a/commands/devunbind.c b/commands/devunbind.c
index 3f9cd7b849..dab7f834db 100644
--- a/commands/devunbind.c
+++ b/commands/devunbind.c
@@ -10,7 +10,7 @@
static int do_devunbind(int argc, char *argv[])
{
bool unregister = false;
- struct device_d *dev;
+ struct device *dev;
int ret = COMMAND_SUCCESS, i, opt;
while ((opt = getopt(argc, argv, "fl")) > 0) {
diff --git a/commands/drvinfo.c b/commands/drvinfo.c
index 9f8f971ee9..4961f4c7dd 100644
--- a/commands/drvinfo.c
+++ b/commands/drvinfo.c
@@ -9,7 +9,7 @@
static int do_drvinfo(int argc, char *argv[])
{
struct driver_d *drv;
- struct device_d *dev;
+ struct device *dev;
printf("Driver\tDevice(s)\n");
printf("--------------------\n");
diff --git a/commands/gpio.c b/commands/gpio.c
index 5e5eb20583..caabb5adc0 100644
--- a/commands/gpio.c
+++ b/commands/gpio.c
@@ -10,7 +10,7 @@ static int get_gpio_and_value(int argc, char *argv[],
int *gpio, int *value)
{
struct gpio_chip *chip = NULL;
- struct device_d *dev;
+ struct device *dev;
int count = 1;
int ret = 0;
int opt;
diff --git a/commands/miitool.c b/commands/miitool.c
index 47494f5089..24e383736a 100644
--- a/commands/miitool.c
+++ b/commands/miitool.c
@@ -217,7 +217,7 @@ static int show_basic_mii(struct mii_bus *mii, struct phy_device *phydev,
return 0;
}
-static void mdiobus_show(struct device_d *dev, const char *phydevname,
+static void mdiobus_show(struct device *dev, const char *phydevname,
int verbose)
{
struct mii_bus *mii = to_mii_bus(dev);
diff --git a/common/blspec.c b/common/blspec.c
index 9ae7b49a77..e023259bac 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -622,7 +622,7 @@ err_out:
*/
static int blspec_scan_ubi(struct bootentries *bootentries, struct cdev *cdev)
{
- struct device_d *child;
+ struct device *child;
int ret, found = 0;
pr_debug("%s: %s\n", __func__, cdev->name);
@@ -696,7 +696,7 @@ static int blspec_scan_cdev(struct bootentries *bootentries, struct cdev *cdev)
*/
int blspec_scan_devices(struct bootentries *bootentries)
{
- struct device_d *dev;
+ struct device *dev;
struct block_device *bdev;
int ret, found = 0;
@@ -724,9 +724,9 @@ int blspec_scan_devices(struct bootentries *bootentries)
* Returns the number of entries found or a negative error code if some unexpected
* error occurred.
*/
-int blspec_scan_device(struct bootentries *bootentries, struct device_d *dev)
+int blspec_scan_device(struct bootentries *bootentries, struct device *dev)
{
- struct device_d *child;
+ struct device *child;
struct cdev *cdev;
int ret, found = 0;
@@ -788,7 +788,7 @@ int blspec_scan_device(struct bootentries *bootentries, struct device_d *dev)
*/
int blspec_scan_devicename(struct bootentries *bootentries, const char *devname)
{
- struct device_d *dev;
+ struct device *dev;
struct cdev *cdev;
pr_debug("%s: %s\n", __func__, devname);
diff --git a/common/boards/qemu-virt/board.c b/common/boards/qemu-virt/board.c
index bfda86569b..5062ad2c7f 100644
--- a/common/boards/qemu-virt/board.c
+++ b/common/boards/qemu-virt/board.c
@@ -36,7 +36,7 @@ static inline void arm_virt_init(void) {}
extern char __dtb_overlay_of_flash_start[];
-static int virt_probe(struct device_d *dev)
+static int virt_probe(struct device *dev)
{
struct device_node *overlay;
void (*init)(void);
diff --git a/common/complete.c b/common/complete.c
index ab3c985493..327e82dd0a 100644
--- a/common/complete.c
+++ b/common/complete.c
@@ -135,7 +135,7 @@ EXPORT_SYMBOL(command_complete);
int device_complete(struct string_list *sl, char *instr)
{
- struct device_d *dev;
+ struct device *dev;
int len;
if (!instr)
@@ -154,7 +154,7 @@ int device_complete(struct string_list *sl, char *instr)
}
EXPORT_SYMBOL(device_complete);
-static int device_param_complete(struct device_d *dev, struct string_list *sl,
+static int device_param_complete(struct device *dev, struct string_list *sl,
char *instr, int eval)
{
struct param_d *param;
@@ -267,7 +267,7 @@ EXPORT_SYMBOL(tutorial_complete);
static int env_param_complete(struct string_list *sl, char *instr, int eval)
{
- struct device_d *dev;
+ struct device *dev;
struct variable_d *var;
struct env_context *c;
int len;
diff --git a/common/console.c b/common/console.c
index 56caa12b45..c09c8e7d44 100644
--- a/common/console.c
+++ b/common/console.c
@@ -309,7 +309,7 @@ static ssize_t fops_write(struct cdev* dev, const void* buf, size_t count,
int console_register(struct console_device *newcdev)
{
struct device_node *serdev_node = console_is_serdev_node(newcdev);
- struct device_d *dev = &newcdev->class_dev;
+ struct device *dev = &newcdev->class_dev;
int activate = 0, ret;
unsigned baudrate = CONFIG_BAUDRATE;
@@ -406,7 +406,7 @@ EXPORT_SYMBOL(console_register);
int console_unregister(struct console_device *cdev)
{
- struct device_d *dev = &cdev->class_dev;
+ struct device *dev = &cdev->class_dev;
int status;
/*
diff --git a/common/console_common.c b/common/console_common.c
index ca1dad0f15..866a7cbf65 100644
--- a/common/console_common.c
+++ b/common/console_common.c
@@ -134,7 +134,7 @@ int pr_print(int level, const char *fmt, ...)
return i;
}
-int dev_printf(int level, const struct device_d *dev, const char *format, ...)
+int dev_printf(int level, const struct device *dev, const char *format, ...)
{
va_list args;
int ret = 0;
@@ -284,7 +284,7 @@ int vprintf(const char *fmt, va_list args)
}
EXPORT_SYMBOL(vprintf);
-struct console_device *console_get_by_dev(struct device_d *dev)
+struct console_device *console_get_by_dev(struct device *dev)
{
struct console_device *cdev;
@@ -336,7 +336,7 @@ EXPORT_SYMBOL(console_get_first_active);
struct console_device *of_console_get_by_alias(const char *alias)
{
struct device_node *node;
- struct device_d *dev;
+ struct device *dev;
node = of_find_node_by_alias(NULL, alias);
if (!node)
diff --git a/common/efi/payload/init.c b/common/efi/payload/init.c
index 6976285fb3..3ee5d66d60 100644
--- a/common/efi/payload/init.c
+++ b/common/efi/payload/init.c
@@ -271,7 +271,7 @@ void efi_main(efi_handle_t image, efi_system_table_t *sys_table)
static int efi_core_init(void)
{
- struct device_d *dev;
+ struct device *dev;
int ret;
dev = device_alloc("efi-cs", DEVICE_ID_SINGLE);
diff --git a/common/env.c b/common/env.c
index 9e9988e415..d673b061ab 100644
--- a/common/env.c
+++ b/common/env.c
@@ -127,7 +127,7 @@ static const char *dev_getenv(const char *name)
{
const char *pos, *val, *dot, *varname;
char *devname;
- struct device_d *dev;
+ struct device *dev;
pos = name;
@@ -215,7 +215,7 @@ static int dev_setenv(const char *name, const char *val)
{
const char *pos, *dot, *varname;
char *devname;
- struct device_d *dev;
+ struct device *dev;
pos = name;
diff --git a/common/globalvar.c b/common/globalvar.c
index 4fd6361c2f..b3a7f6d755 100644
--- a/common/globalvar.c
+++ b/common/globalvar.c
@@ -16,12 +16,12 @@
static int nv_dirty;
-struct device_d global_device = {
+struct device global_device = {
.name = "global",
.id = DEVICE_ID_SINGLE,
};
-struct device_d nv_device = {
+struct device nv_device = {
.name = "nv",
.id = DEVICE_ID_SINGLE,
};
@@ -101,7 +101,7 @@ static int nv_save(const char *name, const char *val)
* This function initializes a newly created device parameter from the corresponding
* nv.dev.<devname>.<paramname> variable.
*/
-void dev_param_init_from_nv(struct device_d *dev, const char *name)
+void dev_param_init_from_nv(struct device *dev, const char *name)
{
char *nvname;
const char *val;
@@ -142,7 +142,7 @@ void dev_param_init_from_nv(struct device_d *dev, const char *name)
* parameter name. A negative error code is returned when the incoming string belongs to
* the device namespace, but cannot be dispatched.
*/
-static int nvvar_device_dispatch(const char *name, struct device_d **dev,
+static int nvvar_device_dispatch(const char *name, struct device **dev,
const char **pname)
{
char *devname;
@@ -177,7 +177,8 @@ static int nvvar_device_dispatch(const char *name, struct device_d **dev,
return 1;
}
-static int nv_set(struct device_d *dev, struct param_d *p, const char *name, const char *val)
+static int nv_set(struct device *dev, struct param_d *p, const char *name,
+ const char *val)
{
int ret;
@@ -195,12 +196,13 @@ static int nv_set(struct device_d *dev, struct param_d *p, const char *name, con
return 0;
}
-static const char *nv_param_get(struct device_d *dev, struct param_d *p)
+static const char *nv_param_get(struct device *dev, struct param_d *p)
{
return p->value ? p->value : "";
}
-static int nv_param_set(struct device_d *dev, struct param_d *p, const char *val)
+static int nv_param_set(struct device *dev, struct param_d *p,
+ const char *val)
{
int ret;
@@ -214,7 +216,7 @@ static int nv_param_set(struct device_d *dev, struct param_d *p, const char *val
static int __nvvar_add(const char *name, const char *value)
{
struct param_d *p;
- struct device_d *dev = NULL;
+ struct device *dev = NULL;
const char *pname;
int ret;
@@ -375,7 +377,7 @@ int nvvar_load(void)
return 0;
}
-static void device_param_print(struct device_d *dev)
+static void device_param_print(struct device *dev)
{
struct param_d *param;
@@ -452,9 +454,10 @@ void globalvar_set(const char *name, const char *val)
dev_set_param(&global_device, name, val);
}
-static int globalvar_simple_set(struct device_d *dev, struct param_d *p, const char *val)
+static int globalvar_simple_set(struct device *dev, struct param_d *p,
+ const char *val)
{
- struct device_d *rdev;
+ struct device *rdev;
const char *pname = NULL;
int ret;
@@ -744,8 +747,9 @@ static void nv_exit(void)
}
predevshutdown_exitcall(nv_exit);
-static int nv_global_param_complete(struct device_d *dev, struct string_list *sl,
- char *instr, int eval)
+static int nv_global_param_complete(struct device *dev,
+ struct string_list *sl,
+ char *instr, int eval)
{
struct param_d *param;
int len;
@@ -766,7 +770,7 @@ static int nv_global_param_complete(struct device_d *dev, struct string_list *sl
int nv_complete(struct string_list *sl, char *instr)
{
- struct device_d *dev;
+ struct device *dev;
struct param_d *param;
char *str;
int len;
diff --git a/common/oftree.c b/common/oftree.c
index 4cb74067de..4beadc5aaa 100644
--- a/common/oftree.c
+++ b/common/oftree.c
@@ -205,7 +205,7 @@ static int of_fixup_bootargs(struct device_node *root, void *unused)
struct device_node *node;
int err;
int instance = reset_source_get_instance();
- struct device_d *dev;
+ struct device *dev;
const char *serialno;
const char *compat;
diff --git a/common/partitions/efi.c b/common/partitions/efi.c
index 0f3f790539..ffdbd9a56f 100644
--- a/common/partitions/efi.c
+++ b/common/partitions/efi.c
@@ -249,7 +249,8 @@ is_pte_valid(const gpt_entry *pte, const u64 lastlba)
*
*/
static void
-compare_gpts(struct device_d *dev, gpt_header *pgpt, gpt_header *agpt, u64 lastlba)
+compare_gpts(struct device *dev, gpt_header *pgpt, gpt_header *agpt,
+ u64 lastlba)
{
int error_found = 0;
if (!pgpt || !agpt)
diff --git a/common/reset_source.c b/common/reset_source.c
index 90a34f5f50..f28be90dcb 100644
--- a/common/reset_source.c
+++ b/common/reset_source.c
@@ -25,7 +25,7 @@ static const char * const reset_src_names[] = {
static enum reset_src_type reset_source;
static unsigned int reset_source_priority;
static int reset_source_instance;
-static struct device_d *reset_source_device;
+static struct device *reset_source_device;
enum reset_src_type reset_source_get(void)
{
@@ -45,13 +45,13 @@ int reset_source_get_instance(void)
}
EXPORT_SYMBOL(reset_source_get_instance);
-struct device_d *reset_source_get_device(void)
+struct device *reset_source_get_device(void)
{
return reset_source_device;
}
EXPORT_SYMBOL(reset_source_get_device);
-static void __reset_source_set(struct device_d *dev,
+static void __reset_source_set(struct device *dev,
enum reset_src_type st,
unsigned int priority, int instance)
{
@@ -74,7 +74,7 @@ void reset_source_set_prinst(enum reset_src_type st,
}
EXPORT_SYMBOL(reset_source_set_prinst);
-void reset_source_set_device(struct device_d *dev, enum reset_src_type st)
+void reset_source_set_device(struct device *dev, enum reset_src_type st)
{
unsigned int priority = RESET_SOURCE_DEFAULT_PRIORITY;
diff --git a/common/serdev.c b/common/serdev.c
index 1d328c6a33..5399a20627 100644
--- a/common/serdev.c
+++ b/common/serdev.c
@@ -132,7 +132,7 @@ static int serdev_device_reader_receive_buf(struct serdev_device *serdev,
const unsigned char *buf,
size_t size)
{
- struct device_d *dev = serdev->dev;
+ struct device *dev = serdev->dev;
struct serdev_device_reader *r = dev->priv;
const size_t room = min(r->capacity - r->len, size);
@@ -186,7 +186,7 @@ int serdev_device_reader_open(struct serdev_device *serdev, size_t capacity)
int serdev_device_read(struct serdev_device *serdev, unsigned char *buf,
size_t count, unsigned long timeout)
{
- struct device_d *dev = serdev->dev;
+ struct device *dev = serdev->dev;
struct serdev_device_reader *r = dev->priv;
int ret;
diff --git a/common/state/backend_bucket_circular.c b/common/state/backend_bucket_circular.c
index 735510e0d3..2ac5bf6a82 100644
--- a/common/state/backend_bucket_circular.c
+++ b/common/state/backend_bucket_circular.c
@@ -62,7 +62,7 @@ struct state_backend_storage_bucket_circular {
#endif
/* For outputs */
- struct device_d *dev;
+ struct device *dev;
};
/*
@@ -456,7 +456,7 @@ static int bucket_circular_is_block_bad(struct state_backend_storage_bucket_circ
}
#endif
-int state_backend_bucket_circular_create(struct device_d *dev, const char *path,
+int state_backend_bucket_circular_create(struct device *dev, const char *path,
struct state_backend_storage_bucket **bucket,
unsigned int eraseblock,
ssize_t writesize,
diff --git a/common/state/backend_bucket_direct.c b/common/state/backend_bucket_direct.c
index 117cdfb46c..3818c6f0b0 100644
--- a/common/state/backend_bucket_direct.c
+++ b/common/state/backend_bucket_direct.c
@@ -29,7 +29,7 @@ struct state_backend_storage_bucket_direct {
int fd;
- struct device_d *dev;
+ struct device *dev;
};
struct __attribute__((__packed__)) state_backend_storage_bucket_direct_meta {
@@ -162,7 +162,7 @@ static void state_backend_bucket_direct_free(struct
free(direct);
}
-int state_backend_bucket_direct_create(struct device_d *dev, const char *path,
+int state_backend_bucket_direct_create(struct device *dev, const char *path,
struct state_backend_storage_bucket **bucket,
off_t offset, ssize_t max_size)
{
diff --git a/common/state/backend_format_dtb.c b/common/state/backend_format_dtb.c
index d0fc948859..b41b896aac 100644
--- a/common/state/backend_format_dtb.c
+++ b/common/state/backend_format_dtb.c
@@ -28,7 +28,7 @@ struct state_backend_format_dtb {
struct device_node *root;
/* For outputs */
- struct device_d *dev;
+ struct device *dev;
};
static inline struct state_backend_format_dtb *get_format_dtb(struct
@@ -131,7 +131,7 @@ static void state_backend_format_dtb_free(struct state_backend_format *format)
}
int backend_format_dtb_create(struct state_backend_format **format,
- struct device_d *dev)
+ struct device *dev)
{
struct state_backend_format_dtb *dtb;
diff --git a/common/state/backend_format_raw.c b/common/state/backend_format_raw.c
index 7835f977c9..105f7dd444 100644
--- a/common/state/backend_format_raw.c
+++ b/common/state/backend_format_raw.c
@@ -32,7 +32,7 @@ struct state_backend_format_raw {
unsigned int digest_length;
/* For outputs */
- struct device_d *dev;
+ struct device *dev;
char *secret_name;
int needs_secret;
@@ -299,7 +299,7 @@ static int backend_format_raw_init_digest(struct state_backend_format_raw *raw,
int backend_format_raw_create(struct state_backend_format **format,
struct device_node *node, const char *secret_name,
- struct device_d *dev)
+ struct device *dev)
{
struct state_backend_format_raw *raw;
int ret;
diff --git a/common/state/state.h b/common/state/state.h
index 0545cf6ac1..7eb51bbdb5 100644
--- a/common/state/state.h
+++ b/common/state/state.h
@@ -90,7 +90,7 @@ struct state_backend_storage {
struct list_head buckets;
/* For outputs */
- struct device_d *dev;
+ struct device *dev;
const char *name;
@@ -105,7 +105,7 @@ struct state_backend_storage {
struct state {
struct list_head list; /* Entry to enqueue on list of states */
- struct device_d dev;
+ struct device dev;
char *of_path;
const char *name;
uint32_t magic;
@@ -202,21 +202,21 @@ struct device_node *state_to_node(struct state *state,
enum state_convert conv);
int backend_format_raw_create(struct state_backend_format **format,
struct device_node *node, const char *secret_name,
- struct device_d *dev);
+ struct device *dev);
int backend_format_dtb_create(struct state_backend_format **format,
- struct device_d *dev);
+ struct device *dev);
int state_storage_init(struct state *state, const char *path,
off_t offset, size_t max_size, uint32_t stridesize,
const char *storagetype);
void state_storage_set_readonly(struct state_backend_storage *storage);
void state_add_var(struct state *state, struct state_variable *var);
struct variable_type *state_find_type_by_name(const char *name);
-int state_backend_bucket_circular_create(struct device_d *dev, const char *path,
+int state_backend_bucket_circular_create(struct device *dev, const char *path,
struct state_backend_storage_bucket **bucket,
unsigned int eraseblock,
ssize_t writesize,
struct mtd_info_user *mtd_uinfo);
-int state_backend_bucket_cached_create(struct device_d *dev,
+int state_backend_bucket_cached_create(struct device *dev,
struct state_backend_storage_bucket *raw,
struct state_backend_storage_bucket **out);
struct state_variable *state_find_var(struct state *state, const char *name);
@@ -224,7 +224,7 @@ struct digest *state_backend_format_raw_get_digest(struct state_backend_format
*format);
void state_backend_set_readonly(struct state *state);
void state_storage_free(struct state_backend_storage *storage);
-int state_backend_bucket_direct_create(struct device_d *dev, const char *path,
+int state_backend_bucket_direct_create(struct device *dev, const char *path,
struct state_backend_storage_bucket **bucket,
off_t offset, ssize_t max_size);
int state_storage_write(struct state_backend_storage *storage,
diff --git a/common/usbgadget.c b/common/usbgadget.c
index 7291fbf4d5..59b9e635f4 100644
--- a/common/usbgadget.c
+++ b/common/usbgadget.c
@@ -35,7 +35,7 @@ int usbgadget_register(const struct usbgadget_funcs *funcs)
{
int ret;
int flags = funcs->flags;
- struct device_d *dev;
+ struct device *dev;
struct f_multi_opts *opts;
opts = xzalloc(sizeof(*opts));
diff --git a/drivers/aiodev/am335x_adc.c b/drivers/aiodev/am335x_adc.c
index 2ac1b7ab94..f658396ec5 100644
--- a/drivers/aiodev/am335x_adc.c
+++ b/drivers/aiodev/am335x_adc.c
@@ -72,7 +72,7 @@ static int am335x_adc_read(struct aiochannel *chan, int *val)
return 0;
}
-static int am335x_adc_probe(struct device_d *dev)
+static int am335x_adc_probe(struct device *dev)
{
struct device_node *node;
struct am335x_adc_data *data;
diff --git a/drivers/aiodev/core.c b/drivers/aiodev/core.c
index c66eb449fc..1fbb7b9188 100644
--- a/drivers/aiodev/core.c
+++ b/drivers/aiodev/core.c
@@ -31,7 +31,7 @@ struct aiochannel *aiochannel_by_name(const char *name)
}
EXPORT_SYMBOL(aiochannel_by_name);
-struct aiochannel *aiochannel_get(struct device_d *dev, int index)
+struct aiochannel *aiochannel_get(struct device *dev, int index)
{
struct of_phandle_args spec;
struct aiodevice *aiodev;
diff --git a/drivers/aiodev/imx7d_adc.c b/drivers/aiodev/imx7d_adc.c
index 21cb063686..1d4e755fd8 100644
--- a/drivers/aiodev/imx7d_adc.c
+++ b/drivers/aiodev/imx7d_adc.c
@@ -80,11 +80,11 @@ struct imx7d_adc_feature {
};
struct imx7d_adc {
- struct device_d *dev;
+ struct device *dev;
void __iomem *regs;
struct clk *clk;
struct aiodevice aiodev;
- void (*aiodev_info)(struct device_d *);
+ void (*aiodev_info)(struct device *);
u32 vref_uv;
u32 pre_div_num;
@@ -309,7 +309,7 @@ static void imx7d_adc_power_down(struct imx7d_adc *info)
static int imx7d_adc_enable(struct imx7d_adc *info)
{
- struct device_d *dev = info->dev;
+ struct device *dev = info->dev;
int ret;
ret = regulator_enable(info->vref);
@@ -345,7 +345,7 @@ static u32 imx7d_adc_get_sample_rate(struct imx7d_adc *info)
return analogue_core_clk / tmp;
}
-static void imx7d_adc_devinfo(struct device_d *dev)
+static void imx7d_adc_devinfo(struct device *dev)
{
struct imx7d_adc *info = dev->parent->priv;
@@ -355,7 +355,7 @@ static void imx7d_adc_devinfo(struct device_d *dev)
printf("Sample Rate: %u\n", imx7d_adc_get_sample_rate(info));
}
-static int imx7d_adc_probe(struct device_d *dev)
+static int imx7d_adc_probe(struct device *dev)
{
struct aiodevice *aiodev;
struct imx7d_adc *info;
@@ -408,7 +408,7 @@ static int imx7d_adc_probe(struct device_d *dev)
return 0;
}
-static void imx7d_adc_disable(struct device_d *dev)
+static void imx7d_adc_disable(struct device *dev)
{
struct imx7d_adc *info = dev->priv;
diff --git a/drivers/aiodev/imx_thermal.c b/drivers/aiodev/imx_thermal.c
index bac51e03d2..c2d2faa071 100644
--- a/drivers/aiodev/imx_thermal.c
+++ b/drivers/aiodev/imx_thermal.c
@@ -106,7 +106,7 @@ static int imx_thermal_read(struct aiochannel *chan, int *val)
return 0;
}
-static int imx_thermal_probe(struct device_d *dev)
+static int imx_thermal_probe(struct device *dev)
{
uint32_t ocotp_ana1;
struct device_node *node;
diff --git a/drivers/aiodev/lm75.c b/drivers/aiodev/lm75.c
index 1900636555..3281c6893b 100644
--- a/drivers/aiodev/lm75.c
+++ b/drivers/aiodev/lm75.c
@@ -57,7 +57,7 @@ static const u8 LM75_REG_TEMP[3] = {
/* Each client has this additional data */
struct lm75_data {
struct i2c_client *client;
- struct device_d dev;
+ struct device dev;
u8 resolution; /* In bits, between 9 and 12 */
struct aiochannel aiochan;
struct aiodevice aiodev;
@@ -102,7 +102,7 @@ static int lm75_get_temp(struct aiochannel *chan, int *val)
return 0;
}
-static int lm75_probe(struct device_d *dev)
+static int lm75_probe(struct device *dev)
{
struct lm75_data *data;
int status;
diff --git a/drivers/aiodev/mc13xxx_adc.c b/drivers/aiodev/mc13xxx_adc.c
index 13436e8936..21eea1f525 100644
--- a/drivers/aiodev/mc13xxx_adc.c
+++ b/drivers/aiodev/mc13xxx_adc.c
@@ -178,7 +178,7 @@ err:
return ret;
}
-int mc13xxx_adc_probe(struct device_d *dev, struct mc13xxx *mc_dev)
+int mc13xxx_adc_probe(struct device *dev, struct mc13xxx *mc_dev)
{
int i;
int ret;
diff --git a/drivers/aiodev/qoriq_thermal.c b/drivers/aiodev/qoriq_thermal.c
index ed76945fd1..fc33ed8a21 100644
--- a/drivers/aiodev/qoriq_thermal.c
+++ b/drivers/aiodev/qoriq_thermal.c
@@ -67,7 +67,7 @@ struct qoriq_tmu_regs {
* Thermal zone data
*/
struct qoriq_tmu_data {
- struct device_d *dev;
+ struct device *dev;
struct clk *clk;
struct qoriq_tmu_regs __iomem *regs;
int sensor_id;
@@ -187,7 +187,7 @@ static void qoriq_tmu_init_device(struct qoriq_tmu_data *data)
tmu_write(data, TMR_DISABLE, &data->regs->tmr);
}
-static int qoriq_tmu_probe(struct device_d *dev)
+static int qoriq_tmu_probe(struct device *dev)
{
struct device_node *np = dev->of_node;
struct qoriq_tmu_data *data;
diff --git a/drivers/aiodev/rockchip_saradc.c b/drivers/aiodev/rockchip_saradc.c
index 707df71950..b190df17a4 100644
--- a/drivers/aiodev/rockchip_saradc.c
+++ b/drivers/aiodev/rockchip_saradc.c
@@ -85,7 +85,7 @@ static int rockchip_saradc_read(struct aiochannel *chan, int *val)
return 0;
}
-static int rockchip_saradc_probe(struct device_d *dev)
+static int rockchip_saradc_probe(struct device *dev)
{
struct rockchip_saradc_data *data;
int i, ret;
diff --git a/drivers/aiodev/st_gyro.c b/drivers/aiodev/st_gyro.c
index 3938d8239e..29b6e0e840 100644
--- a/drivers/aiodev/st_gyro.c
+++ b/drivers/aiodev/st_gyro.c
@@ -66,7 +66,7 @@ static int st_gyro_read(struct aiochannel *chan, int *val)
return 0;
}
-static int st_gyro_probe(struct device_d *dev)
+static int st_gyro_probe(struct device *dev)
{
u8 tx[2], rx[2];
struct st_gyro *gyro;
diff --git a/drivers/aiodev/stm32-adc-core.c b/drivers/aiodev/stm32-adc-core.c
index b83cabb973..0712f2a5e0 100644
--- a/drivers/aiodev/stm32-adc-core.c
+++ b/drivers/aiodev/stm32-adc-core.c
@@ -56,7 +56,7 @@ static const struct stm32h7_adc_ck_spec stm32h7_adc_ckmodes_spec[] = {
{ 3, 0, 4 },
};
-static int stm32h7_adc_clk_sel(struct device_d *dev,
+static int stm32h7_adc_clk_sel(struct device *dev,
struct stm32_adc_common *common)
{
u32 ckmode, presc;
@@ -137,7 +137,7 @@ out:
return 0;
}
-static int stm32_adc_core_probe(struct device_d *dev)
+static int stm32_adc_core_probe(struct device *dev)
{
struct stm32_adc_common *common;
int ret;
diff --git a/drivers/aiodev/stm32-adc.c b/drivers/aiodev/stm32-adc.c
index 3969da5975..497a865a09 100644
--- a/drivers/aiodev/stm32-adc.c
+++ b/drivers/aiodev/stm32-adc.c
@@ -91,7 +91,7 @@ static void stm32_adc_stop(struct stm32_adc *adc)
static int stm32_adc_start_channel(struct stm32_adc *adc, int channel)
{
- struct device_d *dev = adc->aiodev.hwdev;
+ struct device *dev = adc->aiodev.hwdev;
struct stm32_adc_common *common = adc->common;
int ret;
u32 val;
@@ -153,7 +153,7 @@ static int stm32_adc_start_channel(struct stm32_adc *adc, int channel)
static int stm32_adc_channel_data(struct stm32_adc *adc, int channel,
int *data)
{
- struct device_d *dev = &adc->aiodev.dev;
+ struct device *dev = &adc->aiodev.dev;
int ret;
u32 val;
@@ -211,7 +211,7 @@ static void stm32_adc_smpr_init(struct stm32_adc *adc, int channel, u32 smp_ns)
adc->smpr_val[r] = (adc->smpr_val[r] & ~mask) | (smp << shift);
}
-static int stm32_adc_chan_of_init(struct device_d *dev, struct stm32_adc *adc)
+static int stm32_adc_chan_of_init(struct device *dev, struct stm32_adc *adc)
{
unsigned int i;
int num_channels = 0, num_times = 0;
@@ -290,7 +290,7 @@ static int stm32_adc_chan_of_init(struct device_d *dev, struct stm32_adc *adc)
return ret;
}
-static int stm32_adc_probe(struct device_d *dev)
+static int stm32_adc_probe(struct device *dev)
{
struct stm32_adc_common *common = dev->parent->priv;
struct stm32_adc *adc;
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 571aa0e8bf..bef6cc4ba2 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -28,7 +28,7 @@ amba_lookup(const struct amba_id *table, struct amba_device *dev)
return ret ? table : NULL;
}
-static int amba_match(struct device_d *dev, struct driver_d *drv)
+static int amba_match(struct device *dev, struct driver_d *drv)
{
struct amba_device *pcdev = to_amba_device(dev);
@@ -55,7 +55,7 @@ static int amba_get_enable_pclk(struct amba_device *pcdev)
return ret;
}
-static int amba_probe(struct device_d *dev)
+static int amba_probe(struct device *dev)
{
struct amba_device *pcdev = to_amba_device(dev);
struct amba_driver *pcdrv = to_amba_driver(dev->driver);
@@ -64,7 +64,7 @@ static int amba_probe(struct device_d *dev)
return pcdrv->probe(pcdev, id);
}
-static void amba_remove(struct device_d *dev)
+static void amba_remove(struct device *dev)
{
struct amba_device *pcdev = to_amba_device(dev);
struct amba_driver *drv = to_amba_driver(dev->driver);
@@ -163,7 +163,7 @@ int amba_device_add(struct amba_device *dev)
}
struct amba_device *
-amba_aphb_device_add(struct device_d *parent, const char *name, int id,
+amba_aphb_device_add(struct device *parent, const char *name, int id,
resource_size_t base, size_t size,
void *pdata, unsigned int periphid)
{
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index f4b93183ce..baa4919b33 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -541,14 +541,14 @@ void ahci_print_info(struct ahci_device *ahci)
cap2 & HOST_CAP2_BOH ? "boh " : "");
}
-void ahci_info(struct device_d *dev)
+void ahci_info(struct device *dev)
{
struct ahci_device *ahci = dev->priv;
ahci_print_info(ahci);
}
-static int ahci_detect(struct device_d *dev)
+static int ahci_detect(struct device *dev)
{
struct ahci_device *ahci = dev->priv;
int n_ports = max_t(int, ahci->n_ports, fls(ahci->port_map));
@@ -636,7 +636,7 @@ int ahci_add_host(struct ahci_device *ahci)
return 0;
}
-static int ahci_probe(struct device_d *dev)
+static int ahci_probe(struct device *dev)
{
struct resource *iores;
struct ahci_device *ahci;
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index 77196592ed..196bde73c2 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -184,7 +184,7 @@ struct ahci_port {
};
struct ahci_device {
- struct device_d *dev;
+ struct device *dev;
struct ahci_port ports[AHCI_MAX_PORTS];
u32 n_ports;
void __iomem *mmio_base;
@@ -197,6 +197,6 @@ struct ahci_device {
int ahci_add_host(struct ahci_device *ahci);
void ahci_print_info(struct ahci_device *ahci);
-void ahci_info(struct device_d *dev);
+void ahci_info(struct device *dev);
#endif
diff --git a/drivers/ata/disk_ata_drive.c b/drivers/ata/disk_ata_drive.c
index 7df0879b19..c1c736a0a8 100644
--- a/drivers/ata/disk_ata_drive.c
+++ b/drivers/ata/disk_ata_drive.c
@@ -199,7 +199,7 @@ static int ata_port_init(struct ata_port *port)
{
int rc;
struct ata_port_operations *ops = port->ops;
- struct device_d *dev = &port->class_dev;
+ struct device *dev = &port->class_dev;
if (ops->init) {
rc = ops->init(port);
@@ -293,14 +293,14 @@ static int ata_set_probe(struct param_d *param, void *priv)
return ata_port_detect(port);
}
-static int ata_detect(struct device_d *dev)
+static int ata_detect(struct device *dev)
{
struct ata_port *port = container_of(dev, struct ata_port, class_dev);
return ata_port_detect(port);
}
-static void ata_info(struct device_d *dev)
+static void ata_info(struct device *dev)
{
struct ata_port *port = container_of(dev, struct ata_port, class_dev);
diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
index b8711d0de3..41989bdb12 100644
--- a/drivers/ata/intf_platform_ide.c
+++ b/drivers/ata/intf_platform_ide.c
@@ -65,7 +65,7 @@ static void platform_ide_setup_port(void *reg_base, void *alt_base,
}
}
-static int platform_ide_probe(struct device_d *dev)
+static int platform_ide_probe(struct device *dev)
{
struct resource *iores;
int rc;
diff --git a/drivers/ata/pata-imx.c b/drivers/ata/pata-imx.c
index 48f7159726..0a658b00eb 100644
--- a/drivers/ata/pata-imx.c
+++ b/drivers/ata/pata-imx.c
@@ -132,14 +132,14 @@ static void imx_pata_setup_port(void *reg_base, void *alt_base,
}
}
-static int pata_imx_detect(struct device_d *dev)
+static int pata_imx_detect(struct device *dev)
{
struct ide_port *ide = dev->priv;
return ata_port_detect(&ide->port);
}
-static int imx_pata_probe(struct device_d *dev)
+static int imx_pata_probe(struct device *dev)
{
struct resource *iores;
struct ide_port *ide;
diff --git a/drivers/ata/sata-imx.c b/drivers/ata/sata-imx.c
index 9415e34055..898cd18518 100644
--- a/drivers/ata/sata-imx.c
+++ b/drivers/ata/sata-imx.c
@@ -83,7 +83,7 @@ static int imx_sata_init_1ms(struct imx_ahci *imx_ahci)
return 0;
}
-static int imx_sata_probe(struct device_d *dev)
+static int imx_sata_probe(struct device *dev)
{
struct resource *iores;
struct imx_ahci *imx_ahci;
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 05b27f1008..f0137c07a5 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -90,7 +90,7 @@ static void mv_soc_65n_phy_errata(void __iomem *base)
writel(reg, base + PHY_MODE9_GEN1);
}
-static int mv_sata_probe(struct device_d *dev)
+static int mv_sata_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base;
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 09bd621e39..c4e3e7b320 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -47,7 +47,7 @@ int bus_register(struct bus_type *bus)
return 0;
}
-int device_match(struct device_d *dev, struct driver_d *drv)
+int device_match(struct device *dev, struct driver_d *drv)
{
if (IS_ENABLED(CONFIG_OFDEVICE) && dev->of_node &&
drv->of_compatible)
@@ -70,7 +70,7 @@ int device_match(struct device_d *dev, struct driver_d *drv)
return -1;
}
-int device_match_of_modalias(struct device_d *dev, struct driver_d *drv)
+int device_match_of_modalias(struct device *dev, struct driver_d *drv)
{
const struct platform_device_id *id = drv->id_table;
const char *of_modalias = NULL, *p;
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 8057032a81..1b0ed5aa68 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -46,9 +46,9 @@ LIST_HEAD(active_device_list);
EXPORT_SYMBOL(active_device_list);
static LIST_HEAD(deferred);
-struct device_d *find_device(const char *str)
+struct device *find_device(const char *str)
{
- struct device_d *dev;
+ struct device *dev;
struct device_node *np;
dev = get_device_by_name(str);
@@ -62,9 +62,9 @@ struct device_d *find_device(const char *str)
return NULL;
}
-struct device_d *get_device_by_name(const char *name)
+struct device *get_device_by_name(const char *name)
{
- struct device_d *dev;
+ struct device *dev;
for_each_device(dev) {
if(!strcmp(dev_name(dev), name))
@@ -74,9 +74,9 @@ struct device_d *get_device_by_name(const char *name)
return NULL;
}
-static struct device_d *get_device_by_name_id(const char *name, int id)
+static struct device *get_device_by_name_id(const char *name, int id)
{
- struct device_d *dev;
+ struct device *dev;
for_each_device(dev) {
if(!strcmp(dev->name, name) && id == dev->id)
@@ -97,7 +97,7 @@ int get_free_deviceid(const char *name_template)
};
}
-int device_probe(struct device_d *dev)
+int device_probe(struct device *dev)
{
static int depth = 0;
int ret;
@@ -151,7 +151,7 @@ out:
return ret;
}
-int device_detect(struct device_d *dev)
+int device_detect(struct device *dev)
{
if (!dev->detect)
return -ENOSYS;
@@ -162,7 +162,7 @@ int device_detect_by_name(const char *__devname)
{
char *devname = xstrdup(__devname);
char *str = devname;
- struct device_d *dev;
+ struct device *dev;
int ret = -ENODEV;
while (1) {
@@ -185,13 +185,13 @@ int device_detect_by_name(const char *__devname)
void device_detect_all(void)
{
- struct device_d *dev;
+ struct device *dev;
for_each_device(dev)
device_detect(dev);
}
-static int match(struct driver_d *drv, struct device_d *dev)
+static int match(struct driver_d *drv, struct device *dev)
{
int ret;
@@ -212,7 +212,7 @@ err_out:
return -1;
}
-int register_device(struct device_d *new_device)
+int register_device(struct device *new_device)
{
struct driver_d *drv;
@@ -259,10 +259,10 @@ int register_device(struct device_d *new_device)
}
EXPORT_SYMBOL(register_device);
-int unregister_device(struct device_d *old_dev)
+int unregister_device(struct device *old_dev)
{
struct cdev *cdev, *ct;
- struct device_d *child, *dt;
+ struct device *child, *dt;
dev_dbg(old_dev, "unregister\n");
@@ -304,7 +304,7 @@ EXPORT_SYMBOL(unregister_device);
* This frees dynamically allocated resources allocated during device
* lifetime, but not the device itself.
*/
-void free_device_res(struct device_d *dev)
+void free_device_res(struct device *dev)
{
free(dev->name);
dev->name = NULL;
@@ -321,7 +321,7 @@ EXPORT_SYMBOL(free_device_res);
* This frees dynamically allocated resources allocated during device
* lifetime and finally the device itself.
*/
-void free_device(struct device_d *dev)
+void free_device(struct device *dev)
{
free_device_res(dev);
free(dev);
@@ -337,7 +337,7 @@ EXPORT_SYMBOL(free_device);
*/
static int device_probe_deferred(void)
{
- struct device_d *dev, *tmp;
+ struct device *dev, *tmp;
struct driver_d *drv;
bool success;
@@ -386,7 +386,7 @@ struct driver_d *get_driver_by_name(const char *name)
int register_driver(struct driver_d *drv)
{
- struct device_d *dev = NULL;
+ struct device *dev = NULL;
if (!drv->name)
return -EINVAL;
@@ -405,7 +405,7 @@ int register_driver(struct driver_d *drv)
}
EXPORT_SYMBOL(register_driver);
-struct resource *dev_get_resource(struct device_d *dev, unsigned long type,
+struct resource *dev_get_resource(struct device *dev, unsigned long type,
int num)
{
int i, n = 0;
@@ -422,7 +422,7 @@ struct resource *dev_get_resource(struct device_d *dev, unsigned long type,
return ERR_PTR(-ENOENT);
}
-void *dev_get_mem_region(struct device_d *dev, int num)
+void *dev_get_mem_region(struct device *dev, int num)
{
struct resource *res;
@@ -434,7 +434,7 @@ void *dev_get_mem_region(struct device_d *dev, int num)
}
EXPORT_SYMBOL(dev_get_mem_region);
-struct resource *dev_get_resource_by_name(struct device_d *dev,
+struct resource *dev_get_resource_by_name(struct device *dev,
unsigned long type,
const char *name)
{
@@ -453,7 +453,8 @@ struct resource *dev_get_resource_by_name(struct device_d *dev,
return ERR_PTR(-ENOENT);
}
-struct resource *dev_request_mem_resource_by_name(struct device_d *dev, const char *name)
+struct resource *dev_request_mem_resource_by_name(struct device *dev,
+ const char *name)
{
struct resource *res;
@@ -465,7 +466,8 @@ struct resource *dev_request_mem_resource_by_name(struct device_d *dev, const ch
}
EXPORT_SYMBOL(dev_request_mem_resource_by_name);
-void __iomem *dev_request_mem_region_by_name(struct device_d *dev, const char *name)
+void __iomem *dev_request_mem_region_by_name(struct device *dev,
+ const char *name)
{
struct resource *res;
@@ -477,7 +479,7 @@ void __iomem *dev_request_mem_region_by_name(struct device_d *dev, const char *n
}
EXPORT_SYMBOL(dev_request_mem_region_by_name);
-struct resource *dev_request_mem_resource(struct device_d *dev, int num)
+struct resource *dev_request_mem_resource(struct device *dev, int num)
{
struct resource *res;
@@ -488,7 +490,7 @@ struct resource *dev_request_mem_resource(struct device_d *dev, int num)
return request_iomem_region(dev_name(dev), res->start, res->end);
}
-void __iomem *dev_request_mem_region_err_null(struct device_d *dev, int num)
+void __iomem *dev_request_mem_region_err_null(struct device *dev, int num)
{
struct resource *res;
@@ -500,7 +502,7 @@ void __iomem *dev_request_mem_region_err_null(struct device_d *dev, int num)
}
EXPORT_SYMBOL(dev_request_mem_region_err_null);
-void __iomem *dev_request_mem_region(struct device_d *dev, int num)
+void __iomem *dev_request_mem_region(struct device *dev, int num)
{
struct resource *res;
@@ -537,9 +539,9 @@ int generic_memmap_ro(struct cdev *cdev, void **map, int flags)
*
* NOTE: This function expects dev->name to be free()-able, so extra
* precautions needs to be taken when mixing its usage with manual
- * assignement of device_d.name.
+ * assignement of device.name.
*/
-int dev_set_name(struct device_d *dev, const char *fmt, ...)
+int dev_set_name(struct device *dev, const char *fmt, ...)
{
va_list vargs;
int err;
@@ -564,7 +566,7 @@ EXPORT_SYMBOL_GPL(dev_set_name);
static void devices_shutdown(void)
{
- struct device_d *dev;
+ struct device *dev;
int depth = 0;
list_for_each_entry(dev, &active_device_list, active) {
@@ -579,7 +581,7 @@ static void devices_shutdown(void)
}
devshutdown_exitcall(devices_shutdown);
-int dev_get_drvdata(struct device_d *dev, const void **data)
+int dev_get_drvdata(struct device *dev, const void **data)
{
if (dev->of_id_entry) {
*data = dev->of_id_entry->data;
@@ -594,7 +596,7 @@ int dev_get_drvdata(struct device_d *dev, const void **data)
return -ENODEV;
}
-const void *device_get_match_data(struct device_d *dev)
+const void *device_get_match_data(struct device *dev)
{
if (dev->of_id_entry)
return dev->of_id_entry->data;
@@ -605,7 +607,8 @@ const void *device_get_match_data(struct device_d *dev)
return NULL;
}
-static void device_set_deferred_probe_reason(struct device_d *dev, const struct va_format *vaf)
+static void device_set_deferred_probe_reason(struct device *dev,
+ const struct va_format *vaf)
{
char *reason;
char *last_char;
@@ -655,8 +658,8 @@ static void device_set_deferred_probe_reason(struct device_d *dev, const struct
* Returns @err.
*
*/
-int dev_err_probe(struct device_d *dev, int err, const char *fmt, ...);
-int dev_err_probe(struct device_d *dev, int err, const char *fmt, ...)
+int dev_err_probe(struct device *dev, int err, const char *fmt, ...);
+int dev_err_probe(struct device *dev, int err, const char *fmt, ...)
{
struct va_format vaf;
va_list args;
@@ -679,7 +682,7 @@ EXPORT_SYMBOL_GPL(dev_err_probe);
/*
* device_find_child - device iterator for locating a particular device.
- * @parent: parent struct device_d
+ * @parent: parent struct device
* @match: Callback function to check device
* @data: Data to pass to match function
*
@@ -688,10 +691,10 @@ EXPORT_SYMBOL_GPL(dev_err_probe);
* current device can be obtained, this function will return to the caller
* and not iterate over any more devices.
*/
-struct device_d *device_find_child(struct device_d *parent, void *data,
- int (*match)(struct device_d *dev, void *data))
+struct device *device_find_child(struct device *parent, void *data,
+ int (*match)(struct device *dev, void *data))
{
- struct device_d *child;
+ struct device *child;
if (!parent)
return NULL;
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index c0ea2746b3..3bc0b71790 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -11,7 +11,7 @@
#include <of.h>
#include <pm_domain.h>
-static int platform_probe(struct device_d *dev)
+static int platform_probe(struct device *dev)
{
int ret;
@@ -22,7 +22,7 @@ static int platform_probe(struct device_d *dev)
return dev->driver->probe(dev);
}
-static void platform_remove(struct device_d *dev)
+static void platform_remove(struct device *dev)
{
if (dev->driver->remove)
dev->driver->remove(dev);
@@ -35,7 +35,7 @@ int platform_driver_register(struct driver_d *drv)
return register_driver(drv);
}
-int platform_device_register(struct device_d *new_device)
+int platform_device_register(struct device *new_device)
{
new_device->bus = &platform_bus;
diff --git a/drivers/base/power.c b/drivers/base/power.c
index d4551879e7..8e999c3e14 100644
--- a/drivers/base/power.c
+++ b/drivers/base/power.c
@@ -205,7 +205,7 @@ static int genpd_power_on(struct generic_pm_domain *genpd, unsigned int depth)
return 0;
}
-static int __genpd_dev_pm_attach(struct device_d *dev, struct device_node *np,
+static int __genpd_dev_pm_attach(struct device *dev, struct device_node *np,
unsigned int index, bool power_on)
{
struct of_phandle_args pd_args;
@@ -250,7 +250,7 @@ static int __genpd_dev_pm_attach(struct device_d *dev, struct device_node *np,
* found or turned on, then return -EPROBE_DEFER to ensure that the device is
* not probed and to re-try again later.
*/
-int genpd_dev_pm_attach(struct device_d *dev)
+int genpd_dev_pm_attach(struct device *dev)
{
if (!dev->of_node)
return 0;
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 05f8f8d622..f17456ebd2 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -8,7 +8,7 @@
struct regmap_bus;
struct regmap {
- struct device_d *dev;
+ struct device *dev;
const struct regmap_bus *bus;
const char *name;
void *bus_context;
@@ -23,7 +23,7 @@ struct regmap {
struct cdev cdev;
};
-enum regmap_endian regmap_get_val_endian(struct device_d *dev,
+enum regmap_endian regmap_get_val_endian(struct device *dev,
const struct regmap_bus *bus,
const struct regmap_config *config);
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
index 7b1501df93..6e6ae5ed54 100644
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -185,9 +185,9 @@ static const struct regmap_bus regmap_mmio = {
.val_format_endian_default = REGMAP_ENDIAN_LITTLE,
};
-static struct regmap_mmio_context *regmap_mmio_gen_context(struct device_d *dev,
- void __iomem *regs,
- const struct regmap_config *config)
+static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
+ void __iomem *regs,
+ const struct regmap_config *config)
{
struct regmap_mmio_context *ctx;
int min_stride;
@@ -277,7 +277,7 @@ err_free:
return ERR_PTR(ret);
}
-struct regmap *regmap_init_mmio_clk(struct device_d *dev,
+struct regmap *regmap_init_mmio_clk(struct device *dev,
const char *clk_id,
void __iomem *regs,
const struct regmap_config *config)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index a35528227d..97662751be 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -20,7 +20,7 @@
static LIST_HEAD(regmaps);
-enum regmap_endian regmap_get_val_endian(struct device_d *dev,
+enum regmap_endian regmap_get_val_endian(struct device *dev,
const struct regmap_bus *bus,
const struct regmap_config *config)
{
@@ -74,7 +74,7 @@ EXPORT_SYMBOL_GPL(regmap_get_val_endian);
*
* Returns a pointer to the new map or a ERR_PTR value on failure
*/
-struct regmap *regmap_init(struct device_d *dev,
+struct regmap *regmap_init(struct device *dev,
const struct regmap_bus *bus,
void *bus_context,
const struct regmap_config *config)
@@ -108,7 +108,7 @@ struct regmap *regmap_init(struct device_d *dev,
*
* Returns a pointer to the regmap or a ERR_PTR value on failure
*/
-struct regmap *dev_get_regmap(struct device_d *dev, const char *name)
+struct regmap *dev_get_regmap(struct device *dev, const char *name)
{
struct regmap *map;
@@ -124,7 +124,7 @@ struct regmap *dev_get_regmap(struct device_d *dev, const char *name)
return ERR_PTR(-ENOENT);
}
-struct device_d *regmap_get_device(struct regmap *map)
+struct device *regmap_get_device(struct regmap *map)
{
return map->dev;
}
diff --git a/drivers/base/resource.c b/drivers/base/resource.c
index 0134456ffa..3725c79eb9 100644
--- a/drivers/base/resource.c
+++ b/drivers/base/resource.c
@@ -9,9 +9,9 @@
#include <xfuncs.h>
#include <malloc.h>
-struct device_d *device_alloc(const char *devname, int id)
+struct device *device_alloc(const char *devname, int id)
{
- struct device_d *dev;
+ struct device *dev;
dev = xzalloc(sizeof(*dev));
dev_set_name(dev, devname);
@@ -20,7 +20,7 @@ struct device_d *device_alloc(const char *devname, int id)
return dev;
}
-int device_add_data(struct device_d *dev, const void *data, size_t size)
+int device_add_data(struct device *dev, const void *data, size_t size)
{
free(dev->platform_data);
@@ -32,7 +32,8 @@ int device_add_data(struct device_d *dev, const void *data, size_t size)
return 0;
}
-int device_add_resources(struct device_d *dev, const struct resource *res, int num)
+int device_add_resources(struct device *dev, const struct resource *res,
+ int num)
{
dev->resource = xmemdup(res, sizeof(*res) * num);
dev->num_resources = num;
@@ -40,8 +41,9 @@ int device_add_resources(struct device_d *dev, const struct resource *res, int n
return 0;
}
-int device_add_resource(struct device_d *dev, const char *resname,
- resource_size_t start, resource_size_t size, unsigned int flags)
+int device_add_resource(struct device *dev, const char *resname,
+ resource_size_t start, resource_size_t size,
+ unsigned int flags)
{
struct resource res = {
.start = start,
@@ -55,11 +57,11 @@ int device_add_resource(struct device_d *dev, const char *resname,
return device_add_resources(dev, &res, 1);
}
-struct device_d *add_generic_device(const char* devname, int id, const char *resname,
+struct device *add_generic_device(const char* devname, int id, const char *resname,
resource_size_t start, resource_size_t size, unsigned int flags,
void *pdata)
{
- struct device_d *dev;
+ struct device *dev;
dev = device_alloc(devname, id);
dev->platform_data = pdata;
@@ -71,10 +73,10 @@ struct device_d *add_generic_device(const char* devname, int id, const char *res
}
EXPORT_SYMBOL(add_generic_device);
-struct device_d *add_generic_device_res(const char* devname, int id,
+struct device *add_generic_device_res(const char* devname, int id,
struct resource *res, int nb, void *pdata)
{
- struct device_d *dev;
+ struct device *dev;
dev = device_alloc(devname, id);
dev->platform_data = pdata;
@@ -87,7 +89,7 @@ struct device_d *add_generic_device_res(const char* devname, int id,
EXPORT_SYMBOL(add_generic_device_res);
#ifdef CONFIG_DRIVER_NET_DM9K
-struct device_d *add_dm9000_device(int id, resource_size_t base,
+struct device *add_dm9000_device(int id, resource_size_t base,
resource_size_t data, int flags, void *pdata)
{
struct resource *res;
@@ -123,7 +125,7 @@ EXPORT_SYMBOL(add_dm9000_device);
#endif
#ifdef CONFIG_USB_EHCI
-struct device_d *add_usb_ehci_device(int id, resource_size_t hccr,
+struct device *add_usb_ehci_device(int id, resource_size_t hccr,
resource_size_t hcor, void *pdata)
{
struct resource *res;
@@ -142,7 +144,7 @@ EXPORT_SYMBOL(add_usb_ehci_device);
#endif
#ifdef CONFIG_DRIVER_NET_KS8851_MLL
-struct device_d *add_ks8851_device(int id, resource_size_t addr,
+struct device *add_ks8851_device(int id, resource_size_t addr,
resource_size_t addr_cmd, int flags, void *pdata)
{
struct resource *res;
diff --git a/drivers/block/efi-block-io.c b/drivers/block/efi-block-io.c
index b78117d445..a4365ac7c3 100644
--- a/drivers/block/efi-block-io.c
+++ b/drivers/block/efi-block-io.c
@@ -49,10 +49,10 @@ struct efi_block_io_protocol {
struct efi_bio_priv {
struct efi_block_io_protocol *protocol;
- struct device_d *dev;
+ struct device *dev;
struct block_device blk;
u32 media_id;
- void (*efi_info)(struct device_d *);
+ void (*efi_info)(struct device *);
};
static int efi_bio_read(struct block_device *blk, void *buffer, sector_t block,
@@ -102,7 +102,7 @@ static struct block_device_ops efi_bio_ops = {
.flush = efi_bio_flush,
};
-static void efi_bio_print_info(struct device_d *dev)
+static void efi_bio_print_info(struct device *dev)
{
struct efi_bio_priv *priv = dev->priv;
struct efi_block_io_media *media = priv->protocol->media;
@@ -150,7 +150,7 @@ static int efi_bio_probe(struct efi_device *efidev)
int instance;
struct efi_bio_priv *priv;
struct efi_block_io_media *media;
- struct device_d *dev = &efidev->dev;
+ struct device *dev = &efidev->dev;
priv = xzalloc(sizeof(*priv));
diff --git a/drivers/bus/acpi.c b/drivers/bus/acpi.c
index 1d6069b6d8..c69473394f 100644
--- a/drivers/bus/acpi.c
+++ b/drivers/bus/acpi.c
@@ -84,7 +84,7 @@ static struct sig_desc {
{ /* sentinel */ }
};
-static struct acpi_sdt *acpi_get_dev_sdt(struct device_d *dev)
+static struct acpi_sdt *acpi_get_dev_sdt(struct device *dev)
{
int i;
@@ -96,7 +96,7 @@ static struct acpi_sdt *acpi_get_dev_sdt(struct device_d *dev)
return NULL;
}
-static void acpi_devinfo(struct device_d *dev)
+static void acpi_devinfo(struct device *dev)
{
struct acpi_sdt *sdt = acpi_get_dev_sdt(dev);
struct sig_desc *sig_desc;
@@ -120,7 +120,7 @@ static void acpi_devinfo(struct device_d *dev)
printf("CreatorRevision: %u\n", sdt->creator_revision);
}
-static int acpi_register_device(struct device_d *dev, struct acpi_sdt *sdt)
+static int acpi_register_device(struct device *dev, struct acpi_sdt *sdt)
{
int ret;
@@ -136,10 +136,10 @@ static int acpi_register_device(struct device_d *dev, struct acpi_sdt *sdt)
return 0;
}
-static struct device_d *acpi_add_device(struct bus_type *bus,
+static struct device *acpi_add_device(struct bus_type *bus,
acpi_sig_t signature)
{
- struct device_d *dev;
+ struct device *dev;
dev = xzalloc(sizeof(*dev));
@@ -203,7 +203,7 @@ static int acpi_register_devices(struct bus_type *bus)
return 0;
}
-static int acpi_bus_match(struct device_d *dev, struct driver_d *drv)
+static int acpi_bus_match(struct device *dev, struct driver_d *drv)
{
struct acpi_driver *acpidrv = to_acpi_driver(drv);
struct acpi_sdt *sdt = acpi_get_dev_sdt(dev);
@@ -211,12 +211,12 @@ static int acpi_bus_match(struct device_d *dev, struct driver_d *drv)
return acpi_sigcmp(acpidrv->signature, sdt->signature);
}
-static int acpi_bus_probe(struct device_d *dev)
+static int acpi_bus_probe(struct device *dev)
{
return dev->driver->probe(dev);
}
-static void acpi_bus_remove(struct device_d *dev)
+static void acpi_bus_remove(struct device *dev)
{
if (dev->driver->remove)
dev->driver->remove(dev);
diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c
index 7d8471b7ac..3ac2609f47 100644
--- a/drivers/bus/imx-weim.c
+++ b/drivers/bus/imx-weim.c
@@ -66,7 +66,7 @@ static struct of_device_id weim_id_table[] = {
};
struct imx_weim {
- struct device_d *dev;
+ struct device *dev;
void __iomem *base;
struct imx_weim_devtype *devtype;
};
@@ -125,7 +125,7 @@ static int weim_parse_dt(struct imx_weim *weim)
return ret;
}
-static int weim_probe(struct device_d *dev)
+static int weim_probe(struct device *dev)
{
struct resource *iores;
struct imx_weim_devtype *devtype;
diff --git a/drivers/bus/omap-gpmc.c b/drivers/bus/omap-gpmc.c
index 2d3a637820..df9e66b54a 100644
--- a/drivers/bus/omap-gpmc.c
+++ b/drivers/bus/omap-gpmc.c
@@ -141,7 +141,7 @@ struct gpmc_settings {
};
struct imx_gpmc {
- struct device_d *dev;
+ struct device *dev;
void __iomem *base;
struct imx_gpmc_devtype *devtype;
};
@@ -452,7 +452,7 @@ static struct dt_eccmode modes[] = {
},
};
-static int gpmc_probe_nand_child(struct device_d *dev,
+static int gpmc_probe_nand_child(struct device *dev,
struct device_node *child)
{
u32 val;
@@ -537,8 +537,8 @@ static int gpmc_probe_nand_child(struct device_d *dev,
* Allocates and configures a GPMC chip-select for a child device.
* Returns 0 on success and appropriate negative error code on failure.
*/
-static int gpmc_probe_generic_child(struct device_d *dev,
- struct device_node *child)
+static int gpmc_probe_generic_child(struct device *dev,
+ struct device_node *child)
{
struct gpmc_settings gpmc_s = {};
struct gpmc_timings gpmc_t = {};
@@ -600,7 +600,7 @@ err:
return ret;
}
-static int gpmc_probe(struct device_d *dev)
+static int gpmc_probe(struct device *dev)
{
struct device_node *child, *node = dev->of_node;
int ret;
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index e863e01f3b..862e9d0cc3 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -8,7 +8,7 @@
#include <of.h>
#include <linux/err.h>
-static int ti_sysc_probe(struct device_d *dev)
+static int ti_sysc_probe(struct device *dev)
{
int ret;
diff --git a/drivers/clk/bcm/clk-bcm2835-aux.c b/drivers/clk/bcm/clk-bcm2835-aux.c
index b4636b850e..39d61a429e 100644
--- a/drivers/clk/bcm/clk-bcm2835-aux.c
+++ b/drivers/clk/bcm/clk-bcm2835-aux.c
@@ -13,7 +13,7 @@
#define BCM2835_AUXIRQ 0x00
#define BCM2835_AUXENB 0x04
-static int bcm2835_aux_clk_probe(struct device_d *dev)
+static int bcm2835_aux_clk_probe(struct device *dev)
{
struct clk_hw_onecell_data *onecell;
const char *parent;
diff --git a/drivers/clk/clk-ar933x.c b/drivers/clk/clk-ar933x.c
index 372a9e7457..cc43f1ab35 100644
--- a/drivers/clk/clk-ar933x.c
+++ b/drivers/clk/clk-ar933x.c
@@ -104,7 +104,7 @@ static void ar933x_pll_init(void __iomem *base)
AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK);
}
-static int ar933x_clk_probe(struct device_d *dev)
+static int ar933x_clk_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base;
diff --git a/drivers/clk/clk-ar9344.c b/drivers/clk/clk-ar9344.c
index 5bb55d2227..8afce4f72e 100644
--- a/drivers/clk/clk-ar9344.c
+++ b/drivers/clk/clk-ar9344.c
@@ -99,7 +99,7 @@ static void ar9344_pll_init(void __iomem *base)
clks[ATH79_CLK_CPU] = clk_ar9344("cpu", "ref", base);
}
-static int ar9344_clk_probe(struct device_d *dev)
+static int ar9344_clk_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base;
diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c
index f6fe07a0bf..37982db9aa 100644
--- a/drivers/clk/clk-bulk.c
+++ b/drivers/clk/clk-bulk.c
@@ -23,7 +23,7 @@ void clk_bulk_put(int num_clks, struct clk_bulk_data *clks)
}
EXPORT_SYMBOL_GPL(clk_bulk_put);
-static int __clk_bulk_get(struct device_d *dev, int num_clks,
+static int __clk_bulk_get(struct device *dev, int num_clks,
struct clk_bulk_data *clks,
bool optional)
{
@@ -58,14 +58,14 @@ err:
return ret;
}
-int __must_check clk_bulk_get(struct device_d *dev, int num_clks,
+int __must_check clk_bulk_get(struct device *dev, int num_clks,
struct clk_bulk_data *clks)
{
return __clk_bulk_get(dev, num_clks, clks, false);
}
EXPORT_SYMBOL(clk_bulk_get);
-int __must_check clk_bulk_get_optional(struct device_d *dev, int num_clks,
+int __must_check clk_bulk_get_optional(struct device *dev, int num_clks,
struct clk_bulk_data *clks)
{
return __clk_bulk_get(dev, num_clks, clks, true);
@@ -140,7 +140,7 @@ void clk_bulk_put_all(int num_clks, struct clk_bulk_data *clks)
}
EXPORT_SYMBOL(clk_bulk_put_all);
-int __must_check clk_bulk_get_all(struct device_d *dev,
+int __must_check clk_bulk_get_all(struct device *dev,
struct clk_bulk_data **clks)
{
struct device_node *np = dev->of_node;
diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
index 4ebdd399b4..45dec790d7 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
@@ -172,13 +172,17 @@ err:
return 0;
}
-struct clk_hw *clk_hw_register_composite(struct device_d *dev,
- const char *name, const char * const *parent_names,
- int num_parents,
- struct clk_hw *mux_hw, const struct clk_ops *mux_ops,
- struct clk_hw *rate_hw, const struct clk_ops *rate_ops,
- struct clk_hw *gate_hw, const struct clk_ops *gate_ops,
- unsigned long flags)
+struct clk_hw *clk_hw_register_composite(struct device *dev,
+ const char *name,
+ const char * const *parent_names,
+ int num_parents,
+ struct clk_hw *mux_hw,
+ const struct clk_ops *mux_ops,
+ struct clk_hw *rate_hw,
+ const struct clk_ops *rate_ops,
+ struct clk_hw *gate_hw,
+ const struct clk_ops *gate_ops,
+ unsigned long flags)
{
struct clk *clk;
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index fed9ad9d24..e095b40bfa 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -410,40 +410,48 @@ struct clk *clk_divider_table(const char *name, const char *parent,
return &div->hw.clk;
}
-struct clk *clk_register_divider_table(struct device_d *dev, const char *name,
- const char *parent_name, unsigned long flags,
- void __iomem *reg, u8 shift, u8 width,
- u8 clk_divider_flags, const struct clk_div_table *table,
- spinlock_t *lock)
+struct clk *clk_register_divider_table(struct device *dev, const char *name,
+ const char *parent_name,
+ unsigned long flags,
+ void __iomem *reg, u8 shift, u8 width,
+ u8 clk_divider_flags,
+ const struct clk_div_table *table,
+ spinlock_t *lock)
{
return clk_divider_table(name, parent_name, flags, reg, shift, width,
table, clk_divider_flags);
}
-struct clk *clk_register_divider(struct device_d *dev, const char *name,
- const char *parent_name, unsigned long flags,
- void __iomem *reg, u8 shift, u8 width,
- u8 clk_divider_flags, spinlock_t *lock)
+struct clk *clk_register_divider(struct device *dev, const char *name,
+ const char *parent_name, unsigned long flags,
+ void __iomem *reg, u8 shift, u8 width,
+ u8 clk_divider_flags, spinlock_t *lock)
{
return clk_divider(name, parent_name, flags, reg, shift, width,
clk_divider_flags);
}
-struct clk_hw *clk_hw_register_divider_table(struct device_d *dev,
- const char *name, const char *parent_name, unsigned long flags,
- void __iomem *reg, u8 shift, u8 width,
- u8 clk_divider_flags, const struct clk_div_table *table,
- spinlock_t *lock)
+struct clk_hw *clk_hw_register_divider_table(struct device *dev,
+ const char *name,
+ const char *parent_name,
+ unsigned long flags,
+ void __iomem *reg, u8 shift,
+ u8 width,
+ u8 clk_divider_flags,
+ const struct clk_div_table *table,
+ spinlock_t *lock)
{
return clk_to_clk_hw(clk_register_divider_table(dev, xstrdup(name),
xstrdup(parent_name), flags, reg, shift, width,
clk_divider_flags, table, lock));
}
-struct clk_hw *clk_hw_register_divider(struct device_d *dev,
- const char *name, const char *parent_name, unsigned long flags,
- void __iomem *reg, u8 shift, u8 width,
- u8 clk_divider_flags, spinlock_t *lock)
+struct clk_hw *clk_hw_register_divider(struct device *dev,
+ const char *name,
+ const char *parent_name,
+ unsigned long flags,
+ void __iomem *reg, u8 shift, u8 width,
+ u8 clk_divider_flags, spinlock_t *lock)
{
return clk_to_clk_hw(clk_register_divider(dev, xstrdup(name),
xstrdup(parent_name), flags, reg, shift, width,
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
index a6d3fdc6a1..d2c808d40c 100644
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@ -77,16 +77,20 @@ struct clk *clk_fixed_factor(const char *name,
return &f->hw.clk;
}
-struct clk *clk_register_fixed_factor(struct device_d *dev, const char *name,
- const char *parent_name, unsigned long flags,
- unsigned int mult, unsigned int div)
+struct clk *clk_register_fixed_factor(struct device *dev, const char *name,
+ const char *parent_name,
+ unsigned long flags,
+ unsigned int mult, unsigned int div)
{
return clk_fixed_factor(name, parent_name, mult, div, flags);
}
-struct clk_hw *clk_hw_register_fixed_factor(struct device_d *dev,
- const char *name, const char *parent_name, unsigned long flags,
- unsigned int mult, unsigned int div)
+struct clk_hw *clk_hw_register_fixed_factor(struct device *dev,
+ const char *name,
+ const char *parent_name,
+ unsigned long flags,
+ unsigned int mult,
+ unsigned int div)
{
return clk_to_clk_hw(clk_register_fixed_factor(dev, xstrdup(name),
xstrdup(parent_name),
diff --git a/drivers/clk/clk-fixed.c b/drivers/clk/clk-fixed.c
index 9e5a07817b..6ec2feb84f 100644
--- a/drivers/clk/clk-fixed.c
+++ b/drivers/clk/clk-fixed.c
@@ -63,7 +63,7 @@ struct clk *clk_register_fixed_rate(const char *name,
return &fix->hw.clk;
}
-struct clk_hw *clk_hw_register_fixed_rate(struct device_d *dev,
+struct clk_hw *clk_hw_register_fixed_rate(struct device *dev,
const char *name, const char *parent_name,
unsigned long flags, unsigned long rate)
{
diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c
index 3cfd707238..d31920fd0b 100644
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
@@ -117,10 +117,10 @@ struct clk *clk_gate_inverted(const char *name, const char *parent,
return clk_gate(name, parent, reg, shift, flags, CLK_GATE_SET_TO_DISABLE);
}
-struct clk *clk_register_gate(struct device_d *dev, const char *name,
- const char *parent_name, unsigned long flags,
- void __iomem *reg, u8 bit_idx,
- u8 clk_gate_flags, spinlock_t *lock)
+struct clk *clk_register_gate(struct device *dev, const char *name,
+ const char *parent_name, unsigned long flags,
+ void __iomem *reg, u8 bit_idx,
+ u8 clk_gate_flags, spinlock_t *lock)
{
return clk_gate(name, parent_name, reg, bit_idx, flags, clk_gate_flags);
}
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 8463f1ee82..ad82d97ea8 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -204,21 +204,23 @@ struct clk *clk_mux(const char *name, unsigned clk_flags, void __iomem *reg,
return m;
}
-struct clk *clk_register_mux(struct device_d *dev, const char *name,
- const char * const *parent_names, u8 num_parents,
- unsigned long flags,
- void __iomem *reg, u8 shift, u8 width,
- u8 clk_mux_flags, spinlock_t *lock)
+struct clk *clk_register_mux(struct device *dev, const char *name,
+ const char * const *parent_names, u8 num_parents,
+ unsigned long flags,
+ void __iomem *reg, u8 shift, u8 width,
+ u8 clk_mux_flags, spinlock_t *lock)
{
return clk_mux(name, flags, reg, shift, width, parent_names,
num_parents, clk_mux_flags);
}
-struct clk_hw *__clk_hw_register_mux(struct device_d *dev,
- const char *name, u8 num_parents,
- const char * const *parent_names,
- unsigned long flags, void __iomem *reg, u8 shift, u32 mask,
- u8 clk_mux_flags, u32 *table, spinlock_t *lock)
+struct clk_hw *__clk_hw_register_mux(struct device *dev,
+ const char *name, u8 num_parents,
+ const char * const *parent_names,
+ unsigned long flags, void __iomem *reg,
+ u8 shift, u32 mask,
+ u8 clk_mux_flags, u32 *table,
+ spinlock_t *lock)
{
struct clk_mux *mux;
struct clk_hw *hw;
diff --git a/drivers/clk/clk-rpi.c b/drivers/clk/clk-rpi.c
index 1eae4540bb..b745518854 100644
--- a/drivers/clk/clk-rpi.c
+++ b/drivers/clk/clk-rpi.c
@@ -40,7 +40,7 @@ static struct clk *rpi_register_firmware_clock(u32 clock_id, const char *name)
return clk_fixed(name, msg->get_clock_rate.body.resp.rate_hz);
}
-static int bcm2835_cprman_init(struct device_d *dev)
+static int bcm2835_cprman_init(struct device *dev)
{
struct clk *clk_cs;
@@ -50,9 +50,9 @@ static int bcm2835_cprman_init(struct device_d *dev)
return 0;
}
-static int rpi_cprman_probe(struct device_d *dev)
+static int rpi_cprman_probe(struct device *dev)
{
- int (*init)(struct device_d *dev);
+ int (*init)(struct device *dev);
init = device_get_match_data(dev);
if (init) {
diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c
index fcffe6a438..55141a7b54 100644
--- a/drivers/clk/clk-scmi.c
+++ b/drivers/clk/clk-scmi.c
@@ -101,7 +101,7 @@ static const struct clk_ops scmi_clk_ops = {
.disable = scmi_clk_disable,
};
-static int scmi_clk_ops_init(struct device_d *dev, struct scmi_clk *sclk)
+static int scmi_clk_ops_init(struct device *dev, struct scmi_clk *sclk)
{
struct clk_init_data init = {
.flags = CLK_GET_RATE_NOCACHE,
@@ -119,7 +119,7 @@ static int scmi_clocks_probe(struct scmi_device *sdev)
int idx, count, err;
struct clk **clks;
struct clk_onecell_data *clk_data;
- struct device_d *dev = &sdev->dev;
+ struct device *dev = &sdev->dev;
struct device_node *np = dev->of_node;
const struct scmi_handle *handle = sdev->handle;
struct scmi_protocol_handle *ph;
diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c
index 4611038f4b..4841d616f5 100644
--- a/drivers/clk/clk-stm32f4.c
+++ b/drivers/clk/clk-stm32f4.c
@@ -457,7 +457,7 @@ static const struct clk_ops clk_apb_mul_factor_ops = {
.recalc_rate = clk_apb_mul_recalc_rate,
};
-static struct clk *clk_register_apb_mul(struct device_d *dev, const char *name,
+static struct clk *clk_register_apb_mul(struct device *dev, const char *name,
const char *parent_name,
unsigned long flags, u8 bit_idx)
{
@@ -952,10 +952,12 @@ static const struct clk_ops rgclk_ops = {
.is_enabled = rgclk_is_enabled,
};
-static struct clk_hw *clk_register_rgate(struct device_d *dev, const char *name,
- const char *parent_name, unsigned long flags,
- void __iomem *reg, u8 bit_idx, u8 bit_rdy_idx,
- u8 clk_gate_flags, spinlock_t *lock)
+static struct clk_hw *clk_register_rgate(struct device *dev, const char *name,
+ const char *parent_name,
+ unsigned long flags,
+ void __iomem *reg, u8 bit_idx,
+ u8 bit_rdy_idx,
+ u8 clk_gate_flags, spinlock_t *lock)
{
struct stm32_rgate *rgate;
struct clk_init_data init = { NULL };
@@ -1047,10 +1049,13 @@ static const struct clk_ops cclk_mux_ops = {
.set_parent = cclk_mux_set_parent,
};
-static struct clk_hw *stm32_register_cclk(struct device_d *dev, const char *name,
- const char * const *parent_names, int num_parents,
- void __iomem *reg, u8 bit_idx, u8 shift, unsigned long flags,
- spinlock_t *lock)
+static struct clk_hw *stm32_register_cclk(struct device *dev,
+ const char *name,
+ const char * const *parent_names,
+ int num_parents,
+ void __iomem *reg, u8 bit_idx,
+ u8 shift, unsigned long flags,
+ spinlock_t *lock)
{
struct clk_hw *hw;
struct clk_gate *gate;
diff --git a/drivers/clk/clk-stm32mp1.c b/drivers/clk/clk-stm32mp1.c
index 6753a36890..93c77dfc72 100644
--- a/drivers/clk/clk-stm32mp1.c
+++ b/drivers/clk/clk-stm32mp1.c
@@ -320,7 +320,7 @@ struct clock_config {
int num_parents;
unsigned long flags;
void *cfg;
- struct clk_hw * (*func)(struct device_d *dev,
+ struct clk_hw * (*func)(struct device *dev,
struct clk_hw_onecell_data *clk_data,
void __iomem *base, spinlock_t *lock,
const struct clock_config *cfg);
@@ -380,7 +380,7 @@ struct stm32_composite_cfg {
};
static struct clk_hw *
-_clk_hw_register_gate(struct device_d *dev,
+_clk_hw_register_gate(struct device *dev,
struct clk_hw_onecell_data *clk_data,
void __iomem *base, spinlock_t *lock,
const struct clock_config *cfg)
@@ -398,7 +398,7 @@ _clk_hw_register_gate(struct device_d *dev,
}
static struct clk_hw *
-_clk_hw_register_fixed_factor(struct device_d *dev,
+_clk_hw_register_fixed_factor(struct device *dev,
struct clk_hw_onecell_data *clk_data,
void __iomem *base, spinlock_t *lock,
const struct clock_config *cfg)
@@ -411,7 +411,7 @@ _clk_hw_register_fixed_factor(struct device_d *dev,
}
static struct clk_hw *
-_clk_hw_register_divider_table(struct device_d *dev,
+_clk_hw_register_divider_table(struct device *dev,
struct clk_hw_onecell_data *clk_data,
void __iomem *base, spinlock_t *lock,
const struct clock_config *cfg)
@@ -431,7 +431,7 @@ _clk_hw_register_divider_table(struct device_d *dev,
}
static struct clk_hw *
-_clk_hw_register_mux(struct device_d *dev,
+_clk_hw_register_mux(struct device *dev,
struct clk_hw_onecell_data *clk_data,
void __iomem *base, spinlock_t *lock,
const struct clock_config *cfg)
@@ -472,7 +472,7 @@ static const struct clk_ops mp1_gate_clk_ops = {
.is_enabled = clk_gate_is_enabled,
};
-static struct clk_hw *_get_stm32_mux(struct device_d *dev, void __iomem *base,
+static struct clk_hw *_get_stm32_mux(struct device *dev, void __iomem *base,
const struct stm32_mux_cfg *cfg,
spinlock_t *lock)
{
@@ -512,7 +512,7 @@ static struct clk_hw *_get_stm32_mux(struct device_d *dev, void __iomem *base,
return mux_hw;
}
-static struct clk_hw *_get_stm32_div(struct device_d *dev, void __iomem *base,
+static struct clk_hw *_get_stm32_div(struct device *dev, void __iomem *base,
const struct stm32_div_cfg *cfg,
spinlock_t *lock)
{
@@ -533,7 +533,7 @@ static struct clk_hw *_get_stm32_div(struct device_d *dev, void __iomem *base,
return &div->hw;
}
-static struct clk_hw *_get_stm32_gate(struct device_d *dev, void __iomem *base,
+static struct clk_hw *_get_stm32_gate(struct device *dev, void __iomem *base,
const struct stm32_gate_cfg *cfg,
spinlock_t *lock)
{
@@ -573,7 +573,7 @@ static struct clk_hw *_get_stm32_gate(struct device_d *dev, void __iomem *base,
}
static struct clk_hw *
-clk_stm32_register_gate_ops(struct device_d *dev,
+clk_stm32_register_gate_ops(struct device *dev,
const char *name,
const char *parent_name,
unsigned long flags,
@@ -609,7 +609,7 @@ clk_stm32_register_gate_ops(struct device_d *dev,
}
static struct clk_hw *
-clk_stm32_register_composite(struct device_d *dev,
+clk_stm32_register_composite(struct device *dev,
const char *name, const char * const *parent_names,
int num_parents, void __iomem *base,
const struct stm32_composite_cfg *cfg,
@@ -852,7 +852,7 @@ static const struct clk_ops pll_ops = {
.get_parent = pll_get_parent,
};
-static struct clk_hw *clk_register_pll(struct device_d *dev, const char *name,
+static struct clk_hw *clk_register_pll(struct device *dev, const char *name,
const char * const *parent_names,
int num_parents,
void __iomem *reg,
@@ -989,7 +989,7 @@ static const struct clk_ops timer_ker_ops = {
};
-static struct clk_hw *clk_register_cktim(struct device_d *dev, const char *name,
+static struct clk_hw *clk_register_cktim(struct device *dev, const char *name,
const char *parent_name,
unsigned long flags,
void __iomem *apbdiv,
@@ -1030,7 +1030,7 @@ struct stm32_pll_cfg {
u32 muxoff;
};
-static struct clk_hw *_clk_register_pll(struct device_d *dev,
+static struct clk_hw *_clk_register_pll(struct device *dev,
struct clk_hw_onecell_data *clk_data,
void __iomem *base, spinlock_t *lock,
const struct clock_config *cfg)
@@ -1049,7 +1049,7 @@ struct stm32_cktim_cfg {
u32 offset_timpre;
};
-static struct clk_hw *_clk_register_cktim(struct device_d *dev,
+static struct clk_hw *_clk_register_cktim(struct device *dev,
struct clk_hw_onecell_data *clk_data,
void __iomem *base, spinlock_t *lock,
const struct clock_config *cfg)
@@ -1062,7 +1062,7 @@ static struct clk_hw *_clk_register_cktim(struct device_d *dev,
}
static struct clk_hw *
-_clk_stm32_register_gate(struct device_d *dev,
+_clk_stm32_register_gate(struct device *dev,
struct clk_hw_onecell_data *clk_data,
void __iomem *base, spinlock_t *lock,
const struct clock_config *cfg)
@@ -1077,7 +1077,7 @@ _clk_stm32_register_gate(struct device_d *dev,
}
static struct clk_hw *
-_clk_stm32_register_composite(struct device_d *dev,
+_clk_stm32_register_composite(struct device *dev,
struct clk_hw_onecell_data *clk_data,
void __iomem *base, spinlock_t *lock,
const struct clock_config *cfg)
@@ -2068,7 +2068,7 @@ static const struct of_device_id stm32mp1_match_data[] = {
{ }
};
-static int stm32_register_hw_clk(struct device_d *dev,
+static int stm32_register_hw_clk(struct device *dev,
struct clk_hw_onecell_data *clk_data,
void __iomem *base, spinlock_t *lock,
const struct clock_config *cfg)
@@ -2178,7 +2178,7 @@ static const struct reset_control_ops stm32_reset_ops = {
.status = stm32_reset_status,
};
-static int stm32_rcc_reset_init(struct device_d *dev, void __iomem *base,
+static int stm32_rcc_reset_init(struct device *dev, void __iomem *base,
const struct of_device_id *match)
{
const struct stm32_rcc_match_data *data = match->data;
@@ -2197,7 +2197,7 @@ static int stm32_rcc_reset_init(struct device_d *dev, void __iomem *base,
return reset_controller_register(&reset_data->rcdev);
}
-static int stm32_rcc_clock_init(struct device_d *dev, void __iomem *base,
+static int stm32_rcc_clock_init(struct device *dev, void __iomem *base,
const struct of_device_id *match)
{
const struct stm32_rcc_match_data *data = match->data;
@@ -2236,7 +2236,7 @@ static int stm32_rcc_clock_init(struct device_d *dev, void __iomem *base,
return of_clk_add_hw_provider(dev_of_node(dev), of_clk_hw_onecell_get, clk_data);
}
-static int stm32_rcc_init(struct device_d *dev, void __iomem *base,
+static int stm32_rcc_init(struct device *dev, void __iomem *base,
const struct of_device_id *match_data)
{
const struct of_device_id *match;
@@ -2265,7 +2265,7 @@ static int stm32_rcc_init(struct device_d *dev, void __iomem *base,
return 0;
}
-static int stm32mp1_rcc_init(struct device_d *dev)
+static int stm32mp1_rcc_init(struct device *dev)
{
void __iomem *base;
int ret;
@@ -2284,7 +2284,7 @@ static int stm32mp1_rcc_init(struct device_d *dev)
return 0;
}
-static int get_clock_deps(struct device_d *dev)
+static int get_clock_deps(struct device *dev)
{
static const char * const clock_deps_name[] = {
"hsi", "hse", "csi", "lsi", "lse",
@@ -2314,7 +2314,7 @@ static int get_clock_deps(struct device_d *dev)
return 0;
}
-static int stm32mp1_rcc_clocks_probe(struct device_d *dev)
+static int stm32mp1_rcc_clocks_probe(struct device *dev)
{
int ret = get_clock_deps(dev);
@@ -2324,7 +2324,7 @@ static int stm32mp1_rcc_clocks_probe(struct device_d *dev)
return ret;
}
-static void stm32mp1_rcc_clocks_remove(struct device_d *dev)
+static void stm32mp1_rcc_clocks_remove(struct device *dev)
{
struct device_node *child, *np = dev_of_node(dev);
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 52e309e877..30fe43032b 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -416,7 +416,7 @@ out:
return ret;
}
-struct clk *clk_register(struct device_d *dev, struct clk_hw *hw)
+struct clk *clk_register(struct device *dev, struct clk_hw *hw)
{
struct clk *clk;
const struct clk_init_data *init = hw->init;
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index d7d0103bdc..c5f2135f54 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -129,7 +129,7 @@ static struct clk *clk_find(const char *dev_id, const char *con_id)
return clk;
}
-static struct clk *clk_find_physbase(struct device_d *dev, const char *con_id)
+static struct clk *clk_find_physbase(struct device *dev, const char *con_id)
{
struct clk_lookup *p;
unsigned long start;
@@ -167,7 +167,7 @@ struct clk *clk_get_sys(const char *dev_id, const char *con_id)
}
EXPORT_SYMBOL(clk_get_sys);
-struct clk *clk_get(struct device_d *dev, const char *con_id)
+struct clk *clk_get(struct device *dev, const char *con_id)
{
const char *dev_id = dev ? dev_name(dev) : NULL;
struct clk *clk;
@@ -265,7 +265,7 @@ int clk_register_clkdev(struct clk *clk, const char *con_id,
}
int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
- struct device_d *dev)
+ struct device *dev)
{
struct clk *r = clk_get(dev, id);
struct clk_lookup *l;
diff --git a/drivers/clk/imx/clk-imx1.c b/drivers/clk/imx/clk-imx1.c
index cff32c0f99..c38111cd3c 100644
--- a/drivers/clk/imx/clk-imx1.c
+++ b/drivers/clk/imx/clk-imx1.c
@@ -73,7 +73,7 @@ static int __init mx1_clocks_init(void __iomem *regs, unsigned long fref)
return 0;
}
-static int imx1_ccm_probe(struct device_d *dev)
+static int imx1_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *regs;
diff --git a/drivers/clk/imx/clk-imx21.c b/drivers/clk/imx/clk-imx21.c
index 7abd82eeb1..7a9cbb1c6f 100644
--- a/drivers/clk/imx/clk-imx21.c
+++ b/drivers/clk/imx/clk-imx21.c
@@ -92,7 +92,7 @@ static const char *spll_sel_clks[] = {
"ckih",
};
-static int imx21_ccm_probe(struct device_d *dev)
+static int imx21_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base;
diff --git a/drivers/clk/imx/clk-imx25.c b/drivers/clk/imx/clk-imx25.c
index 2bd0d6004b..9edf1ad925 100644
--- a/drivers/clk/imx/clk-imx25.c
+++ b/drivers/clk/imx/clk-imx25.c
@@ -70,7 +70,7 @@ static const char *per_sel_clks[] = {
"upll",
};
-static int imx25_ccm_probe(struct device_d *dev)
+static int imx25_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base;
diff --git a/drivers/clk/imx/clk-imx27.c b/drivers/clk/imx/clk-imx27.c
index 54894d1032..78b2d60da3 100644
--- a/drivers/clk/imx/clk-imx27.c
+++ b/drivers/clk/imx/clk-imx27.c
@@ -155,7 +155,7 @@ static const char *clko_sel_clks[] = {
NULL,
};
-static int imx27_ccm_probe(struct device_d *dev)
+static int imx27_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base;
diff --git a/drivers/clk/imx/clk-imx31.c b/drivers/clk/imx/clk-imx31.c
index fe241cba5f..b0ea02580d 100644
--- a/drivers/clk/imx/clk-imx31.c
+++ b/drivers/clk/imx/clk-imx31.c
@@ -79,7 +79,7 @@ static const char *per_sel[] = {
"ipg",
};
-static int imx31_ccm_probe(struct device_d *dev)
+static int imx31_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base;
diff --git a/drivers/clk/imx/clk-imx35.c b/drivers/clk/imx/clk-imx35.c
index 9af149f68e..eb83748582 100644
--- a/drivers/clk/imx/clk-imx35.c
+++ b/drivers/clk/imx/clk-imx35.c
@@ -85,7 +85,7 @@ static const char *ipg_per_sel[] = {
"arm_per_div",
};
-static int imx35_ccm_probe(struct device_d *dev)
+static int imx35_ccm_probe(struct device *dev)
{
struct resource *iores;
u32 pdr0, consumer_sel, hsp_sel;
diff --git a/drivers/clk/imx/clk-imx5.c b/drivers/clk/imx/clk-imx5.c
index d96aa81358..2c7dca01ef 100644
--- a/drivers/clk/imx/clk-imx5.c
+++ b/drivers/clk/imx/clk-imx5.c
@@ -194,7 +194,8 @@ static const char *ipu_sel[] = {
"ahb",
};
-static void __init mx5_clocks_common_init(struct device_d *dev, void __iomem *base)
+static void __init mx5_clocks_common_init(struct device *dev,
+ void __iomem *base)
{
writel(0xffffffff, base + CCM_CCGR0);
writel(0xffffffff, base + CCM_CCGR1);
@@ -279,7 +280,7 @@ static void mx5_clocks_ipu_init(void __iomem *regs)
clks[IMX5_CLK_IPU_SEL] = imx_clk_mux("ipu_sel", regs + CCM_CBCMR, 6, 2, ipu_sel, ARRAY_SIZE(ipu_sel));
}
-static int __init mx50_clocks_init(struct device_d *dev, void __iomem *regs)
+static int __init mx50_clocks_init(struct device *dev, void __iomem *regs)
{
clks[IMX5_CLK_PLL1_SW] = imx_clk_pllv2("pll1_sw", "osc",
(void *)MX50_PLL1_BASE_ADDR);
@@ -319,7 +320,7 @@ static int __init mx50_clocks_init(struct device_d *dev, void __iomem *regs)
return 0;
}
-static int imx50_ccm_probe(struct device_d *dev)
+static int imx50_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *regs;
@@ -369,7 +370,7 @@ static void mx51_clocks_ipu_init(void __iomem *regs)
clkdev_add_physbase(clks[IMX5_CLK_IPU_DI1_SEL], MX51_IPU_BASE_ADDR, "di1");
}
-static int __init mx51_clocks_init(struct device_d *dev, void __iomem *regs)
+static int __init mx51_clocks_init(struct device *dev, void __iomem *regs)
{
clks[IMX5_CLK_PLL1_SW] = imx_clk_pllv2("pll1_sw", "osc", (void *)MX51_PLL1_BASE_ADDR);
clks[IMX5_CLK_PLL2_SW] = imx_clk_pllv2("pll2_sw", "osc", (void *)MX51_PLL2_BASE_ADDR);
@@ -404,7 +405,7 @@ static int __init mx51_clocks_init(struct device_d *dev, void __iomem *regs)
return 0;
}
-static int imx51_ccm_probe(struct device_d *dev)
+static int imx51_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *regs;
@@ -463,7 +464,7 @@ static void mx53_clocks_ipu_init(void __iomem *regs)
clkdev_add_physbase(clks[IMX5_CLK_IPU_DI1_SEL], MX53_IPU_BASE_ADDR, "di1");
}
-static int __init mx53_clocks_init(struct device_d *dev, void __iomem *regs)
+static int __init mx53_clocks_init(struct device *dev, void __iomem *regs)
{
clks[IMX5_CLK_PLL1_SW] = imx_clk_pllv2("pll1_sw", "osc", (void *)MX53_PLL1_BASE_ADDR);
clks[IMX5_CLK_PLL2_SW] = imx_clk_pllv2("pll2_sw", "osc", (void *)MX53_PLL2_BASE_ADDR);
@@ -502,7 +503,7 @@ static int __init mx53_clocks_init(struct device_d *dev, void __iomem *regs)
return 0;
}
-static int imx53_ccm_probe(struct device_d *dev)
+static int imx53_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *regs;
diff --git a/drivers/clk/imx/clk-imx6.c b/drivers/clk/imx/clk-imx6.c
index 692bbd4e0a..bf444d7cfc 100644
--- a/drivers/clk/imx/clk-imx6.c
+++ b/drivers/clk/imx/clk-imx6.c
@@ -647,7 +647,7 @@ static void imx6_add_video_clks(void __iomem *anab, void __iomem *cb, struct dev
clk_set_parent(clks[IMX6QDL_CLK_IPU2_DI1_PRE_SEL], clks[IMX6QDL_CLK_PLL5_VIDEO_DIV]);
}
-static int imx6_ccm_probe(struct device_d *dev)
+static int imx6_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base, *anatop_base, *ccm_base;
diff --git a/drivers/clk/imx/clk-imx6sl.c b/drivers/clk/imx/clk-imx6sl.c
index 3e6a8c58d0..4c0e4856bd 100644
--- a/drivers/clk/imx/clk-imx6sl.c
+++ b/drivers/clk/imx/clk-imx6sl.c
@@ -81,7 +81,7 @@ static struct clk_div_table video_div_table[] = {
{ }
};
-static int imx6sl_ccm_probe(struct device_d *dev)
+static int imx6sl_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base, *anatop_base, *ccm_base;
diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c
index ae61c138fd..8877bbef83 100644
--- a/drivers/clk/imx/clk-imx6sx.c
+++ b/drivers/clk/imx/clk-imx6sx.c
@@ -109,7 +109,7 @@ static struct clk_div_table video_div_table[] = {
{ }
};
-static int imx6sx_ccm_probe(struct device_d *dev)
+static int imx6sx_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base, *anatop_base, *ccm_base;
diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c
index 24350d63fa..523aa02529 100644
--- a/drivers/clk/imx/clk-imx6ul.c
+++ b/drivers/clk/imx/clk-imx6ul.c
@@ -92,7 +92,7 @@ static struct clk_div_table clk_enet_ref_table[] = {
{ }
};
-static int imx6_ccm_probe(struct device_d *dev)
+static int imx6_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base, *anatop_base, *ccm_base;
diff --git a/drivers/clk/imx/clk-imx7.c b/drivers/clk/imx/clk-imx7.c
index b75928d59e..38d3ca7efc 100644
--- a/drivers/clk/imx/clk-imx7.c
+++ b/drivers/clk/imx/clk-imx7.c
@@ -363,7 +363,7 @@ static struct device_node *ccm_np;
static int imx7_clk_setup(void);
-static int imx7_ccm_probe(struct device_d *dev)
+static int imx7_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base, *anatop_base, *ccm_base;
diff --git a/drivers/clk/loongson/clk-ls1b200.c b/drivers/clk/loongson/clk-ls1b200.c
index 096768c7a1..ada6e73a40 100644
--- a/drivers/clk/loongson/clk-ls1b200.c
+++ b/drivers/clk/loongson/clk-ls1b200.c
@@ -114,7 +114,7 @@ static void ls1b200_pll_init(void __iomem *base)
10, 1, dc_mux, ARRAY_SIZE(dc_mux), 0);
}
-static int ls1b200_clk_probe(struct device_d *dev)
+static int ls1b200_clk_probe(struct device *dev)
{
struct resource *iores;
void __iomem *base;
diff --git a/drivers/clk/mvebu/common.c b/drivers/clk/mvebu/common.c
index 17cbc77690..c0a74a9655 100644
--- a/drivers/clk/mvebu/common.c
+++ b/drivers/clk/mvebu/common.c
@@ -39,7 +39,7 @@ static struct of_device_id mvebu_coreclk_ids[] = {
{ }
};
-static int mvebu_coreclk_probe(struct device_d *dev)
+static int mvebu_coreclk_probe(struct device *dev)
{
struct resource *iores;
struct device_node *np = dev->of_node;
@@ -148,7 +148,7 @@ static struct of_device_id mvebu_clk_gating_ids[] = {
{ }
};
-static int mvebu_clk_gating_probe(struct device_d *dev)
+static int mvebu_clk_gating_probe(struct device *dev)
{
struct resource *iores;
struct device_node *np = dev->of_node;
diff --git a/drivers/clk/mvebu/corediv.c b/drivers/clk/mvebu/corediv.c
index 7b85bd01d3..194fce700d 100644
--- a/drivers/clk/mvebu/corediv.c
+++ b/drivers/clk/mvebu/corediv.c
@@ -194,7 +194,7 @@ static struct of_device_id mvebu_corediv_clk_ids[] = {
{ }
};
-static int mvebu_corediv_clk_probe(struct device_d *dev)
+static int mvebu_corediv_clk_probe(struct device *dev)
{
struct resource *iores;
struct device_node *np = dev->of_node;
diff --git a/drivers/clk/mxs/clk-imx23.c b/drivers/clk/mxs/clk-imx23.c
index a211b64f2c..8181238b71 100644
--- a/drivers/clk/mxs/clk-imx23.c
+++ b/drivers/clk/mxs/clk-imx23.c
@@ -112,7 +112,7 @@ static int __init mx23_clocks_init(void __iomem *regs)
return 0;
}
-static int imx23_ccm_probe(struct device_d *dev)
+static int imx23_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *regs;
diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c
index a10571237f..cb76258b26 100644
--- a/drivers/clk/mxs/clk-imx28.c
+++ b/drivers/clk/mxs/clk-imx28.c
@@ -67,7 +67,7 @@ enum imx28_clk {
static struct clk *clks[clk_max];
static struct clk_onecell_data clk_data;
-static int __init mx28_clocks_init(struct device_d *dev, void __iomem *regs)
+static int __init mx28_clocks_init(struct device *dev, void __iomem *regs)
{
struct device_node *dcnp;
@@ -175,7 +175,7 @@ static int __init mx28_clocks_init(struct device_d *dev, void __iomem *regs)
return 0;
}
-static int imx28_ccm_probe(struct device_d *dev)
+static int imx28_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *regs;
diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
index 1f2430e521..4f7722220d 100644
--- a/drivers/clk/rockchip/clk-rk3399.c
+++ b/drivers/clk/rockchip/clk-rk3399.c
@@ -1627,7 +1627,7 @@ static const struct of_device_id clk_rk3399_match_table[] = {
{ }
};
-static int __init clk_rk3399_probe(struct device_d *dev)
+static int __init clk_rk3399_probe(struct device *dev)
{
struct device_node *np = dev->of_node;
const struct of_device_id *match;
diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c
index 3e788f2c5a..632298a023 100644
--- a/drivers/clk/rockchip/clk-rk3568.c
+++ b/drivers/clk/rockchip/clk-rk3568.c
@@ -1719,7 +1719,7 @@ static const struct of_device_id clk_rk3568_match_table[] = {
{ }
};
-static int __init clk_rk3568_probe(struct device_d *dev)
+static int __init clk_rk3568_probe(struct device *dev)
{
struct device_node *np = dev->of_node;
const struct clk_rk3568_inits *init_data;
diff --git a/drivers/clk/sifive/sifive-prci.c b/drivers/clk/sifive/sifive-prci.c
index 010ccb92af..eb4d963eff 100644
--- a/drivers/clk/sifive/sifive-prci.c
+++ b/drivers/clk/sifive/sifive-prci.c
@@ -470,7 +470,7 @@ void sifive_prci_hfpclkpllsel_use_hfpclkpll(struct __prci_data *pd)
*
* Return: 0 upon success or a negative error code upon failure.
*/
-static int __prci_register_clocks(struct device_d *dev, struct __prci_data *pd,
+static int __prci_register_clocks(struct device *dev, struct __prci_data *pd,
const struct prci_clk_desc *desc)
{
struct clk_init_data init = { };
@@ -536,7 +536,7 @@ static int __prci_register_clocks(struct device_d *dev, struct __prci_data *pd,
*
* Return: 0 upon success or a negative error code upon failure.
*/
-static int sifive_prci_probe(struct device_d *dev)
+static int sifive_prci_probe(struct device *dev)
{
struct resource *res;
struct __prci_data *pd;
diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
index 6691403843..a1ed9c92d1 100644
--- a/drivers/clk/socfpga/clk.c
+++ b/drivers/clk/socfpga/clk.c
@@ -367,7 +367,8 @@ static struct clk *socfpga_gate_clk(struct device_node *node)
return &cs->hw.clk;
}
-static void socfpga_register_clocks(struct device_d *dev, struct device_node *node)
+static void socfpga_register_clocks(struct device *dev,
+ struct device_node *node)
{
struct device_node *child;
struct clk *clk;
@@ -394,7 +395,7 @@ static void socfpga_register_clocks(struct device_d *dev, struct device_node *no
of_clk_add_provider(node, of_clk_src_simple_get, clk);
}
-static int socfpga_ccm_probe(struct device_d *dev)
+static int socfpga_ccm_probe(struct device *dev)
{
struct resource *iores;
void __iomem *regs;
diff --git a/drivers/clk/starfive/jh7100-clkgen.c b/drivers/clk/starfive/jh7100-clkgen.c
index 29095aa991..0d165c99a6 100644
--- a/drivers/clk/starfive/jh7100-clkgen.c
+++ b/drivers/clk/starfive/jh7100-clkgen.c
@@ -332,7 +332,7 @@ static void starfive_clkgen_init(struct device_node *np, void __iomem *base)
static struct clk_onecell_data clk_data;
-static int starfive_clkgen_clk_probe(struct device_d *dev)
+static int starfive_clkgen_clk_probe(struct device *dev)
{
struct resource *iores;
diff --git a/drivers/clk/tegra/clk-tegra124.c b/drivers/clk/tegra/clk-tegra124.c
index c7644361f3..1a16d95d9b 100644
--- a/drivers/clk/tegra/clk-tegra124.c
+++ b/drivers/clk/tegra/clk-tegra124.c
@@ -322,7 +322,7 @@ static struct tegra_clk_init_table init_table[] = {
{TEGRA124_CLK_CLK_MAX, TEGRA124_CLK_CLK_MAX, 0, 0}, /* sentinel */
};
-static int tegra124_car_probe(struct device_d *dev)
+static int tegra124_car_probe(struct device *dev)
{
struct resource *iores;
iores = dev_request_mem_resource(dev, 0);
diff --git a/drivers/clk/tegra/clk-tegra20.c b/drivers/clk/tegra/clk-tegra20.c
index 04bcec1f25..ae0434b87f 100644
--- a/drivers/clk/tegra/clk-tegra20.c
+++ b/drivers/clk/tegra/clk-tegra20.c
@@ -325,7 +325,7 @@ static struct tegra_clk_init_table init_table[] = {
{TEGRA20_CLK_CLK_MAX, TEGRA20_CLK_CLK_MAX, 0, 0}, /* sentinel */
};
-static int tegra20_car_probe(struct device_d *dev)
+static int tegra20_car_probe(struct device *dev)
{
struct resource *iores;
iores = dev_request_mem_resource(dev, 0);
diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c
index cbb3b959b4..078dec958d 100644
--- a/drivers/clk/tegra/clk-tegra30.c
+++ b/drivers/clk/tegra/clk-tegra30.c
@@ -353,7 +353,7 @@ static struct tegra_clk_init_table init_table[] = {
{TEGRA30_CLK_CLK_MAX, TEGRA30_CLK_CLK_MAX, 0, 0}, /* sentinel */
};
-static int tegra30_car_probe(struct device_d *dev)
+static int tegra30_car_probe(struct device *dev)
{
struct resource *iores;
iores = dev_request_mem_resource(dev, 0);
diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index a6916bf448..6a75ade5ac 100644
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@ -364,7 +364,7 @@ static struct clk *zynq_cpu_subclk(const char *name,
return &subclk->hw.clk;
}
-static int zynq_clock_probe(struct device_d *dev)
+static int zynq_clock_probe(struct device *dev)
{
struct resource *iores;
void __iomem *clk_base;
diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c
index a5cb99ba8d..acbbc481a0 100644
--- a/drivers/clk/zynqmp/clkc.c
+++ b/drivers/clk/zynqmp/clkc.c
@@ -446,7 +446,7 @@ static struct clk *zynqmp_register_clk_topology(char *clk_name,
return clk;
}
-static int zynqmp_register_clocks(struct device_d *dev,
+static int zynqmp_register_clocks(struct device *dev,
struct clk **clks, size_t num_clocks)
{
unsigned int i;
@@ -518,7 +518,7 @@ static void zynqmp_fill_clock_info(struct zynqmp_clock_info *clock_info,
}
}
-static int zynqmp_clock_probe(struct device_d *dev)
+static int zynqmp_clock_probe(struct device *dev)
{
int err;
u32 api_version;
diff --git a/drivers/clocksource/arm_architected_timer.c b/drivers/clocksource/arm_architected_timer.c
index d5948fe948..f8a60e4439 100644
--- a/drivers/clocksource/arm_architected_timer.c
+++ b/drivers/clocksource/arm_architected_timer.c
@@ -22,7 +22,7 @@ static struct clocksource cs = {
.priority = 70,
};
-static int arm_arch_timer_probe(struct device_d *dev)
+static int arm_arch_timer_probe(struct device *dev)
{
cs.mult = clocksource_hz2mult(get_cntfrq(), cs.shift);
diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c
index 65bfca3558..11039f7472 100644
--- a/drivers/clocksource/arm_global_timer.c
+++ b/drivers/clocksource/arm_global_timer.c
@@ -63,7 +63,7 @@ static struct clocksource cs = {
.priority = 70,
};
-static int arm_global_timer_probe(struct device_d *dev)
+static int arm_global_timer_probe(struct device *dev)
{
struct resource *iores;
struct clk *clk;
diff --git a/drivers/clocksource/arm_smp_twd.c b/drivers/clocksource/arm_smp_twd.c
index 1ad754bb2b..407d0e4052 100644
--- a/drivers/clocksource/arm_smp_twd.c
+++ b/drivers/clocksource/arm_smp_twd.c
@@ -40,7 +40,7 @@ static struct clocksource smp_twd_clksrc = {
#define SMP_TWD_MAX_FREQ (25 *1000 * 1000)
-static int smp_twd_probe(struct device_d *dev)
+static int smp_twd_probe(struct device *dev)
{
struct resource *iores;
u32 tick_rate;
diff --git a/drivers/clocksource/armv7m_systick.c b/drivers/clocksource/armv7m_systick.c
index 9eb292ee94..4167e97655 100644
--- a/drivers/clocksource/armv7m_systick.c
+++ b/drivers/clocksource/armv7m_systick.c
@@ -37,7 +37,7 @@ static struct clocksource cs = {
.priority = 70,
};
-static int armv7m_systick_probe(struct device_d *dev)
+static int armv7m_systick_probe(struct device *dev)
{
struct clk *clk = NULL;
u32 rate, cal;
diff --git a/drivers/clocksource/bcm2835.c b/drivers/clocksource/bcm2835.c
index 26c1382738..5e3f0c0618 100644
--- a/drivers/clocksource/bcm2835.c
+++ b/drivers/clocksource/bcm2835.c
@@ -32,7 +32,7 @@ static struct clocksource bcm2835_stc = {
.priority = IS_ENABLED(CONFIG_CPU_V8) ? 60 : 80,
};
-static int bcm2835_cs_probe(struct device_d *dev)
+static int bcm2835_cs_probe(struct device *dev)
{
struct resource *iores;
static struct clk *stc_clk;
diff --git a/drivers/clocksource/clps711x.c b/drivers/clocksource/clps711x.c
index e96924b750..43d7d4de70 100644
--- a/drivers/clocksource/clps711x.c
+++ b/drivers/clocksource/clps711x.c
@@ -22,7 +22,7 @@ static struct clocksource clps711x_cs = {
.priority = 60,
};
-static int clps711x_cs_probe(struct device_d *dev)
+static int clps711x_cs_probe(struct device *dev)
{
struct resource *iores;
u32 rate;
diff --git a/drivers/clocksource/digic.c b/drivers/clocksource/digic.c
index 234985aece..cece33b582 100644
--- a/drivers/clocksource/digic.c
+++ b/drivers/clocksource/digic.c
@@ -29,7 +29,7 @@ static struct clocksource digic_cs = {
.priority = 60,
};
-static int digic_timer_probe(struct device_d *dev)
+static int digic_timer_probe(struct device *dev)
{
struct resource *iores;
/* use only one timer */
diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c
index d0be26b380..62382b9105 100644
--- a/drivers/clocksource/dw_apb_timer.c
+++ b/drivers/clocksource/dw_apb_timer.c
@@ -97,7 +97,7 @@ static struct clocksource dw_apb_clksrc = {
.priority = 50,
};
-static int dw_apb_timer_probe(struct device_d *dev)
+static int dw_apb_timer_probe(struct device *dev)
{
struct device_node *np = dev->of_node;
struct resource *iores;
diff --git a/drivers/clocksource/efi.c b/drivers/clocksource/efi.c
index 9df5226573..4f9fbc3975 100644
--- a/drivers/clocksource/efi.c
+++ b/drivers/clocksource/efi.c
@@ -96,7 +96,7 @@ static struct clocksource efi_cs = {
.priority = 80,
};
-static int efi_cs_probe(struct device_d *dev)
+static int efi_cs_probe(struct device *dev)
{
return init_clock(&efi_cs);
}
diff --git a/drivers/clocksource/efi_x86.c b/drivers/clocksource/efi_x86.c
index c9b6c44a1e..bce75351ab 100644
--- a/drivers/clocksource/efi_x86.c
+++ b/drivers/clocksource/efi_x86.c
@@ -62,7 +62,7 @@ static struct clocksource efi_x86_cs = {
.init = efi_x86_cs_init,
};
-static int efi_x86_cs_probe(struct device_d *dev)
+static int efi_x86_cs_probe(struct device *dev)
{
return init_clock(&efi_x86_cs);
}
diff --git a/drivers/clocksource/kvx_timer.c b/drivers/clocksource/kvx_timer.c
index 259755eacd..77ecd64d41 100644
--- a/drivers/clocksource/kvx_timer.c
+++ b/drivers/clocksource/kvx_timer.c
@@ -24,7 +24,7 @@ static struct clocksource kvx_clksrc = {
.priority = 70,
};
-static int kvx_timer_probe(struct device_d *dev)
+static int kvx_timer_probe(struct device *dev)
{
struct clk *clk;
uint32_t clk_freq;
diff --git a/drivers/clocksource/mvebu.c b/drivers/clocksource/mvebu.c
index 47a4e379c1..27bb324a2e 100644
--- a/drivers/clocksource/mvebu.c
+++ b/drivers/clocksource/mvebu.c
@@ -45,7 +45,7 @@ static struct clocksource cs = {
.priority = 70,
};
-static int mvebu_timer_probe(struct device_d *dev)
+static int mvebu_timer_probe(struct device *dev)
{
struct resource *iores;
struct clk *clk;
diff --git a/drivers/clocksource/nomadik.c b/drivers/clocksource/nomadik.c
index 7cf10352ea..6707fc2cc4 100644
--- a/drivers/clocksource/nomadik.c
+++ b/drivers/clocksource/nomadik.c
@@ -90,7 +90,7 @@ static void nmdk_timer_reset(void)
writel(cr | MTU_CRn_ENA, mtu_base + MTU_CR(0));
}
-static int nmdk_mtu_probe(struct device_d *dev)
+static int nmdk_mtu_probe(struct device *dev)
{
struct resource *iores;
static struct clk *mtu_clk;
diff --git a/drivers/clocksource/orion.c b/drivers/clocksource/orion.c
index 4a56849800..634ec022fa 100644
--- a/drivers/clocksource/orion.c
+++ b/drivers/clocksource/orion.c
@@ -34,7 +34,7 @@ static struct clocksource clksrc = {
.priority = 70,
};
-static int orion_timer_probe(struct device_d *dev)
+static int orion_timer_probe(struct device *dev)
{
struct resource *iores;
struct clk *tclk;
diff --git a/drivers/clocksource/rk_timer.c b/drivers/clocksource/rk_timer.c
index e941030771..00c884949e 100644
--- a/drivers/clocksource/rk_timer.c
+++ b/drivers/clocksource/rk_timer.c
@@ -35,7 +35,7 @@ static struct clocksource rkcs = {
.priority = 80,
};
-static int rockchip_timer_probe(struct device_d *dev)
+static int rockchip_timer_probe(struct device *dev)
{
struct resource *iores;
diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
index a133e384d7..72fe1368a1 100644
--- a/drivers/clocksource/timer-atmel-pit.c
+++ b/drivers/clocksource/timer-atmel-pit.c
@@ -56,7 +56,7 @@ static void at91sam926x_pit_reset(void)
pit_write(AT91_PIT_MR, 0xfffff | AT91_PIT_PITEN);
}
-static int at91_pit_probe(struct device_d *dev)
+static int at91_pit_probe(struct device *dev)
{
struct clk *clk;
u32 pit_rate;
diff --git a/drivers/clocksource/timer-clint.c b/drivers/clocksource/timer-clint.c
index d48b5bcba0..b5ac16e9bf 100644
--- a/drivers/clocksource/timer-clint.c
+++ b/drivers/clocksource/timer-clint.c
@@ -60,7 +60,7 @@ static struct clocksource clint_clocksource = {
.priority = 200,
};
-static int clint_timer_init_dt(struct device_d* dev)
+static int clint_timer_init_dt(struct device * dev)
{
struct resource *iores;
diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 7ca879f4f0..6a2fb3f335 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -77,7 +77,7 @@ static struct notifier_block imx_clock_notifier = {
.notifier_call = imx_clocksource_clock_change,
};
-static int imx_gpt_probe(struct device_d *dev)
+static int imx_gpt_probe(struct device *dev)
{
struct resource *iores;
int i;
diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c
index c7af54fc8f..22dfe6539f 100644
--- a/drivers/clocksource/timer-riscv.c
+++ b/drivers/clocksource/timer-riscv.c
@@ -48,7 +48,7 @@ static struct clocksource riscv_clocksource = {
.priority = 100,
};
-static int riscv_timer_init(struct device_d* dev)
+static int riscv_timer_init(struct device * dev)
{
struct device_node *cpu;
diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c
index dec48fccf5..4d1ca1080d 100644
--- a/drivers/clocksource/timer-stm32.c
+++ b/drivers/clocksource/timer-stm32.c
@@ -61,7 +61,7 @@ static struct clocksource cs = {
.priority = 100,
};
-static int stm32_timer_probe(struct device_d *dev)
+static int stm32_timer_probe(struct device *dev)
{
struct resource *iores;
struct clk *clk;
diff --git a/drivers/clocksource/timer-ti-32k.c b/drivers/clocksource/timer-ti-32k.c
index 21cb686369..bf31e46270 100644
--- a/drivers/clocksource/timer-ti-32k.c
+++ b/drivers/clocksource/timer-ti-32k.c
@@ -59,7 +59,7 @@ static struct clocksource s32k_cs = {
*
* @return result of @ref init_clock
*/
-static int omap_32ktimer_probe(struct device_d *dev)
+static int omap_32ktimer_probe(struct device *dev)
{
struct resource *iores;
diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c
index cdd297f10c..0fea2221da 100644
--- a/drivers/clocksource/timer-ti-dm.c
+++ b/drivers/clocksource/timer-ti-dm.c
@@ -65,7 +65,7 @@ static struct clocksource dmtimer_cs = {
.priority = 70,
};
-static int omap_dmtimer_probe(struct device_d *dev)
+static int omap_dmtimer_probe(struct device *dev)
{
struct resource *iores;
u64 clk_speed;
diff --git a/drivers/clocksource/uemd.c b/drivers/clocksource/uemd.c
index a763eadc0c..54c79c29be 100644
--- a/drivers/clocksource/uemd.c
+++ b/drivers/clocksource/uemd.c
@@ -55,7 +55,7 @@ static struct clocksource uemd_cs = {
.priority = 60,
};
-static int uemd_timer_probe(struct device_d *dev)
+static int uemd_timer_probe(struct device *dev)
{
struct resource *iores;
int mode;
diff --git a/drivers/crypto/caam/caam-blobgen.c b/drivers/crypto/caam/caam-blobgen.c
index be4696f58c..5ab7ad3a6e 100644
--- a/drivers/crypto/caam/caam-blobgen.c
+++ b/drivers/crypto/caam/caam-blobgen.c
@@ -88,7 +88,7 @@ static void jr_jobdesc_blob_encap(struct blob_priv *ctx, u8 modlen, u16 input_si
append_operation(desc, OP_TYPE_ENCAP_PROTOCOL | OP_PCLID_BLOB);
}
-static void blob_job_done(struct device_d *dev, u32 *desc, u32 err, void *arg)
+static void blob_job_done(struct device *dev, u32 *desc, u32 err, void *arg)
{
struct blob_job_result *res = arg;
@@ -106,7 +106,7 @@ static int caam_blob_decrypt(struct blobgen *bg, const char *modifier,
int *plainsize)
{
struct blob_priv *ctx = to_blob_priv(bg);
- struct device_d *jrdev = bg->dev.parent;
+ struct device *jrdev = bg->dev.parent;
struct blob_job_result testres;
int modifier_len = strlen(modifier);
u32 *desc = ctx->desc;
@@ -162,7 +162,7 @@ static int caam_blob_encrypt(struct blobgen *bg, const char *modifier,
int *blobsize)
{
struct blob_priv *ctx = to_blob_priv(bg);
- struct device_d *jrdev = bg->dev.parent;
+ struct device *jrdev = bg->dev.parent;
struct blob_job_result testres;
int modifier_len = strlen(modifier);
u32 *desc = ctx->desc;
@@ -206,7 +206,7 @@ static int caam_blob_encrypt(struct blobgen *bg, const char *modifier,
return ret;
}
-int caam_blob_gen_probe(struct device_d *dev, struct device_d *jrdev)
+int caam_blob_gen_probe(struct device *dev, struct device *jrdev)
{
struct blob_priv *ctx;
struct blobgen *bg;
diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c
index 3283e5f321..240a440c76 100644
--- a/drivers/crypto/caam/caamrng.c
+++ b/drivers/crypto/caam/caamrng.c
@@ -67,7 +67,7 @@ struct buf_data {
/* rng per-device context */
struct caam_rng_ctx {
- struct device_d *jrdev;
+ struct device *jrdev;
dma_addr_t sh_desc_dma;
u32 sh_desc[DESC_RNG_LEN];
unsigned int cur_buf_idx;
@@ -78,7 +78,7 @@ struct caam_rng_ctx {
static struct caam_rng_ctx *rng_ctx;
-static void rng_done(struct device_d *jrdev, u32 *desc, u32 err, void *context)
+static void rng_done(struct device *jrdev, u32 *desc, u32 err, void *context)
{
struct buf_data *bd;
@@ -99,7 +99,7 @@ static void rng_done(struct device_d *jrdev, u32 *desc, u32 err, void *context)
static inline int submit_job(struct caam_rng_ctx *ctx, int to_current)
{
struct buf_data *bd = &ctx->bufs[!(to_current ^ ctx->current_buf)];
- struct device_d *jrdev = ctx->jrdev;
+ struct device *jrdev = ctx->jrdev;
u32 *desc = bd->hw_desc;
int err;
@@ -222,7 +222,7 @@ static int caam_init_buf(struct caam_rng_ctx *ctx, int buf_id)
return submit_job(ctx, buf_id == ctx->current_buf);
}
-static int caam_init_rng(struct caam_rng_ctx *ctx, struct device_d *jrdev)
+static int caam_init_rng(struct caam_rng_ctx *ctx, struct device *jrdev)
{
int err;
@@ -242,7 +242,7 @@ static int caam_init_rng(struct caam_rng_ctx *ctx, struct device_d *jrdev)
return caam_init_buf(ctx, 1);
}
-int caam_rng_probe(struct device_d *dev, struct device_d *jrdev)
+int caam_rng_probe(struct device *dev, struct device *jrdev)
{
int err;
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 3a86c5f9a3..72a422eb7c 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -75,7 +75,7 @@ static void build_instantiation_desc(u32 *desc, int handle, int do_sk)
* - -ENODEV if the DECO couldn't be acquired
* - -EAGAIN if an error occurred while executing the descriptor
*/
-static inline int run_descriptor_deco0(struct device_d *ctrldev, u32 *desc,
+static inline int run_descriptor_deco0(struct device *ctrldev, u32 *desc,
u32 *status)
{
struct caam_drv_private *ctrlpriv = ctrldev->priv;
@@ -171,7 +171,7 @@ static inline int run_descriptor_deco0(struct device_d *ctrldev, u32 *desc,
* f.i. there was a RNG hardware error due to not "good enough"
* entropy being aquired.
*/
-static int instantiate_rng(struct device_d *ctrldev, int state_handle_mask,
+static int instantiate_rng(struct device *ctrldev, int state_handle_mask,
int gen_sk)
{
struct caam_drv_private *ctrlpriv = ctrldev->priv;
@@ -222,7 +222,7 @@ static int instantiate_rng(struct device_d *ctrldev, int state_handle_mask,
return ret;
}
-static void caam_remove(struct device_d *dev)
+static void caam_remove(struct device *dev)
{
struct caam_drv_private *ctrlpriv = dev->priv;
@@ -241,7 +241,7 @@ static void caam_remove(struct device_d *dev)
* @pdev - pointer to the platform device
* @ent_delay - Defines the length (in system clocks) of each entropy sample.
*/
-static void kick_trng(struct device_d *ctrldev, int ent_delay)
+static void kick_trng(struct device *ctrldev, int ent_delay)
{
struct caam_drv_private *ctrlpriv = ctrldev->priv;
struct caam_ctrl __iomem *ctrl;
@@ -350,7 +350,7 @@ static int caam_get_era(struct caam_ctrl __iomem *ctrl)
}
/* Probe routine for CAAM top (controller) level */
-static int caam_probe(struct device_d *dev)
+static int caam_probe(struct device *dev)
{
int ret, ring, rspec, gen_sk, ent_delay = RTSDCTL_ENT_DLY_MIN;
u64 caam_id;
@@ -525,14 +525,14 @@ static int caam_probe(struct device_d *dev)
of_device_is_compatible(np, "fsl,sec4.0-job-ring"))
rspec++;
- ctrlpriv->jrpdev = xzalloc(sizeof(struct device_d *) * rspec);
+ ctrlpriv->jrpdev = xzalloc(sizeof(struct device *) * rspec);
ring = 0;
ctrlpriv->total_jobrs = 0;
for_each_available_child_of_node(nprop, np) {
if (of_device_is_compatible(np, "fsl,sec-v4.0-job-ring") ||
of_device_is_compatible(np, "fsl,sec4.0-job-ring")) {
- struct device_d *jrdev;
+ struct device *jrdev;
jrdev = of_platform_device_create(np, dev);
if (!jrdev)
diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c
index b737e5b0a9..de7a64b630 100644
--- a/drivers/crypto/caam/error.c
+++ b/drivers/crypto/caam/error.c
@@ -115,14 +115,14 @@ static const char * const rng_err_id_list[] = {
"Secure key generation",
};
-static void report_invalid_status(struct device_d *jrdev, const u32 status,
+static void report_invalid_status(struct device *jrdev, const u32 status,
const char *error)
{
dev_err(jrdev, "%08x: %s: %s() not implemented\n",
status, error, __func__);
}
-static void report_ccb_status(struct device_d *jrdev, const u32 status,
+static void report_ccb_status(struct device *jrdev, const u32 status,
const char *error)
{
u8 cha_id = (status & JRSTA_CCBERR_CHAID_MASK) >>
@@ -166,14 +166,14 @@ static void report_ccb_status(struct device_d *jrdev, const u32 status,
err_str, err_err_code);
}
-static void report_jump_status(struct device_d *jrdev, const u32 status,
+static void report_jump_status(struct device *jrdev, const u32 status,
const char *error)
{
dev_err(jrdev, "%08x: %s: %s() not implemented\n",
status, error, __func__);
}
-static void report_deco_status(struct device_d *jrdev, const u32 status,
+static void report_deco_status(struct device *jrdev, const u32 status,
const char *error)
{
u8 err_id = status & JRSTA_DECOERR_ERROR_MASK;
@@ -202,24 +202,24 @@ static void report_deco_status(struct device_d *jrdev, const u32 status,
status, error, idx_str, idx, err_str, err_err_code);
}
-static void report_jr_status(struct device_d *jrdev, const u32 status,
+static void report_jr_status(struct device *jrdev, const u32 status,
const char *error)
{
dev_err(jrdev, "%08x: %s: %s() not implemented\n",
status, error, __func__);
}
-static void report_cond_code_status(struct device_d *jrdev, const u32 status,
+static void report_cond_code_status(struct device *jrdev, const u32 status,
const char *error)
{
dev_err(jrdev, "%08x: %s: %s() not implemented\n",
status, error, __func__);
}
-void caam_jr_strstatus(struct device_d *jrdev, u32 status)
+void caam_jr_strstatus(struct device *jrdev, u32 status)
{
static const struct stat_src {
- void (*report_ssed)(struct device_d *jrdev, const u32 status,
+ void (*report_ssed)(struct device *jrdev, const u32 status,
const char *error);
const char *error;
} status_src[16] = {
diff --git a/drivers/crypto/caam/error.h b/drivers/crypto/caam/error.h
index faaf62aec8..9f164cb92c 100644
--- a/drivers/crypto/caam/error.h
+++ b/drivers/crypto/caam/error.h
@@ -8,5 +8,5 @@
#ifndef CAAM_ERROR_H
#define CAAM_ERROR_H
#define CAAM_ERROR_STR_MAX 302
-void caam_jr_strstatus(struct device_d *jrdev, u32 status);
+void caam_jr_strstatus(struct device *jrdev, u32 status);
#endif /* CAAM_ERROR_H */
diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h
index 5064974ff3..3d13fa8f02 100644
--- a/drivers/crypto/caam/intern.h
+++ b/drivers/crypto/caam/intern.h
@@ -18,7 +18,7 @@
* Each entry on an output ring needs one of these
*/
struct caam_jrentry_info {
- void (*callbk)(struct device_d *dev, u32 *desc, u32 status, void *arg);
+ void (*callbk)(struct device *dev, u32 *desc, u32 status, void *arg);
void *cbkarg; /* Argument per ring entry */
u32 *desc_addr_virt; /* Stored virt addr for postprocessing */
dma_addr_t desc_addr_dma; /* Stored bus addr for done matching */
@@ -28,7 +28,7 @@ struct caam_jrentry_info {
/* Private sub-storage for a single JobR */
struct caam_drv_private_jr {
struct list_head list_node; /* Job Ring device list */
- struct device_d *dev;
+ struct device *dev;
int ridx;
struct caam_job_ring __iomem *rregs; /* JobR's register space */
int irq; /* One per queue */
@@ -54,8 +54,8 @@ struct caam_drv_private_jr {
*/
struct caam_drv_private {
- struct device_d **jrpdev; /* Alloc'ed array per sub-device */
- struct device_d *pdev;
+ struct device **jrpdev; /* Alloc'ed array per sub-device */
+ struct device *pdev;
/* Physical-presence section */
struct caam_ctrl __iomem *ctrl; /* controller region */
@@ -88,7 +88,7 @@ struct caam_drv_private {
struct clk *caam_emi_slow;
};
-int caam_rng_probe(struct device_d *dev, struct device_d *jrdev);
-int caam_blob_gen_probe(struct device_d *dev, struct device_d *jrdev);
-int caam_jr_probe(struct device_d *dev);
+int caam_rng_probe(struct device *dev, struct device *jrdev);
+int caam_blob_gen_probe(struct device *dev, struct device *jrdev);
+int caam_jr_probe(struct device *dev);
#endif /* INTERN_H */
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 6c48679147..f159028669 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -22,7 +22,7 @@
#include "desc.h"
#include "intern.h"
-static int caam_reset_hw_jr(struct device_d *dev)
+static int caam_reset_hw_jr(struct device *dev)
{
struct caam_drv_private_jr *jrp = dev->priv;
uint64_t start;
@@ -59,7 +59,7 @@ static int caam_reset_hw_jr(struct device_d *dev)
static int caam_jr_dequeue(struct caam_drv_private_jr *jrp)
{
int hw_idx, sw_idx, i, head, tail;
- void (*usercall)(struct device_d *dev, u32 *desc, u32 status, void *arg);
+ void (*usercall)(struct device *dev, u32 *desc, u32 status, void *arg);
u32 *userdesc, userstatus;
void *userarg;
int found;
@@ -183,8 +183,8 @@ static int caam_jr_interrupt(struct caam_drv_private_jr *jrp)
* @areq: optional pointer to a user argument for use at callback
* time.
**/
-int caam_jr_enqueue(struct device_d *dev, u32 *desc,
- void (*cbk)(struct device_d *dev, u32 *desc,
+int caam_jr_enqueue(struct device *dev, u32 *desc,
+ void (*cbk)(struct device *dev, u32 *desc,
u32 status, void *areq),
void *areq)
{
@@ -237,7 +237,7 @@ EXPORT_SYMBOL(caam_jr_enqueue);
/*
* Init JobR independent of platform property detection
*/
-static int caam_jr_init(struct device_d *dev)
+static int caam_jr_init(struct device *dev)
{
struct caam_drv_private_jr *jrp;
dma_addr_t dma_inpring;
@@ -287,7 +287,7 @@ static int caam_jr_init(struct device_d *dev)
/*
* Probe routine for each detected JobR subsystem.
*/
-int caam_jr_probe(struct device_d *dev)
+int caam_jr_probe(struct device *dev)
{
struct caam_job_ring __iomem *ctrl;
struct caam_drv_private_jr *jrpriv;
diff --git a/drivers/crypto/caam/jr.h b/drivers/crypto/caam/jr.h
index 684511affe..60f221f948 100644
--- a/drivers/crypto/caam/jr.h
+++ b/drivers/crypto/caam/jr.h
@@ -9,8 +9,8 @@
#define JR_H
/* Prototypes for backend-level services exposed to APIs */
-int caam_jr_enqueue(struct device_d *dev, u32 *desc,
- void (*cbk)(struct device_d *dev, u32 *desc, u32 status,
+int caam_jr_enqueue(struct device *dev, u32 *desc,
+ void (*cbk)(struct device *dev, u32 *desc, u32 status,
void *areq),
void *areq);
diff --git a/drivers/crypto/caam/rng_self_test.c b/drivers/crypto/caam/rng_self_test.c
index ed3017d828..c02f4072df 100644
--- a/drivers/crypto/caam/rng_self_test.c
+++ b/drivers/crypto/caam/rng_self_test.c
@@ -120,7 +120,8 @@ static void construct_rng_self_test_jobdesc(u32 *desc, const u32 *rng_st_dsc, u8
}
/* rng_self_test_done() - callback for caam_jr_enqueue */
-static void rng_self_test_done(struct device_d *dev, u32 *desc, u32 err, void *arg)
+static void rng_self_test_done(struct device *dev, u32 *desc, u32 err,
+ void *arg)
{
int * job_err = arg;
*job_err = err;
@@ -145,7 +146,8 @@ static void rng_self_test_done(struct device_d *dev, u32 *desc, u32 err, void *a
* * i.MX67SD silicon revision 1.3
*
*/
-int caam_rng_self_test(struct device_d *dev, const u8 caam_era, const u8 rngvid, const u8 rngrev)
+int caam_rng_self_test(struct device *dev, const u8 caam_era, const u8 rngvid,
+ const u8 rngrev)
{
int ret, desc_size = 0, result_size = 0, job_err = 0;
const u32 *rng_st_dsc;
diff --git a/drivers/crypto/caam/rng_self_test.h b/drivers/crypto/caam/rng_self_test.h
index ba688f7e39..1c1011466f 100644
--- a/drivers/crypto/caam/rng_self_test.h
+++ b/drivers/crypto/caam/rng_self_test.h
@@ -9,6 +9,7 @@
#ifndef RNG_SELF_TEST_H
#define RNG_SELF_TEST_H
-int caam_rng_self_test(struct device_d *dev, const u8 caam_era, const u8 rngvid, const u8 rngrev);
+int caam_rng_self_test(struct device *dev, const u8 caam_era, const u8 rngvid,
+ const u8 rngrev);
#endif /* RNG_SELF_TEST_H */
diff --git a/drivers/crypto/imx-scc/scc-blobgen.c b/drivers/crypto/imx-scc/scc-blobgen.c
index 7554cbce37..530d0840f8 100644
--- a/drivers/crypto/imx-scc/scc-blobgen.c
+++ b/drivers/crypto/imx-scc/scc-blobgen.c
@@ -137,7 +137,7 @@ out:
return ret;
}
-int imx_scc_blob_gen_probe(struct device_d *dev)
+int imx_scc_blob_gen_probe(struct device *dev)
{
struct blobgen *bg;
int ret;
diff --git a/drivers/crypto/imx-scc/scc.c b/drivers/crypto/imx-scc/scc.c
index f2c004f7fd..cf9613ec15 100644
--- a/drivers/crypto/imx-scc/scc.c
+++ b/drivers/crypto/imx-scc/scc.c
@@ -115,7 +115,7 @@
static char scc_block_padding[8] = { 0x80, 0, 0, 0, 0, 0, 0, 0 };
struct imx_scc {
- struct device_d *dev;
+ struct device *dev;
void __iomem *base;
struct clk *clk;
struct ablkcipher_request *req;
@@ -417,7 +417,7 @@ static int imx_scc_get_state(struct imx_scc *scc)
return ret;
}
-static int imx_scc_probe(struct device_d *dev)
+static int imx_scc_probe(struct device *dev)
{
struct imx_scc *scc;
int ret;
diff --git a/drivers/crypto/imx-scc/scc.h b/drivers/crypto/imx-scc/scc.h
index 77161d25a4..77333f67c5 100644
--- a/drivers/crypto/imx-scc/scc.h
+++ b/drivers/crypto/imx-scc/scc.h
@@ -7,4 +7,4 @@ struct ablkcipher_request;
int imx_scc_cbc_des_encrypt(struct ablkcipher_request *req);
int imx_scc_cbc_des_decrypt(struct ablkcipher_request *req);
-int imx_scc_blob_gen_probe(struct device_d *dev);
+int imx_scc_blob_gen_probe(struct device *dev);
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index 767c095314..f03391fb89 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -137,7 +137,7 @@ int mxs_dma_go(int chan, struct mxs_dma_cmd *cmd, int ncmds)
/*
* Initialize the DMA hardware
*/
-static int apbh_dma_probe(struct device_d *dev)
+static int apbh_dma_probe(struct device *dev)
{
struct resource *iores;
struct apbh_dma *apbh;
diff --git a/drivers/dma/map.c b/drivers/dma/map.c
index a3e1b3b5b5..a00abf6421 100644
--- a/drivers/dma/map.c
+++ b/drivers/dma/map.c
@@ -3,7 +3,8 @@
#include <dma.h>
-static inline dma_addr_t cpu_to_dma(struct device_d *dev, unsigned long cpu_addr)
+static inline dma_addr_t cpu_to_dma(struct device *dev,
+ unsigned long cpu_addr)
{
dma_addr_t dma_addr = cpu_addr;
@@ -13,7 +14,7 @@ static inline dma_addr_t cpu_to_dma(struct device_d *dev, unsigned long cpu_addr
return dma_addr;
}
-static inline unsigned long dma_to_cpu(struct device_d *dev, dma_addr_t addr)
+static inline unsigned long dma_to_cpu(struct device *dev, dma_addr_t addr)
{
unsigned long cpu_addr = addr;
@@ -23,7 +24,7 @@ static inline unsigned long dma_to_cpu(struct device_d *dev, dma_addr_t addr)
return cpu_addr;
}
-dma_addr_t dma_map_single(struct device_d *dev, void *ptr, size_t size,
+dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
enum dma_data_direction dir)
{
unsigned long addr = (unsigned long)ptr;
@@ -33,7 +34,7 @@ dma_addr_t dma_map_single(struct device_d *dev, void *ptr, size_t size,
return cpu_to_dma(dev, addr);
}
-void dma_unmap_single(struct device_d *dev, dma_addr_t dma_addr, size_t size,
+void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
enum dma_data_direction dir)
{
unsigned long addr = dma_to_cpu(dev, dma_addr);
diff --git a/drivers/eeprom/at24.c b/drivers/eeprom/at24.c
index 88be3098cc..1a7acedf57 100644
--- a/drivers/eeprom/at24.c
+++ b/drivers/eeprom/at24.c
@@ -366,7 +366,7 @@ static const struct nvmem_bus at24_nvmem_bus = {
.read = at24_nvmem_read,
};
-static int at24_probe(struct device_d *dev)
+static int at24_probe(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct at24_platform_data chip;
diff --git a/drivers/eeprom/at25.c b/drivers/eeprom/at25.c
index 21dea33fbd..e91bfc2980 100644
--- a/drivers/eeprom/at25.c
+++ b/drivers/eeprom/at25.c
@@ -233,7 +233,7 @@ static struct cdev_operations at25_fops = {
.write = at25_ee_write,
};
-static int at25_np_to_chip(struct device_d *dev,
+static int at25_np_to_chip(struct device *dev,
struct device_node *np,
struct spi_eeprom *chip)
{
@@ -291,7 +291,7 @@ static int at25_np_to_chip(struct device_d *dev,
return 0;
}
-static int at25_probe(struct device_d *dev)
+static int at25_probe(struct device *dev)
{
int err, sr;
int addrlen;
diff --git a/drivers/efi/efi-device.c b/drivers/efi/efi-device.c
index defde70186..9fbdc4e16d 100644
--- a/drivers/efi/efi-device.c
+++ b/drivers/efi/efi-device.c
@@ -55,7 +55,7 @@ static int efi_locate_handle(enum efi_locate_search_type search_type,
static struct efi_device *efi_find_device(efi_handle_t *handle)
{
- struct device_d *dev;
+ struct device *dev;
struct efi_device *efidev;
bus_for_each_device(&efi_bus, dev) {
@@ -68,7 +68,7 @@ static struct efi_device *efi_find_device(efi_handle_t *handle)
return NULL;
}
-static void efi_devinfo(struct device_d *dev)
+static void efi_devinfo(struct device *dev)
{
struct efi_device *efidev = to_efi_device(dev);
int i;
@@ -304,7 +304,7 @@ int efi_connect_all(void)
return 0;
}
-static int efi_bus_match(struct device_d *dev, struct driver_d *drv)
+static int efi_bus_match(struct device *dev, struct driver_d *drv)
{
struct efi_driver *efidrv = to_efi_driver(drv);
struct efi_device *efidev = to_efi_device(dev);
@@ -321,7 +321,7 @@ static int efi_bus_match(struct device_d *dev, struct driver_d *drv)
return 1;
}
-static int efi_bus_probe(struct device_d *dev)
+static int efi_bus_probe(struct device *dev)
{
struct efi_driver *efidrv = to_efi_driver(dev->driver);
struct efi_device *efidev = to_efi_device(dev);
@@ -329,7 +329,7 @@ static int efi_bus_probe(struct device_d *dev)
return efidrv->probe(efidev);
}
-static void efi_bus_remove(struct device_d *dev)
+static void efi_bus_remove(struct device *dev)
{
struct efi_driver *efidrv = to_efi_driver(dev->driver);
struct efi_device *efidev = to_efi_device(dev);
@@ -345,7 +345,7 @@ struct bus_type efi_bus = {
.remove = efi_bus_remove,
};
-static void efi_businfo(struct device_d *dev)
+static void efi_businfo(struct device *dev)
{
efi_config_table_t *t;
int i = 0;
@@ -466,7 +466,7 @@ core_initcall(efi_init_devices);
void efi_pause_devices(void)
{
- struct device_d *dev;
+ struct device *dev;
bus_for_each_device(&efi_bus, dev) {
struct driver_d *drv = dev->driver;
@@ -485,7 +485,7 @@ void efi_pause_devices(void)
void efi_continue_devices(void)
{
- struct device_d *dev;
+ struct device *dev;
bus_for_each_device(&efi_bus, dev) {
struct driver_d *drv = dev->driver;
diff --git a/drivers/firmware/altera_serial.c b/drivers/firmware/altera_serial.c
index 27eb367a68..c6be89caae 100644
--- a/drivers/firmware/altera_serial.c
+++ b/drivers/firmware/altera_serial.c
@@ -48,7 +48,7 @@ struct fpga_spi {
int nstat_gpio; /* input GPIO to read the status line */
int confd_gpio; /* input GPIO to read the config done line */
int nconfig_gpio; /* output GPIO to start the FPGA's config */
- struct device_d *dev;
+ struct device *dev;
struct spi_device *spi;
const struct altera_ps_data *data;
bool padding_done;
@@ -83,7 +83,7 @@ static struct altera_ps_data a10_data = {
static int altera_spi_open(struct firmware_handler *fh)
{
struct fpga_spi *this = container_of(fh, struct fpga_spi, fh);
- struct device_d *dev = this->dev;
+ struct device *dev = this->dev;
int ret;
dev_dbg(dev, "Initiating programming\n");
@@ -151,7 +151,7 @@ static int altera_spi_open(struct firmware_handler *fh)
static int altera_spi_write(struct firmware_handler *fh, const void *buf, size_t sz)
{
struct fpga_spi *this = container_of(fh, struct fpga_spi, fh);
- struct device_d *dev = this->dev;
+ struct device *dev = this->dev;
struct spi_transfer t[2];
struct spi_message m;
u32 dummy;
@@ -205,7 +205,7 @@ static int altera_spi_write(struct firmware_handler *fh, const void *buf, size_t
static int altera_spi_close(struct firmware_handler *fh)
{
struct fpga_spi *this = container_of(fh, struct fpga_spi, fh);
- struct device_d *dev = this->dev;
+ struct device *dev = this->dev;
struct spi_transfer t;
struct spi_message m;
u32 dummy = 0;
@@ -265,7 +265,7 @@ static int altera_spi_close(struct firmware_handler *fh)
return -EIO;
}
-static int altera_spi_of(struct device_d *dev, struct fpga_spi *this)
+static int altera_spi_of(struct device *dev, struct fpga_spi *this)
{
struct device_node *n = dev->of_node;
const char *name;
@@ -329,7 +329,7 @@ static void altera_spi_init_mode(struct spi_device *spi, int spi_bits_per_word)
spi->mode = SPI_MODE_0 | SPI_LSB_FIRST;
}
-static int altera_spi_probe(struct device_d *dev)
+static int altera_spi_probe(struct device *dev)
{
int rc;
struct fpga_spi *this;
diff --git a/drivers/firmware/arm_scmi/base.c b/drivers/firmware/arm_scmi/base.c
index d4af40c40c..06dd3ec135 100644
--- a/drivers/firmware/arm_scmi/base.c
+++ b/drivers/firmware/arm_scmi/base.c
@@ -157,7 +157,7 @@ scmi_base_implementation_list_get(const struct scmi_protocol_handle *ph,
struct scmi_xfer *t;
__le32 *num_skip, *num_ret;
u32 tot_num_ret = 0, loop_num_ret;
- struct device_d *dev = ph->dev;
+ struct device *dev = ph->dev;
ret = ph->xops->xfer_get_init(ph, BASE_DISCOVER_LIST_PROTOCOLS,
sizeof(*num_skip), 0, &t);
@@ -235,7 +235,7 @@ static int scmi_base_protocol_init(const struct scmi_protocol_handle *ph)
u8 *prot_imp;
u32 version;
char name[SCMI_MAX_STR_SIZE];
- struct device_d *dev = ph->dev;
+ struct device *dev = ph->dev;
struct scmi_revision_info *rev = scmi_revision_area_get(ph);
ret = ph->xops->version_get(ph, &version);
diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c
index 1f6338aa2f..7431489cb4 100644
--- a/drivers/firmware/arm_scmi/bus.c
+++ b/drivers/firmware/arm_scmi/bus.c
@@ -36,7 +36,7 @@ scmi_dev_match_id(struct scmi_device *scmi_dev, struct scmi_driver *scmi_drv)
return NULL;
}
-static int scmi_dev_match(struct device_d *dev, struct driver_d *drv)
+static int scmi_dev_match(struct device *dev, struct driver_d *drv)
{
struct scmi_driver *scmi_drv = to_scmi_driver(drv);
struct scmi_device *scmi_dev = to_scmi_dev(dev);
@@ -49,7 +49,7 @@ static int scmi_dev_match(struct device_d *dev, struct driver_d *drv)
return -1;
}
-static int scmi_match_by_id_table(struct device_d *dev, void *data)
+static int scmi_match_by_id_table(struct device *dev, void *data)
{
struct scmi_device *sdev = to_scmi_dev(dev);
struct scmi_device_id *id_table = data;
@@ -58,11 +58,11 @@ static int scmi_match_by_id_table(struct device_d *dev, void *data)
!strcmp(sdev->name, id_table->name);
}
-struct scmi_device *scmi_child_dev_find(struct device_d *parent,
+struct scmi_device *scmi_child_dev_find(struct device *parent,
int prot_id, const char *name)
{
struct scmi_device_id id_table;
- struct device_d *dev;
+ struct device *dev;
id_table.protocol_id = prot_id;
id_table.name = name;
@@ -89,7 +89,7 @@ const struct scmi_protocol *scmi_protocol_get(int protocol_id)
return proto;
}
-static int scmi_dev_probe(struct device_d *dev)
+static int scmi_dev_probe(struct device *dev)
{
struct scmi_driver *scmi_drv = to_scmi_driver(dev->driver);
struct scmi_device *scmi_dev = to_scmi_dev(dev);
@@ -105,7 +105,7 @@ static int scmi_dev_probe(struct device_d *dev)
return scmi_drv->probe(scmi_dev);
}
-static void scmi_dev_remove(struct device_d *dev)
+static void scmi_dev_remove(struct device *dev)
{
struct scmi_driver *scmi_drv = to_scmi_driver(dev->driver);
struct scmi_device *scmi_dev = to_scmi_dev(dev);
@@ -141,7 +141,7 @@ int scmi_driver_register(struct scmi_driver *driver)
EXPORT_SYMBOL_GPL(scmi_driver_register);
struct scmi_device *
-scmi_device_alloc(struct device_node *np, struct device_d *parent, int protocol,
+scmi_device_alloc(struct device_node *np, struct device *parent, int protocol,
const char *name)
{
struct scmi_device *scmi_dev;
diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
index 5004a71dc9..b10ebaf4ac 100644
--- a/drivers/firmware/arm_scmi/common.h
+++ b/drivers/firmware/arm_scmi/common.h
@@ -164,7 +164,7 @@ struct scmi_xfer_ops;
* the protocol.
*/
struct scmi_protocol_handle {
- struct device_d *dev;
+ struct device *dev;
const struct scmi_xfer_ops *xops;
int (*set_priv)(const struct scmi_protocol_handle *ph, void *priv);
void *(*get_priv)(const struct scmi_protocol_handle *ph);
@@ -202,7 +202,7 @@ struct scmi_xfer_ops {
struct scmi_revision_info *
scmi_revision_area_get(const struct scmi_protocol_handle *ph);
int scmi_handle_put(const struct scmi_handle *handle);
-struct scmi_handle *scmi_handle_get(struct device_d *dev);
+struct scmi_handle *scmi_handle_get(struct device *dev);
void scmi_set_handle(struct scmi_device *scmi_dev);
void scmi_setup_protocol_implemented(const struct scmi_protocol_handle *ph,
u8 *prot_imp);
@@ -259,7 +259,7 @@ void scmi_protocol_release(const struct scmi_handle *handle, u8 protocol_id);
* @transport_info: Transport layer related information
*/
struct scmi_chan_info {
- struct device_d *dev;
+ struct device *dev;
struct scmi_handle *handle;
void *transport_info;
};
@@ -277,8 +277,8 @@ struct scmi_chan_info {
* @poll_done: Callback to poll transfer status
*/
struct scmi_transport_ops {
- bool (*chan_available)(struct device_d *dev, int idx);
- int (*chan_setup)(struct scmi_chan_info *cinfo, struct device_d *dev,
+ bool (*chan_available)(struct device *dev, int idx);
+ int (*chan_setup)(struct scmi_chan_info *cinfo, struct device *dev,
bool tx);
int (*chan_free)(int id, void *p, void *data);
int (*send_message)(struct scmi_chan_info *cinfo,
@@ -292,7 +292,7 @@ struct scmi_transport_ops {
int scmi_protocol_device_request(const struct scmi_device_id *id_table);
void scmi_protocol_device_unrequest(const struct scmi_device_id *id_table);
-struct scmi_device *scmi_child_dev_find(struct device_d *parent,
+struct scmi_device *scmi_child_dev_find(struct device *parent,
int prot_id, const char *name);
/**
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index a74746ac30..abccaf2a1b 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -117,7 +117,7 @@ struct scmi_protocol_instance {
* @users: Number of users of this instance
*/
struct scmi_info {
- struct device_d *dev;
+ struct device *dev;
const struct scmi_desc *desc;
struct scmi_revision_info version;
struct scmi_handle handle;
@@ -163,7 +163,7 @@ static inline int scmi_to_linux_errno(int errno)
* @dev: Device pointer corresponding to the SCMI entity
* @hdr: pointer to header.
*/
-static inline void scmi_dump_header_dbg(struct device_d *dev,
+static inline void scmi_dump_header_dbg(struct device *dev,
struct scmi_msg_hdr *hdr)
{
dev_dbg(dev, "Message ID: %x Sequence ID: %x Protocol: %x\n",
@@ -224,7 +224,7 @@ static void scmi_handle_response(struct scmi_chan_info *cinfo,
u16 xfer_id, u8 msg_type)
{
struct scmi_xfer *xfer;
- struct device_d *dev = cinfo->dev;
+ struct device *dev = cinfo->dev;
struct scmi_info *info = handle_to_scmi_info(cinfo->handle);
struct scmi_xfers_info *minfo = &info->tx_minfo;
@@ -323,7 +323,7 @@ static int do_xfer(const struct scmi_protocol_handle *ph,
int ret;
const struct scmi_protocol_instance *pi = ph_to_pi(ph);
struct scmi_info *info = handle_to_scmi_info(pi->handle);
- struct device_d *dev = info->dev;
+ struct device *dev = info->dev;
struct scmi_chan_info *cinfo;
u64 start;
@@ -437,7 +437,7 @@ static int xfer_get_init(const struct scmi_protocol_handle *ph,
const struct scmi_protocol_instance *pi = ph_to_pi(ph);
struct scmi_info *info = handle_to_scmi_info(pi->handle);
struct scmi_xfers_info *minfo = &info->tx_minfo;
- struct device_d *dev = info->dev;
+ struct device *dev = info->dev;
/* Ensure we have sane transfer sizes */
if (rx_size > info->desc->max_msg_size ||
@@ -728,7 +728,7 @@ struct scmi_handle *scmi_handle_get_from_info_unlocked(struct scmi_info *info)
*
* Return: pointer to handle if successful, NULL on error
*/
-struct scmi_handle *scmi_handle_get(struct device_d *dev)
+struct scmi_handle *scmi_handle_get(struct device *dev)
{
struct list_head *p;
struct scmi_info *info;
@@ -776,7 +776,7 @@ static int __scmi_xfer_info_init(struct scmi_info *sinfo,
{
int i;
struct scmi_xfer *xfer;
- struct device_d *dev = sinfo->dev;
+ struct device *dev = sinfo->dev;
const struct scmi_desc *desc = sinfo->desc;
/* Pre-allocated messages, no more than what hdr.seq can support */
@@ -819,7 +819,7 @@ static int scmi_xfer_info_init(struct scmi_info *sinfo)
return ret;
}
-static int scmi_chan_setup(struct scmi_info *info, struct device_d *dev,
+static int scmi_chan_setup(struct scmi_info *info, struct device *dev,
int prot_id, bool tx)
{
int ret, idx;
@@ -864,7 +864,7 @@ idr_alloc:
}
static inline int
-scmi_txrx_setup(struct scmi_info *info, struct device_d *dev, int prot_id)
+scmi_txrx_setup(struct scmi_info *info, struct device *dev, int prot_id)
{
int ret = scmi_chan_setup(info, dev, prot_id, true);
@@ -1133,7 +1133,7 @@ void scmi_protocol_device_unrequest(const struct scmi_device_id *id_table)
}
}
-static void version_info(struct device_d *dev)
+static void version_info(struct device *dev)
{
struct scmi_info *info = dev->priv;
@@ -1148,7 +1148,7 @@ static void version_info(struct device_d *dev)
info->version.sub_vendor_id);
}
-static int scmi_probe(struct device_d *dev)
+static int scmi_probe(struct device *dev)
{
int ret;
struct scmi_handle *handle;
diff --git a/drivers/firmware/arm_scmi/smc.c b/drivers/firmware/arm_scmi/smc.c
index fd45d55b2e..98f9277ddc 100644
--- a/drivers/firmware/arm_scmi/smc.c
+++ b/drivers/firmware/arm_scmi/smc.c
@@ -29,15 +29,15 @@ struct scmi_smc {
u32 func_id;
};
-static bool smc_chan_available(struct device_d *dev, int idx)
+static bool smc_chan_available(struct device *dev, int idx)
{
return of_parse_phandle(dev->of_node, "shmem", 0) != NULL;
}
-static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device_d *dev,
+static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev,
bool tx)
{
- struct device_d *cdev = cinfo->dev;
+ struct device *cdev = cinfo->dev;
struct scmi_smc *scmi_info;
resource_size_t size;
struct resource res;
diff --git a/drivers/firmware/arm_scmi/voltage.c b/drivers/firmware/arm_scmi/voltage.c
index a3d78db28f..63583c7885 100644
--- a/drivers/firmware/arm_scmi/voltage.c
+++ b/drivers/firmware/arm_scmi/voltage.c
@@ -80,7 +80,7 @@ static int scmi_protocol_attributes_get(const struct scmi_protocol_handle *ph,
return ret;
}
-static int scmi_init_voltage_levels(struct device_d *dev,
+static int scmi_init_voltage_levels(struct device *dev,
struct scmi_voltage_info *v,
u32 num_returned, u32 num_remaining,
bool segmented)
@@ -115,7 +115,7 @@ static int scmi_voltage_descriptors_get(const struct scmi_protocol_handle *ph,
{
int ret, dom;
struct scmi_xfer *td, *tl;
- struct device_d *dev = ph->dev;
+ struct device *dev = ph->dev;
struct scmi_msg_resp_domain_attributes *resp_dom;
struct scmi_msg_resp_describe_levels *resp_levels;
diff --git a/drivers/firmware/socfpga.c b/drivers/firmware/socfpga.c
index 4ab41cbf79..d875726ee6 100644
--- a/drivers/firmware/socfpga.c
+++ b/drivers/firmware/socfpga.c
@@ -377,7 +377,7 @@ static int programmed_get(struct param_d *p, void *priv)
return 0;
}
-static int socfpga_fpgamgr_probe(struct device_d *dev)
+static int socfpga_fpgamgr_probe(struct device *dev)
{
struct resource *iores;
struct fpgamgr *mgr;
diff --git a/drivers/firmware/zynqmp-fpga.c b/drivers/firmware/zynqmp-fpga.c
index 0c40522ddf..8729991578 100644
--- a/drivers/firmware/zynqmp-fpga.c
+++ b/drivers/firmware/zynqmp-fpga.c
@@ -58,7 +58,7 @@ enum xilinx_byte_order {
struct fpgamgr {
struct firmware_handler fh;
- struct device_d dev;
+ struct device dev;
const struct zynqmp_eemi_ops *eemi_ops;
int programmed;
char *buf;
@@ -158,8 +158,8 @@ static int get_header_length(const char *header, size_t size)
return -EINVAL;
}
-static void zynqmp_fpga_show_header(const struct device_d *dev,
- struct bs_header *header, size_t size)
+static void zynqmp_fpga_show_header(const struct device *dev,
+ struct bs_header *header, size_t size)
{
struct bs_header_entry *entry;
unsigned int i;
@@ -326,7 +326,7 @@ static int programmed_get(struct param_d *p, void *priv)
return 0;
}
-static int zynqmp_fpga_probe(struct device_d *dev)
+static int zynqmp_fpga_probe(struct device *dev)
{
struct fpgamgr *mgr;
struct firmware_handler *fh;
diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index 022498cd32..5db24cb5bd 100644
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -56,7 +56,7 @@ EXPORT_SYMBOL_GPL(fpga_bridge_disable);
struct fpga_bridge *of_fpga_bridge_get(struct device_node *np)
{
- struct device_d *dev;
+ struct device *dev;
struct fpga_bridge *bridge;
int ret = -EPROBE_DEFER;
@@ -179,7 +179,7 @@ static int set_enable(struct param_d *p, void *priv)
*
* Return: 0 for success, error code otherwise.
*/
-int fpga_bridge_register(struct device_d *dev, const char *name,
+int fpga_bridge_register(struct device *dev, const char *name,
const struct fpga_bridge_ops *br_ops, void *priv)
{
struct fpga_bridge *bridge;
diff --git a/drivers/fpga/socfpga-fpga2sdram-bridge.c b/drivers/fpga/socfpga-fpga2sdram-bridge.c
index 0b4ec39ee3..d4297d5b8e 100644
--- a/drivers/fpga/socfpga-fpga2sdram-bridge.c
+++ b/drivers/fpga/socfpga-fpga2sdram-bridge.c
@@ -52,7 +52,7 @@
#define F2S_BRIDGE_NAME "fpga2sdram"
struct alt_fpga2sdram_data {
- struct device_d *dev;
+ struct device *dev;
int mask;
};
@@ -96,7 +96,7 @@ static struct of_device_id altera_fpga_of_match[] = {
{},
};
-static int alt_fpga_bridge_probe(struct device_d *dev)
+static int alt_fpga_bridge_probe(struct device *dev)
{
struct alt_fpga2sdram_data *priv;
int ret = 0;
diff --git a/drivers/fpga/socfpga-hps2fpga-bridge.c b/drivers/fpga/socfpga-hps2fpga-bridge.c
index 0eaaabf6c6..af33f283c7 100644
--- a/drivers/fpga/socfpga-hps2fpga-bridge.c
+++ b/drivers/fpga/socfpga-hps2fpga-bridge.c
@@ -39,7 +39,7 @@
#define FPGA2HPS_BRIDGE_NAME "fpga2hps"
struct altera_hps2fpga_data {
- struct device_d *dev;
+ struct device *dev;
const char *name;
struct reset_control *bridge_reset;
unsigned int remap_mask;
@@ -113,7 +113,7 @@ static struct of_device_id altera_fpga_of_match[] = {
{ /* sentinel */ },
};
-static int alt_fpga_bridge_probe(struct device_d *dev)
+static int alt_fpga_bridge_probe(struct device *dev)
{
struct altera_hps2fpga_data *priv;
const struct of_device_id *of_id;
diff --git a/drivers/gpio/gpio-74164.c b/drivers/gpio/gpio-74164.c
index 2e8ecf6b53..84dc30069a 100644
--- a/drivers/gpio/gpio-74164.c
+++ b/drivers/gpio/gpio-74164.c
@@ -94,7 +94,7 @@ static struct platform_device_id gpio_74164_ids[] = {
{ }
};
-static int gpio_74164_probe(struct device_d *dev)
+static int gpio_74164_probe(struct device *dev)
{
struct spi_device *spi = (struct spi_device *)dev->type_data;
struct gpio_74164 *priv;
diff --git a/drivers/gpio/gpio-74xx-mmio.c b/drivers/gpio/gpio-74xx-mmio.c
index 5b688f4766..8c7d60939b 100644
--- a/drivers/gpio/gpio-74xx-mmio.c
+++ b/drivers/gpio/gpio-74xx-mmio.c
@@ -120,7 +120,7 @@ static int mmio_74xx_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
return -ENOTSUPP;
}
-static int mmio_74xx_gpio_probe(struct device_d *dev)
+static int mmio_74xx_gpio_probe(struct device *dev)
{
struct mmio_74xx_gpio_priv *priv;
void __iomem *dat;
diff --git a/drivers/gpio/gpio-ath79.c b/drivers/gpio/gpio-ath79.c
index 08d19c2a7c..083a942869 100644
--- a/drivers/gpio/gpio-ath79.c
+++ b/drivers/gpio/gpio-ath79.c
@@ -103,7 +103,7 @@ static const struct of_device_id ath79_gpio_of_match[] = {
{},
};
-static int ath79_gpio_probe(struct device_d *dev)
+static int ath79_gpio_probe(struct device *dev)
{
struct resource *iores;
struct device_node *np = dev->of_node;
diff --git a/drivers/gpio/gpio-clps711x.c b/drivers/gpio/gpio-clps711x.c
index 1c5f714aa5..190ff2115a 100644
--- a/drivers/gpio/gpio-clps711x.c
+++ b/drivers/gpio/gpio-clps711x.c
@@ -7,7 +7,7 @@
#include <linux/err.h>
#include <linux/basic_mmio_gpio.h>
-static int clps711x_gpio_probe(struct device_d *dev)
+static int clps711x_gpio_probe(struct device *dev)
{
struct resource *iores;
int err, id = of_alias_get_id(dev->of_node, "gpio");
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index 655621b179..899bb2e578 100644
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -133,7 +133,7 @@ static struct gpio_ops davinci_gpio_ops = {
.set = davinci_gpio_set,
};
-static int davinci_gpio_probe(struct device_d *dev)
+static int davinci_gpio_probe(struct device *dev)
{
struct resource *iores;
void __iomem *gpio_base;
diff --git a/drivers/gpio/gpio-digic.c b/drivers/gpio/gpio-digic.c
index 5a6dd95aae..2cfa728a6b 100644
--- a/drivers/gpio/gpio-digic.c
+++ b/drivers/gpio/gpio-digic.c
@@ -106,7 +106,7 @@ static struct gpio_ops digic_gpio_ops = {
.set = digic_gpio_set_value,
};
-static int digic_gpio_probe(struct device_d *dev)
+static int digic_gpio_probe(struct device *dev)
{
struct resource *iores;
struct digic_gpio_chip *chip;
diff --git a/drivers/gpio/gpio-dw.c b/drivers/gpio/gpio-dw.c
index 0d810310ce..bdb840f8d0 100644
--- a/drivers/gpio/gpio-dw.c
+++ b/drivers/gpio/gpio-dw.c
@@ -104,7 +104,7 @@ static struct gpio_ops dw_gpio_ops = {
.set = dw_gpio_set,
};
-static int dw_gpio_add_port(struct device_d *dev, struct device_node *node,
+static int dw_gpio_add_port(struct device *dev, struct device_node *node,
struct dw_gpio *parent)
{
struct dw_gpio_instance *chip;
@@ -150,7 +150,7 @@ static int dw_gpio_add_port(struct device_d *dev, struct device_node *node,
return 0;
}
-static int dw_gpio_probe(struct device