* RFC: Mega rename of device tree routines from of_*() to dt_*() @ 2010-11-24 14:03 Michael Ellerman 2010-11-24 15:44 ` Timur Tabi ` (4 more replies) 0 siblings, 5 replies; 19+ messages in thread From: Michael Ellerman @ 2010-11-24 14:03 UTC (permalink / raw) To: LKML Cc: linux-mips, microblaze-uclinux, devicetree-discuss, linuxppc-dev list, sparclinux [-- Attachment #1: Type: text/plain, Size: 41185 bytes --] Hi all, There were some murmurings on IRC last week about renaming the of_*() routines. I was procrastinating at the time and said I'd have a look at it, so here I am. The thinking is that on many platforms that use the of_() routines OpenFirmware is not involved at all, this is true even on many powerpc platforms. Also for folks who don't know the OpenFirmware connection it reads as "of", as in "a can of worms". Personally I'm a bit ambivalent about it, the OF name is a bit wrong so it would be nice to get rid of, but it's a lot of churn. So I'm hoping people with either say "YES this is a great idea", or "NO this is stupid". As step one I've just renamed as many routines as I could find to see what the resulting patch looks like, so we can quantify the churn. I also did device.of_node, which is used quite a bit. Thoughts? of -> dt most places I could think of (done mechanically): Documentation/powerpc/booting-without-of.txt | 2 +- arch/microblaze/include/asm/cpuinfo.h | 2 +- arch/microblaze/include/asm/prom.h | 12 +- arch/microblaze/kernel/cpu/cpuinfo.c | 2 +- arch/microblaze/kernel/head.S | 2 +- arch/microblaze/kernel/heartbeat.c | 6 +- arch/microblaze/kernel/intc.c | 8 +- arch/microblaze/kernel/irq.c | 6 +- arch/microblaze/kernel/prom.c | 38 ++-- arch/microblaze/kernel/prom_parse.c | 28 ++-- arch/microblaze/kernel/reset.c | 12 +- arch/microblaze/kernel/setup.c | 6 +- arch/microblaze/kernel/timer.c | 10 +- arch/microblaze/pci/pci-common.c | 26 ++-- arch/microblaze/pci/pci_32.c | 34 ++-- arch/microblaze/pci/xilinx_pci.c | 14 +- arch/microblaze/platform/platform.c | 6 +- arch/mips/kernel/prom.c | 32 ++-- arch/powerpc/boot/of.c | 2 +- arch/powerpc/boot/ofconsole.c | 2 +- arch/powerpc/boot/oflib.c | 2 +- arch/powerpc/include/asm/cpm.h | 2 +- arch/powerpc/include/asm/ibmebus.h | 4 +- arch/powerpc/include/asm/irq.h | 8 +- arch/powerpc/include/asm/kvm_para.h | 6 +- arch/powerpc/include/asm/macio.h | 6 +- arch/powerpc/include/asm/msi_bitmap.h | 6 +- arch/powerpc/include/asm/parport.h | 6 +- arch/powerpc/include/asm/pmac_feature.h | 2 +- arch/powerpc/include/asm/prom.h | 16 +- arch/powerpc/kernel/btext.c | 28 ++-- arch/powerpc/kernel/cacheinfo.c | 20 +- arch/powerpc/kernel/dma-swiotlb.c | 2 +- arch/powerpc/kernel/ibmebus.c | 38 ++-- arch/powerpc/kernel/irq.c | 22 +- arch/powerpc/kernel/isa-bridge.c | 14 +- arch/powerpc/kernel/kvm.c | 6 +- arch/powerpc/kernel/legacy_serial.c | 104 +++++----- arch/powerpc/kernel/lparcfg.c | 24 +- arch/powerpc/kernel/machine_kexec.c | 12 +- arch/powerpc/kernel/machine_kexec_64.c | 16 +- arch/powerpc/kernel/of_platform.c | 24 +- arch/powerpc/kernel/pci-common.c | 24 +- arch/powerpc/kernel/pci_32.c | 34 ++-- arch/powerpc/kernel/pci_64.c | 6 +- arch/powerpc/kernel/pci_dn.c | 6 +- arch/powerpc/kernel/pci_of_scan.c | 22 +- arch/powerpc/kernel/proc_powerpc.c | 2 +- arch/powerpc/kernel/prom.c | 92 +++++----- arch/powerpc/kernel/prom_parse.c | 28 ++-- arch/powerpc/kernel/rtas-proc.c | 6 +- arch/powerpc/kernel/rtas.c | 34 ++-- arch/powerpc/kernel/rtas_pci.c | 22 +- arch/powerpc/kernel/setup-common.c | 58 +++--- arch/powerpc/kernel/setup_32.c | 4 +- arch/powerpc/kernel/setup_64.c | 24 +- arch/powerpc/kernel/smp.c | 14 +- arch/powerpc/kernel/time.c | 8 +- arch/powerpc/kernel/vio.c | 80 ++++---- arch/powerpc/mm/hash_native_64.c | 6 +- arch/powerpc/mm/hash_utils_64.c | 26 ++-- arch/powerpc/mm/numa.c | 62 +++--- arch/powerpc/platforms/40x/ep405.c | 16 +- arch/powerpc/platforms/40x/hcu4.c | 10 +- arch/powerpc/platforms/40x/ppc40x_simple.c | 10 +- arch/powerpc/platforms/40x/virtex.c | 10 +- arch/powerpc/platforms/40x/walnut.c | 10 +- arch/powerpc/platforms/44x/ebony.c | 10 +- arch/powerpc/platforms/44x/idle.c | 2 +- arch/powerpc/platforms/44x/iss4xx.c | 18 +- arch/powerpc/platforms/44x/ppc44x_simple.c | 10 +- arch/powerpc/platforms/44x/sam440ep.c | 10 +- arch/powerpc/platforms/44x/virtex.c | 10 +- arch/powerpc/platforms/44x/warp.c | 44 ++-- arch/powerpc/platforms/512x/clock.c | 20 +- arch/powerpc/platforms/512x/mpc5121_ads.c | 6 +- arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 14 +- arch/powerpc/platforms/512x/mpc5121_generic.c | 6 +- arch/powerpc/platforms/512x/mpc512x_shared.c | 44 ++-- arch/powerpc/platforms/512x/pdm360ng.c | 14 +- arch/powerpc/platforms/52xx/efika.c | 24 +- arch/powerpc/platforms/52xx/lite5200.c | 28 ++-- arch/powerpc/platforms/52xx/lite5200_pm.c | 10 +- arch/powerpc/platforms/52xx/media5200.c | 18 +- arch/powerpc/platforms/52xx/mpc5200_simple.c | 4 +- arch/powerpc/platforms/52xx/mpc52xx_common.c | 50 +++--- arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 40 ++-- arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 32 ++-- arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 18 +- arch/powerpc/platforms/52xx/mpc52xx_pci.c | 10 +- arch/powerpc/platforms/52xx/mpc52xx_pic.c | 16 +- arch/powerpc/platforms/52xx/mpc52xx_pm.c | 10 +- arch/powerpc/platforms/82xx/ep8248e.c | 36 ++-- arch/powerpc/platforms/82xx/mgcoge.c | 14 +- arch/powerpc/platforms/82xx/mpc8272_ads.c | 20 +- arch/powerpc/platforms/82xx/pq2.c | 4 +- arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 16 +- arch/powerpc/platforms/82xx/pq2fads.c | 20 +- arch/powerpc/platforms/83xx/asp834x.c | 14 +- arch/powerpc/platforms/83xx/kmeter1.c | 40 ++-- arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 10 +- arch/powerpc/platforms/83xx/mpc830x_rdb.c | 16 +- arch/powerpc/platforms/83xx/mpc831x_rdb.c | 14 +- arch/powerpc/platforms/83xx/mpc832x_mds.c | 38 ++-- arch/powerpc/platforms/83xx/mpc832x_rdb.c | 38 ++-- arch/powerpc/platforms/83xx/mpc834x_itx.c | 12 +- arch/powerpc/platforms/83xx/mpc834x_mds.c | 18 +- arch/powerpc/platforms/83xx/mpc836x_mds.c | 50 +++--- arch/powerpc/platforms/83xx/mpc836x_rdk.c | 18 +- arch/powerpc/platforms/83xx/mpc837x_mds.c | 28 ++-- arch/powerpc/platforms/83xx/mpc837x_rdb.c | 18 +- arch/powerpc/platforms/83xx/sbc834x.c | 14 +- arch/powerpc/platforms/83xx/suspend.c | 18 +- arch/powerpc/platforms/83xx/usb.c | 54 +++--- arch/powerpc/platforms/85xx/corenet_ds.c | 14 +- arch/powerpc/platforms/85xx/ksi8560.c | 28 ++-- arch/powerpc/platforms/85xx/mpc8536_ds.c | 24 +- arch/powerpc/platforms/85xx/mpc85xx_ads.c | 24 +- arch/powerpc/platforms/85xx/mpc85xx_cds.c | 30 ++-- arch/powerpc/platforms/85xx/mpc85xx_ds.c | 46 ++-- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 98 +++++----- arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 28 ++-- arch/powerpc/platforms/85xx/p1022_ds.c | 30 ++-- arch/powerpc/platforms/85xx/p3041_ds.c | 6 +- arch/powerpc/platforms/85xx/p4080_ds.c | 6 +- arch/powerpc/platforms/85xx/p5020_ds.c | 6 +- arch/powerpc/platforms/85xx/sbc8548.c | 30 ++-- arch/powerpc/platforms/85xx/sbc8560.c | 36 ++-- arch/powerpc/platforms/85xx/smp.c | 6 +- arch/powerpc/platforms/85xx/socrates.c | 22 +- arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 6 +- arch/powerpc/platforms/85xx/stx_gp3.c | 26 ++-- arch/powerpc/platforms/85xx/tqm85xx.c | 40 ++-- arch/powerpc/platforms/85xx/xes_mpc85xx.c | 48 +++--- arch/powerpc/platforms/86xx/gef_gpio.c | 22 +- arch/powerpc/platforms/86xx/gef_pic.c | 4 +- arch/powerpc/platforms/86xx/gef_ppc9a.c | 20 +- arch/powerpc/platforms/86xx/gef_sbc310.c | 20 +- arch/powerpc/platforms/86xx/gef_sbc610.c | 20 +- arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 32 ++-- arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 16 +- arch/powerpc/platforms/86xx/pic.c | 14 +- arch/powerpc/platforms/86xx/sbc8641d.c | 10 +- arch/powerpc/platforms/8xx/adder875.c | 10 +- arch/powerpc/platforms/8xx/ep88xc.c | 16 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 10 +- arch/powerpc/platforms/8xx/mgsuvd.c | 10 +- arch/powerpc/platforms/8xx/mpc86xads_setup.c | 16 +- arch/powerpc/platforms/8xx/mpc885ads_setup.c | 26 ++-- arch/powerpc/platforms/8xx/tqm8xx_setup.c | 14 +- arch/powerpc/platforms/amigaone/setup.c | 22 +- arch/powerpc/platforms/cell/axon_msi.c | 40 ++-- arch/powerpc/platforms/cell/beat_interrupt.c | 2 +- arch/powerpc/platforms/cell/beat_iommu.c | 6 +- arch/powerpc/platforms/cell/cbe_cpufreq.c | 6 +- arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c | 2 +- arch/powerpc/platforms/cell/cbe_powerbutton.c | 2 +- arch/powerpc/platforms/cell/cbe_regs.c | 28 ++-- arch/powerpc/platforms/cell/celleb_pci.c | 32 ++-- arch/powerpc/platforms/cell/celleb_scc_epci.c | 4 +- arch/powerpc/platforms/cell/celleb_scc_pciex.c | 8 +- arch/powerpc/platforms/cell/celleb_scc_sio.c | 10 +- arch/powerpc/platforms/cell/celleb_setup.c | 22 +- arch/powerpc/platforms/cell/interrupt.c | 22 +- arch/powerpc/platforms/cell/iommu.c | 54 +++--- arch/powerpc/platforms/cell/qpace_setup.c | 16 +- arch/powerpc/platforms/cell/ras.c | 12 +- arch/powerpc/platforms/cell/setup.c | 34 ++-- arch/powerpc/platforms/cell/spider-pci.c | 4 +- arch/powerpc/platforms/cell/spider-pic.c | 36 ++-- arch/powerpc/platforms/cell/spu_manage.c | 54 +++--- arch/powerpc/platforms/cell/spufs/inode.c | 4 +- arch/powerpc/platforms/chrp/nvram.c | 8 +- arch/powerpc/platforms/chrp/pci.c | 32 ++-- arch/powerpc/platforms/chrp/setup.c | 72 ++++---- arch/powerpc/platforms/chrp/time.c | 10 +- arch/powerpc/platforms/embedded6xx/c2k.c | 22 +- arch/powerpc/platforms/embedded6xx/flipper-pic.c | 12 +- arch/powerpc/platforms/embedded6xx/gamecube.c | 10 +- arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 8 +- arch/powerpc/platforms/embedded6xx/holly.c | 28 ++-- arch/powerpc/platforms/embedded6xx/linkstation.c | 18 +- arch/powerpc/platforms/embedded6xx/ls_uart.c | 6 +- arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 18 +- arch/powerpc/platforms/embedded6xx/prpmc2800.c | 22 +- arch/powerpc/platforms/embedded6xx/storcenter.c | 22 +- arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 8 +- arch/powerpc/platforms/embedded6xx/wii.c | 16 +- arch/powerpc/platforms/fsl_uli1575.c | 6 +- arch/powerpc/platforms/iseries/iommu.c | 6 +- arch/powerpc/platforms/iseries/pci.c | 18 +- arch/powerpc/platforms/iseries/setup.c | 4 +- arch/powerpc/platforms/iseries/vio.c | 22 +- arch/powerpc/platforms/iseries/viopath.c | 6 +- arch/powerpc/platforms/maple/pci.c | 34 ++-- arch/powerpc/platforms/maple/setup.c | 62 +++--- arch/powerpc/platforms/maple/time.c | 4 +- arch/powerpc/platforms/pasemi/cpufreq.c | 22 +- arch/powerpc/platforms/pasemi/dma_lib.c | 6 +- arch/powerpc/platforms/pasemi/gpio_mdio.c | 30 ++-- arch/powerpc/platforms/pasemi/iommu.c | 4 +- arch/powerpc/platforms/pasemi/misc.c | 10 +- arch/powerpc/platforms/pasemi/pci.c | 8 +- arch/powerpc/platforms/pasemi/setup.c | 36 ++-- arch/powerpc/platforms/powermac/backlight.c | 8 +- arch/powerpc/platforms/powermac/cpufreq_32.c | 48 +++--- arch/powerpc/platforms/powermac/cpufreq_64.c | 52 +++--- arch/powerpc/platforms/powermac/feature.c | 172 ++++++++-------- arch/powerpc/platforms/powermac/low_i2c.c | 54 +++--- arch/powerpc/platforms/powermac/nvram.c | 12 +- arch/powerpc/platforms/powermac/pci.c | 78 ++++---- arch/powerpc/platforms/powermac/pfunc_base.c | 32 ++-- arch/powerpc/platforms/powermac/pfunc_core.c | 14 +- arch/powerpc/platforms/powermac/pic.c | 72 ++++---- arch/powerpc/platforms/powermac/setup.c | 96 +++++----- arch/powerpc/platforms/powermac/smp.c | 54 +++--- arch/powerpc/platforms/powermac/time.c | 20 +- arch/powerpc/platforms/powermac/udbg_adb.c | 8 +- arch/powerpc/platforms/powermac/udbg_scc.c | 34 ++-- arch/powerpc/platforms/ps3/os-area.c | 18 +- arch/powerpc/platforms/ps3/setup.c | 4 +- arch/powerpc/platforms/ps3/system-bus.c | 2 +- arch/powerpc/platforms/pseries/dlpar.c | 30 ++-- arch/powerpc/platforms/pseries/eeh.c | 20 +- arch/powerpc/platforms/pseries/eeh_driver.c | 4 +- arch/powerpc/platforms/pseries/eeh_event.c | 2 +- arch/powerpc/platforms/pseries/event_sources.c | 8 +- arch/powerpc/platforms/pseries/hotplug-cpu.c | 8 +- arch/powerpc/platforms/pseries/hotplug-memory.c | 18 +- arch/powerpc/platforms/pseries/iommu.c | 18 +- arch/powerpc/platforms/pseries/lpar.c | 16 +- arch/powerpc/platforms/pseries/mobility.c | 14 +- arch/powerpc/platforms/pseries/msi.c | 18 +- arch/powerpc/platforms/pseries/nvram.c | 8 +- arch/powerpc/platforms/pseries/pci.c | 2 +- arch/powerpc/platforms/pseries/phyp_dump.c | 14 +- arch/powerpc/platforms/pseries/pseries.h | 2 +- arch/powerpc/platforms/pseries/ras.c | 8 +- arch/powerpc/platforms/pseries/reconfig.c | 38 ++-- arch/powerpc/platforms/pseries/setup.c | 52 +++--- arch/powerpc/platforms/pseries/xics.c | 18 +- arch/powerpc/sysdev/axonram.c | 18 +- arch/powerpc/sysdev/bestcomm/bestcomm.c | 32 ++-- arch/powerpc/sysdev/bestcomm/bestcomm_priv.h | 2 +- arch/powerpc/sysdev/bestcomm/sram.c | 10 +- arch/powerpc/sysdev/cpm1.c | 58 +++--- arch/powerpc/sysdev/cpm2.c | 2 +- arch/powerpc/sysdev/cpm_common.c | 36 ++-- arch/powerpc/sysdev/dart_iommu.c | 16 +- arch/powerpc/sysdev/dcr.c | 30 ++-- arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 8 +- arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 16 +- arch/powerpc/sysdev/fsl_gtm.c | 12 +- arch/powerpc/sysdev/fsl_lbc.c | 14 +- arch/powerpc/sysdev/fsl_msi.c | 26 ++-- arch/powerpc/sysdev/fsl_pci.c | 14 +- arch/powerpc/sysdev/fsl_pmc.c | 10 +- arch/powerpc/sysdev/fsl_rio.c | 44 ++-- arch/powerpc/sysdev/fsl_soc.c | 56 +++--- arch/powerpc/sysdev/grackle.c | 4 +- arch/powerpc/sysdev/i8259.c | 2 +- arch/powerpc/sysdev/ipic.c | 4 +- arch/powerpc/sysdev/mmio_nvram.c | 6 +- arch/powerpc/sysdev/mpc5xxx_clocks.c | 12 +- arch/powerpc/sysdev/mpc8xx_pic.c | 8 +- arch/powerpc/sysdev/mpc8xxx_gpio.c | 40 ++-- arch/powerpc/sysdev/mpic.c | 16 +- arch/powerpc/sysdev/mpic_msi.c | 8 +- arch/powerpc/sysdev/mpic_pasemi_msi.c | 4 +- arch/powerpc/sysdev/mpic_u3msi.c | 4 +- arch/powerpc/sysdev/msi_bitmap.c | 28 ++-- arch/powerpc/sysdev/mv64x60_dev.c | 122 ++++++------ arch/powerpc/sysdev/mv64x60_pci.c | 10 +- arch/powerpc/sysdev/mv64x60_pic.c | 14 +- arch/powerpc/sysdev/mv64x60_udbg.c | 22 +- arch/powerpc/sysdev/of_rtc.c | 6 +- arch/powerpc/sysdev/pmi.c | 18 +- arch/powerpc/sysdev/ppc4xx_gpio.c | 22 +- arch/powerpc/sysdev/ppc4xx_pci.c | 74 ++++---- arch/powerpc/sysdev/ppc4xx_soc.c | 30 ++-- arch/powerpc/sysdev/qe_lib/gpio.c | 36 ++-- arch/powerpc/sysdev/qe_lib/qe.c | 58 +++--- arch/powerpc/sysdev/qe_lib/qe_ic.c | 8 +- arch/powerpc/sysdev/qe_lib/qe_io.c | 12 +- arch/powerpc/sysdev/rtc_cmos_setup.c | 12 +- arch/powerpc/sysdev/simple_gpio.c | 20 +- arch/powerpc/sysdev/tsi108_dev.c | 36 ++-- arch/powerpc/sysdev/tsi108_pci.c | 4 +- arch/powerpc/sysdev/uic.c | 14 +- arch/powerpc/sysdev/xilinx_intc.c | 16 +- arch/powerpc/sysdev/xilinx_pci.c | 12 +- arch/sparc/include/asm/fb.h | 2 +- arch/sparc/include/asm/floppy_32.h | 4 +- arch/sparc/include/asm/floppy_64.h | 16 +- arch/sparc/include/asm/openprom.h | 2 +- arch/sparc/include/asm/parport.h | 10 +- arch/sparc/include/asm/prom.h | 4 +- arch/sparc/kernel/apc.c | 10 +- arch/sparc/kernel/auxio_32.c | 4 +- arch/sparc/kernel/auxio_64.c | 10 +- arch/sparc/kernel/central.c | 18 +- arch/sparc/kernel/chmc.c | 32 ++-- arch/sparc/kernel/devices.c | 2 +- arch/sparc/kernel/ioport.c | 4 +- arch/sparc/kernel/irq_64.c | 4 +- arch/sparc/kernel/leon_kernel.c | 8 +- arch/sparc/kernel/of_device_32.c | 84 ++++---- arch/sparc/kernel/of_device_64.c | 120 ++++++------ arch/sparc/kernel/of_device_common.c | 28 ++-- arch/sparc/kernel/of_device_common.h | 8 +- arch/sparc/kernel/pci.c | 34 ++-- arch/sparc/kernel/pci_common.c | 10 +- arch/sparc/kernel/pci_fire.c | 14 +- arch/sparc/kernel/pci_impl.h | 2 +- arch/sparc/kernel/pci_msi.c | 18 +- arch/sparc/kernel/pci_psycho.c | 14 +- arch/sparc/kernel/pci_sabre.c | 18 +- arch/sparc/kernel/pci_schizo.c | 24 +- arch/sparc/kernel/pci_sun4v.c | 20 +- arch/sparc/kernel/pcic.c | 2 +- arch/sparc/kernel/pmc.c | 10 +- arch/sparc/kernel/power.c | 14 +- arch/sparc/kernel/prom_32.c | 24 +- arch/sparc/kernel/prom_64.c | 38 ++-- arch/sparc/kernel/prom_common.c | 6 +- arch/sparc/kernel/prom_irqtrans.c | 34 ++-- arch/sparc/kernel/psycho_common.c | 2 +- arch/sparc/kernel/sbus.c | 24 +- arch/sparc/kernel/sun4c_irq.c | 18 +- arch/sparc/kernel/sun4d_irq.c | 10 +- arch/sparc/kernel/sun4m_irq.c | 16 +- arch/sparc/kernel/time_32.c | 14 +- arch/sparc/kernel/time_64.c | 28 ++-- arch/sparc/kernel/vio.c | 6 +- arch/sparc/mm/init_64.c | 2 +- arch/sparc/mm/io-unit.c | 6 +- arch/sparc/mm/iommu.c | 6 +- drivers/ata/pata_macio.c | 32 ++-- drivers/ata/pata_mpc52xx.c | 20 +- drivers/ata/pata_of_platform.c | 24 +- drivers/ata/sata_dwc_460ex.c | 18 +- drivers/ata/sata_fsl.c | 14 +- drivers/ata/sata_svw.c | 2 +- drivers/atm/fore200e.c | 28 ++-- drivers/base/platform.c | 8 +- drivers/block/swim3.c | 6 +- drivers/block/xsysace.c | 22 +- drivers/cdrom/viocd.c | 8 +- drivers/char/agp/uninorth-agp.c | 8 +- drivers/char/briq_panel.c | 8 +- drivers/char/bsr.c | 20 +- drivers/char/hvc_beat.c | 2 +- drivers/char/hvc_iseries.c | 10 +- drivers/char/hvc_vio.c | 10 +- drivers/char/hvsi.c | 10 +- drivers/char/hw_random/n2-drv.c | 14 +- drivers/char/hw_random/pasemi-rng.c | 14 +- drivers/char/ipmi/ipmi_si_intf.c | 26 ++-- drivers/char/rtc.c | 6 +- drivers/char/tpm/tpm_atmel.h | 14 +- drivers/char/viotape.c | 8 +- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 22 +- drivers/crypto/amcc/crypto4xx_core.c | 24 +- drivers/crypto/n2_core.c | 34 ++-- drivers/crypto/talitos.c | 30 ++-- drivers/dma/fsldma.c | 28 ++-- drivers/dma/mpc512x_dma.c | 18 +- drivers/dma/ppc4xx/adma.c | 62 +++--- drivers/edac/cell_edac.c | 4 +- drivers/edac/cpc925_edac.c | 16 +- drivers/edac/mpc85xx_edac.c | 40 ++-- drivers/edac/mv64x60_edac.c | 4 +- drivers/edac/ppc4xx_edac.c | 30 ++-- drivers/gpio/gpiolib.c | 6 +- drivers/gpio/pca953x.c | 10 +- drivers/gpio/xilinx_gpio.c | 30 ++-- drivers/gpu/drm/nouveau/nouveau_connector.c | 6 +- drivers/gpu/drm/nouveau/nouveau_state.c | 2 +- drivers/gpu/drm/radeon/radeon_clocks.c | 8 +- drivers/gpu/drm/radeon/radeon_combios.c | 44 ++-- drivers/hwmon/ltc4245.c | 4 +- drivers/hwmon/ultra45_env.c | 10 +- drivers/i2c/busses/i2c-cpm.c | 36 ++-- drivers/i2c/busses/i2c-ibm_iic.c | 32 ++-- drivers/i2c/busses/i2c-mpc.c | 50 +++--- drivers/i2c/busses/i2c-powermac.c | 10 +- drivers/i2c/i2c-core.c | 6 +- drivers/ide/pdc202xx_new.c | 2 +- drivers/ide/pmac.c | 36 ++-- drivers/infiniband/hw/ehca/ehca_main.c | 14 +- drivers/input/misc/sparcspkr.c | 22 +- drivers/input/serio/i8042-sparcio.h | 20 +- drivers/input/serio/xilinx_ps2.c | 20 +- drivers/leds/leds-gpio.c | 28 ++-- drivers/macintosh/adb.c | 4 +- drivers/macintosh/ams/ams-core.c | 22 +- drivers/macintosh/ams/ams-i2c.c | 2 +- drivers/macintosh/ams/ams-pmu.c | 4 +- drivers/macintosh/ams/ams.h | 4 +- drivers/macintosh/ans-lcd.c | 6 +- drivers/macintosh/macio-adb.c | 14 +- drivers/macintosh/macio_asic.c | 56 +++--- drivers/macintosh/macio_sysfs.c | 8 +- drivers/macintosh/mediabay.c | 6 +- drivers/macintosh/rack-meter.c | 24 +- drivers/macintosh/smu.c | 46 ++-- drivers/macintosh/therm_adt746x.c | 28 ++-- drivers/macintosh/therm_pm72.c | 52 +++--- drivers/macintosh/therm_windtunnel.c | 26 ++-- drivers/macintosh/via-cuda.c | 10 +- drivers/macintosh/via-pmu-backlight.c | 8 +- drivers/macintosh/via-pmu-led.c | 10 +- drivers/macintosh/via-pmu.c | 50 +++--- drivers/macintosh/windfarm_core.c | 6 +- drivers/macintosh/windfarm_cpufreq_clamp.c | 6 +- drivers/macintosh/windfarm_lm75_sensor.c | 14 +- drivers/macintosh/windfarm_max6690_sensor.c | 12 +- drivers/macintosh/windfarm_pm112.c | 4 +- drivers/macintosh/windfarm_pm121.c | 2 +- drivers/macintosh/windfarm_pm81.c | 4 +- drivers/macintosh/windfarm_pm91.c | 2 +- drivers/macintosh/windfarm_smu_controls.c | 26 ++-- drivers/macintosh/windfarm_smu_sat.c | 16 +- drivers/macintosh/windfarm_smu_sensors.c | 22 +- drivers/media/video/fsl-viu.c | 14 +- drivers/mmc/host/mmc_spi.c | 2 +- drivers/mmc/host/of_mmc_spi.c | 16 +- drivers/mmc/host/sdhci-of-core.c | 30 ++-- drivers/mmc/host/sdhci-of-esdhc.c | 2 +- drivers/mmc/host/sdhci-of-hlwd.c | 2 +- drivers/mtd/devices/m25p80.c | 4 +- drivers/mtd/maps/physmap_of.c | 36 ++-- drivers/mtd/maps/sun_uflash.c | 18 +- drivers/mtd/nand/fsl_elbc_nand.c | 8 +- drivers/mtd/nand/fsl_upm.c | 32 ++-- drivers/mtd/nand/mpc5121_nfc.c | 40 ++-- drivers/mtd/nand/ndfc.c | 24 +- drivers/mtd/nand/pasemi_nand.c | 16 +- drivers/mtd/nand/socrates_nand.c | 14 +- drivers/mtd/ofpart.c | 16 +- drivers/net/bmac.c | 8 +- drivers/net/can/mscan/mpc5xxx_can.c | 42 ++-- drivers/net/can/sja1000/sja1000_of_platform.c | 30 ++-- drivers/net/ehea/ehea_main.c | 38 ++-- drivers/net/fec_mpc52xx.c | 38 ++-- drivers/net/fec_mpc52xx_phy.c | 16 +- drivers/net/fs_enet/fs_enet-main.c | 32 ++-- drivers/net/fs_enet/mac-fcc.c | 10 +- drivers/net/fs_enet/mac-fec.c | 6 +- drivers/net/fs_enet/mac-scc.c | 8 +- drivers/net/fs_enet/mii-bitbang.c | 22 +- drivers/net/fs_enet/mii-fec.c | 16 +- drivers/net/fsl_pq_mdio.c | 70 ++++---- drivers/net/gianfar.c | 72 ++++---- drivers/net/greth.c | 14 +- drivers/net/ibm_newemac/core.c | 98 +++++----- drivers/net/ibm_newemac/core.h | 2 +- drivers/net/ibm_newemac/debug.c | 8 +- drivers/net/ibm_newemac/debug.h | 2 +- drivers/net/ibm_newemac/mal.c | 36 ++-- drivers/net/ibm_newemac/rgmii.c | 22 +- drivers/net/ibm_newemac/tah.c | 16 +- drivers/net/ibm_newemac/zmii.c | 18 +- drivers/net/ll_temac.h | 2 +- drivers/net/ll_temac_main.c | 48 +++--- drivers/net/ll_temac_mdio.c | 14 +- drivers/net/mace.c | 10 +- drivers/net/myri_sbus.c | 20 +- drivers/net/niu.c | 30 ++-- drivers/net/pasemi_mac.c | 12 +- drivers/net/phy/mdio-gpio.c | 20 +- drivers/net/spider_net.c | 4 +- drivers/net/sunbmac.c | 18 +- drivers/net/sungem.c | 14 +- drivers/net/sungem.h | 2 +- drivers/net/sungem_phy.c | 4 +- drivers/net/sunhme.c | 26 ++-- drivers/net/sunlance.c | 24 +- drivers/net/sunqe.c | 18 +- drivers/net/tg3.c | 2 +- drivers/net/tulip/dmfe.c | 4 +- drivers/net/tulip/tulip_core.c | 4 +- drivers/net/ucc_geth.c | 46 ++-- drivers/net/wireless/orinoco/airport.c | 4 +- drivers/net/xilinx_emaclite.c | 38 ++-- drivers/of/address.c | 114 ++++++------ drivers/of/base.c | 14 +- drivers/of/device.c | 36 ++-- drivers/of/fdt.c | 4 +- drivers/of/gpio.c | 32 ++-- drivers/of/irq.c | 4 +- drivers/of/of_i2c.c | 18 +- drivers/of/of_mdio.c | 16 +- drivers/of/of_spi.c | 12 +- drivers/of/pdt.c | 4 +- drivers/of/platform.c | 212 ++++++++++---------- drivers/parport/parport_sunbpp.c | 12 +- drivers/pci/hotplug/rpadlpar_core.c | 6 +- drivers/pci/hotplug/rpaphp_core.c | 12 +- drivers/pcmcia/electra_cf.c | 26 ++-- drivers/pcmcia/m8xx_pcmcia.c | 18 +- drivers/rtc/rtc-mpc5121.c | 18 +- drivers/sbus/char/bbc_envctrl.c | 8 +- drivers/sbus/char/bbc_i2c.c | 18 +- drivers/sbus/char/bbc_i2c.h | 4 +- drivers/sbus/char/display7seg.c | 18 +- drivers/sbus/char/envctrl.c | 30 ++-- drivers/sbus/char/flash.c | 16 +- drivers/sbus/char/openprom.c | 24 +- drivers/sbus/char/uctrl.c | 14 +- drivers/scsi/ibmvscsi/ibmvfc.c | 14 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 6 +- drivers/scsi/ibmvscsi/ibmvstgt.c | 12 +- drivers/scsi/ibmvscsi/rpa_vscsi.c | 8 +- drivers/scsi/mac53c94.c | 6 +- drivers/scsi/mesh.c | 6 +- drivers/scsi/qla2xxx/qla_init.c | 8 +- drivers/scsi/qlogicpti.c | 26 ++-- drivers/scsi/sun_esp.c | 32 ++-- drivers/serial/apbuart.c | 32 ++-- drivers/serial/cpm_uart/cpm_uart_core.c | 46 ++-- drivers/serial/cpm_uart/cpm_uart_cpm1.c | 4 +- drivers/serial/cpm_uart/cpm_uart_cpm2.c | 2 +- drivers/serial/mpc52xx_uart.c | 44 ++-- drivers/serial/nwpserial.c | 10 +- drivers/serial/of_serial.c | 28 ++-- drivers/serial/pmac_zilog.c | 60 +++--- drivers/serial/suncore.c | 6 +- drivers/serial/sunhv.c | 12 +- drivers/serial/sunsab.c | 18 +- drivers/serial/sunsu.c | 28 ++-- drivers/serial/sunzilog.c | 22 +- drivers/serial/uartlite.c | 24 +- drivers/serial/ucc_uart.c | 40 ++-- drivers/spi/mpc512x_psc_spi.c | 24 +- drivers/spi/mpc52xx_psc_spi.c | 22 +- drivers/spi/mpc52xx_spi.c | 26 ++-- drivers/spi/spi.c | 8 +- drivers/spi/spi_fsl_espi.c | 24 +- drivers/spi/spi_fsl_lib.c | 16 +- drivers/spi/spi_fsl_lib.h | 2 +- drivers/spi/spi_fsl_spi.c | 40 ++-- drivers/spi/spi_ppc4xx.c | 40 ++-- drivers/spi/xilinx_spi.c | 2 +- drivers/spi/xilinx_spi_of.c | 22 +- drivers/usb/core/hcd-pci.c | 8 +- drivers/usb/gadget/fsl_qe_udc.c | 24 +- drivers/usb/host/ehci-hcd.c | 12 +- drivers/usb/host/ehci-ppc-of.c | 36 ++-- drivers/usb/host/ehci-xilinx-of.c | 20 +- drivers/usb/host/fhci-hcd.c | 34 ++-- drivers/usb/host/fsl-mph-dr-of.c | 28 ++-- drivers/usb/host/isp1760-if.c | 34 ++-- drivers/usb/host/ohci-hcd.c | 6 +- drivers/usb/host/ohci-ppc-of.c | 26 ++-- drivers/video/aty/aty128fb.c | 14 +- drivers/video/aty/atyfb_base.c | 8 +- drivers/video/aty/radeon_backlight.c | 6 +- drivers/video/aty/radeon_base.c | 12 +- drivers/video/aty/radeon_monitor.c | 12 +- drivers/video/aty/radeon_pm.c | 16 +- drivers/video/aty/radeonfb.h | 2 +- drivers/video/bw2.c | 14 +- drivers/video/cg14.c | 12 +- drivers/video/cg3.c | 16 +- drivers/video/cg6.c | 12 +- drivers/video/controlfb.c | 16 +- drivers/video/ffb.c | 12 +- drivers/video/fsl-diu-fb.c | 30 ++-- drivers/video/leo.c | 12 +- drivers/video/mb862xx/mb862xxfb.c | 16 +- drivers/video/mb862xx/mb862xxfb_accel.c | 2 +- drivers/video/nvidia/nv_of.c | 10 +- drivers/video/offb.c | 64 +++--- drivers/video/p9100.c | 12 +- drivers/video/platinumfb.c | 18 +- drivers/video/riva/fbdev.c | 4 +- drivers/video/sbuslib.c | 2 +- drivers/video/sunxvr1000.c | 24 +- drivers/video/sunxvr2500.c | 14 +- drivers/video/sunxvr500.c | 20 +- drivers/video/tcx.c | 14 +- drivers/video/valkyriefb.c | 4 +- drivers/video/xilinxfb.c | 32 ++-- drivers/watchdog/cpwd.c | 22 +- drivers/watchdog/gef_wdt.c | 14 +- drivers/watchdog/mpc8xxx_wdt.c | 14 +- drivers/watchdog/pika_wdt.c | 14 +- drivers/watchdog/riowd.c | 12 +- fs/openpromfs/inode.c | 2 +- fs/proc/proc_devtree.c | 10 +- include/asm-generic/gpio.h | 2 +- include/linux/device.h | 4 +- include/linux/dt.h | 8 +- include/linux/dt_address.h | 2 +- include/linux/dt_device.h | 12 +- include/linux/dt_irq.h | 2 +- include/linux/dt_mdio.h | 2 +- include/linux/dt_platform.h | 26 ++-- include/linux/dt_spi.h | 2 +- include/linux/fs_enet_pd.h | 2 +- include/linux/i2c.h | 6 +- include/linux/mod_devicetable.h | 2 +- scripts/coccinelle/iterators/fen.cocci | 10 +- scripts/mod/file2alias.c | 4 +- sound/aoa/codecs/onyx.c | 12 +- sound/aoa/codecs/tas.c | 12 +- sound/aoa/core/gpio-feature.c | 14 +- sound/aoa/fabrics/layout.c | 12 +- sound/aoa/soundbus/core.c | 12 +- sound/aoa/soundbus/i2sbus/control.c | 2 +- sound/aoa/soundbus/i2sbus/core.c | 30 ++-- sound/aoa/soundbus/soundbus.h | 2 +- sound/aoa/soundbus/sysfs.c | 4 +- sound/ppc/awacs.c | 24 +- sound/ppc/burgundy.c | 4 +- sound/ppc/pmac.c | 82 ++++---- sound/ppc/tumbler.c | 50 +++--- sound/soc/fsl/efika-audio-fabric.c | 6 +- sound/soc/fsl/fsl_dma.c | 30 ++-- sound/soc/fsl/fsl_ssi.c | 28 ++-- sound/soc/fsl/mpc5200_dma.c | 20 +- sound/soc/fsl/mpc5200_psc_ac97.c | 12 +- sound/soc/fsl/mpc5200_psc_i2s.c | 14 +- sound/soc/fsl/mpc8610_hpcd.c | 46 ++-- sound/soc/fsl/p1022_ds.c | 48 +++--- sound/soc/fsl/pcm030-audio-fabric.c | 6 +- sound/sparc/amd7930.c | 12 +- sound/sparc/cs4231.c | 22 +- sound/sparc/dbri.c | 14 +- 630 files changed, 6267 insertions(+), 6267 deletions(-) [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-24 14:03 RFC: Mega rename of device tree routines from of_*() to dt_*() Michael Ellerman @ 2010-11-24 15:44 ` Timur Tabi 2010-11-24 17:00 ` David Daney ` (3 subsequent siblings) 4 siblings, 0 replies; 19+ messages in thread From: Timur Tabi @ 2010-11-24 15:44 UTC (permalink / raw) To: michael Cc: linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux On Wed, Nov 24, 2010 at 8:03 AM, Michael Ellerman <michael@ellerman.id.au> wrote: > Personally I'm a bit ambivalent about it, the OF name is a bit wrong so > it would be nice to get rid of, but it's a lot of churn. > > So I'm hoping people with either say "YES this is a great idea", or "NO > this is stupid". Well, my vote is "no". I wouldn't call it stupid, but I do think it's a bad idea. In general, I don't like renaming functions, because it causes complications with merges and porting code across kernel versions. It also forces me to re-remember things. And especially in this case, the churn is too great. You're affecting files across multiple subsystems and architectures. -- Timur Tabi Linux kernel developer at Freescale ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-24 14:03 RFC: Mega rename of device tree routines from of_*() to dt_*() Michael Ellerman 2010-11-24 15:44 ` Timur Tabi @ 2010-11-24 17:00 ` David Daney 2010-11-24 17:02 ` Stephen Neuendorffer ` (2 subsequent siblings) 4 siblings, 0 replies; 19+ messages in thread From: David Daney @ 2010-11-24 17:00 UTC (permalink / raw) To: michael Cc: linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux On 11/24/2010 06:03 AM, Michael Ellerman wrote: > Hi all, > > There were some murmurings on IRC last week about renaming the of_*() > routines. I was procrastinating at the time and said I'd have a look at > it, so here I am. > > The thinking is that on many platforms that use the of_() routines > OpenFirmware is not involved at all, this is true even on many powerpc > platforms. Also for folks who don't know the OpenFirmware connection it > reads as "of", as in "a can of worms". > > Personally I'm a bit ambivalent about it, the OF name is a bit wrong so > it would be nice to get rid of, but it's a lot of churn. > > So I'm hoping people with either say "YES this is a great idea", or "NO > this is stupid". > > As step one I've just renamed as many routines as I could find to see > what the resulting patch looks like, so we can quantify the churn. I > also did device.of_node, which is used quite a bit. > > Thoughts? > > of -> dt most places I could think of (done mechanically): > [...] > drivers/of/address.c | 114 ++++++------ > drivers/of/base.c | 14 +- > drivers/of/device.c | 36 ++-- > drivers/of/fdt.c | 4 +- > drivers/of/gpio.c | 32 ++-- > drivers/of/irq.c | 4 +- > drivers/of/of_i2c.c | 18 +- > drivers/of/of_mdio.c | 16 +- > drivers/of/of_spi.c | 12 +- > drivers/of/pdt.c | 4 +- > drivers/of/platform.c | 212 ++++++++++---------- Well, not that I care one way or the other, but for consistency you should change all these directory and file names as well. David Daney ^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: Mega rename of device tree routines from of_*() to dt_*() 2010-11-24 14:03 RFC: Mega rename of device tree routines from of_*() to dt_*() Michael Ellerman 2010-11-24 15:44 ` Timur Tabi 2010-11-24 17:00 ` David Daney @ 2010-11-24 17:02 ` Stephen Neuendorffer 2010-11-24 17:18 ` David Daney 2010-11-24 18:18 ` RFC: " David VomLehn 2010-11-25 13:34 ` Michael Ellerman 4 siblings, 1 reply; 19+ messages in thread From: Stephen Neuendorffer @ 2010-11-24 17:02 UTC (permalink / raw) To: michael, LKML Cc: linuxppc-dev list, linux-mips, devicetree-discuss, sparclinux, microblaze-uclinux DQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogbGludXhwcGMtZGV2LWJv dW5jZXMrc3RlcGhlbj1uZXVlbmRvcmZmZXIubmFtZUBsaXN0cy5vemxhYnMub3JnIFttYWlsdG86 bGludXhwcGMtZGV2LQ0KPiBib3VuY2VzK3N0ZXBoZW49bmV1ZW5kb3JmZmVyLm5hbWVAbGlzdHMu b3psYWJzLm9yZ10gT24gQmVoYWxmIE9mIE1pY2hhZWwgRWxsZXJtYW4NCj4gU2VudDogV2VkbmVz ZGF5LCBOb3ZlbWJlciAyNCwgMjAxMCA2OjA0IEFNDQo+IFRvOiBMS01MDQo+IENjOiBsaW51eC1t aXBzOyBtaWNyb2JsYXplLXVjbGludXhAaXRlZS51cS5lZHUuYXU7IGRldmljZXRyZWUtZGlzY3Vz c0BsaXN0cy5vemxhYnMub3JnOyBsaW51eHBwYy1kZXYNCj4gbGlzdDsgc3BhcmNsaW51eEB2Z2Vy Lmtlcm5lbC5vcmcNCj4gU3ViamVjdDogUkZDOiBNZWdhIHJlbmFtZSBvZiBkZXZpY2UgdHJlZSBy b3V0aW5lcyBmcm9tIG9mXyooKSB0byBkdF8qKCkNCj4gDQo+IEhpIGFsbCwNCj4gDQo+IFRoZXJl IHdlcmUgc29tZSBtdXJtdXJpbmdzIG9uIElSQyBsYXN0IHdlZWsgYWJvdXQgcmVuYW1pbmcgdGhl IG9mXyooKQ0KPiByb3V0aW5lcy4gSSB3YXMgcHJvY3Jhc3RpbmF0aW5nIGF0IHRoZSB0aW1lIGFu ZCBzYWlkIEknZCBoYXZlIGEgbG9vayBhdA0KPiBpdCwgc28gaGVyZSBJIGFtLg0KPiANCj4gVGhl IHRoaW5raW5nIGlzIHRoYXQgb24gbWFueSBwbGF0Zm9ybXMgdGhhdCB1c2UgdGhlIG9mXygpIHJv dXRpbmVzDQo+IE9wZW5GaXJtd2FyZSBpcyBub3QgaW52b2x2ZWQgYXQgYWxsLCB0aGlzIGlzIHRy dWUgZXZlbiBvbiBtYW55IHBvd2VycGMNCj4gcGxhdGZvcm1zLiBBbHNvIGZvciBmb2xrcyB3aG8g ZG9uJ3Qga25vdyB0aGUgT3BlbkZpcm13YXJlIGNvbm5lY3Rpb24gaXQNCj4gcmVhZHMgYXMgIm9m IiwgYXMgaW4gImEgY2FuIG9mIHdvcm1zIi4NCj4gDQo+IFBlcnNvbmFsbHkgSSdtIGEgYml0IGFt Yml2YWxlbnQgYWJvdXQgaXQsIHRoZSBPRiBuYW1lIGlzIGEgYml0IHdyb25nIHNvDQo+IGl0IHdv dWxkIGJlIG5pY2UgdG8gZ2V0IHJpZCBvZiwgYnV0IGl0J3MgYSBsb3Qgb2YgY2h1cm4uDQo+IA0K PiBTbyBJJ20gaG9waW5nIHBlb3BsZSB3aXRoIGVpdGhlciBzYXkgIllFUyB0aGlzIGlzIGEgZ3Jl YXQgaWRlYSIsIG9yICJOTw0KPiB0aGlzIGlzIHN0dXBpZCIuDQoNClBlcnNvbmFsbHksIEkgdGhp bmsgaXQncyBhIGdyZWF0IGlkZWEsIGlmIG9ubHkgYmVjYXVzZSBJIHN0YXJlZCBsb25nIGFuZCBo YXJkDQphdCB0aGUgY29kZSBvbmNlIHVwb24gYSB0aW1lIHRyeWluZyB0byBmaWd1cmUgb3V0IHdo YXQgaXMgcmVhbGx5IE9GLXJlbGF0ZWQNCmFuZCB3aGF0IGlzbid0LiAgSXQncyBzb21ld2hhdCBj bGVhcmVyIG5vdyB0aGF0IGRyaXZlcnMvb2YgaGFzIGJlZW4gZmFjdG9yZWQNCm91dCAoYWx0aG91 Z2gsIHNob3VsZG4ndCBpdCBiZSBkcml2ZXJzL2R0Pz8/KQ0KDQpUaGF0IHNhaWQsIGl0ICppcyog YWxvdCBvZiBjb2RlIGNodXJuLiAgSWYgaXQncyBnb2luZyB0byBiZSBkb25lLCBJIHRoaW5rIGl0 IHNob3VsZCBiZQ0KZG9uZSBpbiBjb25jZXJ0IHdpdGggZml4aW5nIGEgYnVuY2ggb2YgdGhlIGZ1 bmN0aW9uIG5hbWVzIHdoaWNoIGRvbid0IHJlYWxseSBmb2xsb3cgYW55DQpzYW5lIG5hbWluZyBj b252ZW50aW9uLCBzbyB0aGF0IHRoZSBiYWNrcG9ydGluZyBkaXNjb250aW51aXR5IG9ubHkgaGFw cGVucyBvbmNlLg0KDQpTdGV2ZQ0KClRoaXMgZW1haWwgYW5kIGFueSBhdHRhY2htZW50cyBhcmUg aW50ZW5kZWQgZm9yIHRoZSBzb2xlIHVzZSBvZiB0aGUgbmFtZWQgcmVjaXBpZW50KHMpIGFuZCBj b250YWluKHMpIGNvbmZpZGVudGlhbCBpbmZvcm1hdGlvbiB0aGF0IG1heSBiZSBwcm9wcmlldGFy eSwgcHJpdmlsZWdlZCBvciBjb3B5cmlnaHRlZCB1bmRlciBhcHBsaWNhYmxlIGxhdy4gSWYgeW91 IGFyZSBub3QgdGhlIGludGVuZGVkIHJlY2lwaWVudCwgZG8gbm90IHJlYWQsIGNvcHksIG9yIGZv cndhcmQgdGhpcyBlbWFpbCBtZXNzYWdlIG9yIGFueSBhdHRhY2htZW50cy4gRGVsZXRlIHRoaXMg ZW1haWwgbWVzc2FnZSBhbmQgYW55IGF0dGFjaG1lbnRzIGltbWVkaWF0ZWx5Lgo= ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Mega rename of device tree routines from of_*() to dt_*() 2010-11-24 17:02 ` Stephen Neuendorffer @ 2010-11-24 17:18 ` David Daney 2010-11-24 18:02 ` Grant Likely 2010-11-24 18:32 ` Stephen Neuendorffer 0 siblings, 2 replies; 19+ messages in thread From: David Daney @ 2010-11-24 17:18 UTC (permalink / raw) To: Stephen Neuendorffer Cc: linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux On 11/24/2010 09:02 AM, Stephen Neuendorffer wrote: > > >> -----Original Message----- >> From: linuxppc-dev-bounces+stephen=neuendorffer.name@lists.ozlabs.org [mailto:linuxppc-dev- >> bounces+stephen=neuendorffer.name@lists.ozlabs.org] On Behalf Of Michael Ellerman >> Sent: Wednesday, November 24, 2010 6:04 AM >> To: LKML >> Cc: linux-mips; microblaze-uclinux@itee.uq.edu.au; devicetree-discuss@lists.ozlabs.org; linuxppc-dev >> list; sparclinux@vger.kernel.org >> Subject: RFC: Mega rename of device tree routines from of_*() to dt_*() >> >> Hi all, >> >> There were some murmurings on IRC last week about renaming the of_*() >> routines. I was procrastinating at the time and said I'd have a look at >> it, so here I am. >> >> The thinking is that on many platforms that use the of_() routines >> OpenFirmware is not involved at all, this is true even on many powerpc >> platforms. Also for folks who don't know the OpenFirmware connection it >> reads as "of", as in "a can of worms". >> >> Personally I'm a bit ambivalent about it, the OF name is a bit wrong so >> it would be nice to get rid of, but it's a lot of churn. >> >> So I'm hoping people with either say "YES this is a great idea", or "NO >> this is stupid". > > Personally, I think it's a great idea, if only because I stared long and hard > at the code once upon a time trying to figure out what is really OF-related > and what isn't. It's somewhat clearer now that drivers/of has been factored > out (although, shouldn't it be drivers/dt???) > > That said, it *is* alot of code churn. If it's going to be done, I think it should be > done in concert with fixing a bunch of the function names which don't really follow any > sane naming convention, so that the backporting discontinuity only happens once. > Oh, you mean things like: of_{,un}register_platform_driver vs. platform_driver_{,un}register That one is particularly annoying to me. David Daney ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Mega rename of device tree routines from of_*() to dt_*() 2010-11-24 17:18 ` David Daney @ 2010-11-24 18:02 ` Grant Likely 2010-11-24 18:32 ` Stephen Neuendorffer 1 sibling, 0 replies; 19+ messages in thread From: Grant Likely @ 2010-11-24 18:02 UTC (permalink / raw) To: David Daney Cc: linux-mips, microblaze-uclinux, LKML, linuxppc-dev list, sparclinux, devicetree-discuss On Wed, Nov 24, 2010 at 10:18 AM, David Daney <ddaney@caviumnetworks.com> w= rote: > On 11/24/2010 09:02 AM, Stephen Neuendorffer wrote: >> >> >>> -----Original Message----- >>> From: linuxppc-dev-bounces+stephen=3Dneuendorffer.name@lists.ozlabs.org >>> [mailto:linuxppc-dev- >>> bounces+stephen=3Dneuendorffer.name@lists.ozlabs.org] On Behalf Of Mich= ael >>> Ellerman >>> Sent: Wednesday, November 24, 2010 6:04 AM >>> To: LKML >>> Cc: linux-mips; microblaze-uclinux@itee.uq.edu.au; >>> devicetree-discuss@lists.ozlabs.org; linuxppc-dev >>> list; sparclinux@vger.kernel.org >>> Subject: RFC: Mega rename of device tree routines from of_*() to dt_*() >>> >>> Hi all, >>> >>> There were some murmurings on IRC last week about renaming the of_*() >>> routines. I was procrastinating at the time and said I'd have a look at >>> it, so here I am. >>> >>> The thinking is that on many platforms that use the of_() routines >>> OpenFirmware is not involved at all, this is true even on many powerpc >>> platforms. Also for folks who don't know the OpenFirmware connection it >>> reads as "of", as in "a can of worms". >>> >>> Personally I'm a bit ambivalent about it, the OF name is a bit wrong so >>> it would be nice to get rid of, but it's a lot of churn. >>> >>> So I'm hoping people with either say "YES this is a great idea", or "NO >>> this is stupid". >> >> Personally, I think it's a great idea, if only because I stared long and >> hard >> at the code once upon a time trying to figure out what is really >> OF-related >> and what isn't. =A0It's somewhat clearer now that drivers/of has been >> factored >> out (although, shouldn't it be drivers/dt???) Yes, the directory name should change, as should the CONFIG_OF* defines. >> >> That said, it *is* alot of code churn. =A0If it's going to be done, I th= ink >> it should be >> done in concert with fixing a bunch of the function names which don't >> really follow any >> sane naming convention, so that the backporting discontinuity only happe= ns >> once. >> > > Oh, you mean things like: > > of_{,un}register_platform_driver vs. platform_driver_{,un}register > > That one is particularly annoying to me. Ignore that one. of_{,un}platform_driver is deprecated and users will all be converted to platform_drivers. g. ^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: Mega rename of device tree routines from of_*() to dt_*() 2010-11-24 17:18 ` David Daney 2010-11-24 18:02 ` Grant Likely @ 2010-11-24 18:32 ` Stephen Neuendorffer 1 sibling, 0 replies; 19+ messages in thread From: Stephen Neuendorffer @ 2010-11-24 18:32 UTC (permalink / raw) To: David Daney Cc: linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux DQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogRGF2aWQgRGFuZXkgW21h aWx0bzpkZGFuZXlAY2F2aXVtbmV0d29ya3MuY29tXQ0KPiBTZW50OiBXZWRuZXNkYXksIE5vdmVt YmVyIDI0LCAyMDEwIDk6MTggQU0NCj4gVG86IFN0ZXBoZW4gTmV1ZW5kb3JmZmVyDQo+IENjOiBt aWNoYWVsQGVsbGVybWFuLmlkLmF1OyBMS01MOyBsaW51eC1taXBzOyBtaWNyb2JsYXplLXVjbGlu dXhAaXRlZS51cS5lZHUuYXU7IGRldmljZXRyZWUtDQo+IGRpc2N1c3NAbGlzdHMub3psYWJzLm9y ZzsgbGludXhwcGMtZGV2IGxpc3Q7IHNwYXJjbGludXhAdmdlci5rZXJuZWwub3JnDQo+IFN1Ympl Y3Q6IFJlOiBNZWdhIHJlbmFtZSBvZiBkZXZpY2UgdHJlZSByb3V0aW5lcyBmcm9tIG9mXyooKSB0 byBkdF8qKCkNCj4gDQo+IE9uIDExLzI0LzIwMTAgMDk6MDIgQU0sIFN0ZXBoZW4gTmV1ZW5kb3Jm ZmVyIHdyb3RlOg0KPiA+DQo+ID4NCj4gPj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4g Pj4gRnJvbTogbGludXhwcGMtZGV2LWJvdW5jZXMrc3RlcGhlbj1uZXVlbmRvcmZmZXIubmFtZUBs aXN0cy5vemxhYnMub3JnIFttYWlsdG86bGludXhwcGMtZGV2LQ0KPiA+PiBib3VuY2VzK3N0ZXBo ZW49bmV1ZW5kb3JmZmVyLm5hbWVAbGlzdHMub3psYWJzLm9yZ10gT24gQmVoYWxmIE9mIE1pY2hh ZWwgRWxsZXJtYW4NCj4gPj4gU2VudDogV2VkbmVzZGF5LCBOb3ZlbWJlciAyNCwgMjAxMCA2OjA0 IEFNDQo+ID4+IFRvOiBMS01MDQo+ID4+IENjOiBsaW51eC1taXBzOyBtaWNyb2JsYXplLXVjbGlu dXhAaXRlZS51cS5lZHUuYXU7IGRldmljZXRyZWUtZGlzY3Vzc0BsaXN0cy5vemxhYnMub3JnOyBs aW51eHBwYy0NCj4gZGV2DQo+ID4+IGxpc3Q7IHNwYXJjbGludXhAdmdlci5rZXJuZWwub3JnDQo+ ID4+IFN1YmplY3Q6IFJGQzogTWVnYSByZW5hbWUgb2YgZGV2aWNlIHRyZWUgcm91dGluZXMgZnJv bSBvZl8qKCkgdG8gZHRfKigpDQo+ID4+DQo+ID4+IEhpIGFsbCwNCj4gPj4NCj4gPj4gVGhlcmUg d2VyZSBzb21lIG11cm11cmluZ3Mgb24gSVJDIGxhc3Qgd2VlayBhYm91dCByZW5hbWluZyB0aGUg b2ZfKigpDQo+ID4+IHJvdXRpbmVzLiBJIHdhcyBwcm9jcmFzdGluYXRpbmcgYXQgdGhlIHRpbWUg YW5kIHNhaWQgSSdkIGhhdmUgYSBsb29rIGF0DQo+ID4+IGl0LCBzbyBoZXJlIEkgYW0uDQo+ID4+ DQo+ID4+IFRoZSB0aGlua2luZyBpcyB0aGF0IG9uIG1hbnkgcGxhdGZvcm1zIHRoYXQgdXNlIHRo ZSBvZl8oKSByb3V0aW5lcw0KPiA+PiBPcGVuRmlybXdhcmUgaXMgbm90IGludm9sdmVkIGF0IGFs bCwgdGhpcyBpcyB0cnVlIGV2ZW4gb24gbWFueSBwb3dlcnBjDQo+ID4+IHBsYXRmb3Jtcy4gQWxz byBmb3IgZm9sa3Mgd2hvIGRvbid0IGtub3cgdGhlIE9wZW5GaXJtd2FyZSBjb25uZWN0aW9uIGl0 DQo+ID4+IHJlYWRzIGFzICJvZiIsIGFzIGluICJhIGNhbiBvZiB3b3JtcyIuDQo+ID4+DQo+ID4+ IFBlcnNvbmFsbHkgSSdtIGEgYml0IGFtYml2YWxlbnQgYWJvdXQgaXQsIHRoZSBPRiBuYW1lIGlz IGEgYml0IHdyb25nIHNvDQo+ID4+IGl0IHdvdWxkIGJlIG5pY2UgdG8gZ2V0IHJpZCBvZiwgYnV0 IGl0J3MgYSBsb3Qgb2YgY2h1cm4uDQo+ID4+DQo+ID4+IFNvIEknbSBob3BpbmcgcGVvcGxlIHdp dGggZWl0aGVyIHNheSAiWUVTIHRoaXMgaXMgYSBncmVhdCBpZGVhIiwgb3IgIk5PDQo+ID4+IHRo aXMgaXMgc3R1cGlkIi4NCj4gPg0KPiA+IFBlcnNvbmFsbHksIEkgdGhpbmsgaXQncyBhIGdyZWF0 IGlkZWEsIGlmIG9ubHkgYmVjYXVzZSBJIHN0YXJlZCBsb25nIGFuZCBoYXJkDQo+ID4gYXQgdGhl IGNvZGUgb25jZSB1cG9uIGEgdGltZSB0cnlpbmcgdG8gZmlndXJlIG91dCB3aGF0IGlzIHJlYWxs eSBPRi1yZWxhdGVkDQo+ID4gYW5kIHdoYXQgaXNuJ3QuICBJdCdzIHNvbWV3aGF0IGNsZWFyZXIg bm93IHRoYXQgZHJpdmVycy9vZiBoYXMgYmVlbiBmYWN0b3JlZA0KPiA+IG91dCAoYWx0aG91Z2gs IHNob3VsZG4ndCBpdCBiZSBkcml2ZXJzL2R0Pz8/KQ0KPiA+DQo+ID4gVGhhdCBzYWlkLCBpdCAq aXMqIGFsb3Qgb2YgY29kZSBjaHVybi4gIElmIGl0J3MgZ29pbmcgdG8gYmUgZG9uZSwgSSB0aGlu ayBpdCBzaG91bGQgYmUNCj4gPiBkb25lIGluIGNvbmNlcnQgd2l0aCBmaXhpbmcgYSBidW5jaCBv ZiB0aGUgZnVuY3Rpb24gbmFtZXMgd2hpY2ggZG9uJ3QgcmVhbGx5IGZvbGxvdyBhbnkNCj4gPiBz YW5lIG5hbWluZyBjb252ZW50aW9uLCBzbyB0aGF0IHRoZSBiYWNrcG9ydGluZyBkaXNjb250aW51 aXR5IG9ubHkgaGFwcGVucyBvbmNlLg0KPiA+DQo+IA0KPiBPaCwgeW91IG1lYW4gdGhpbmdzIGxp a2U6DQo+IA0KPiBvZl97LHVufXJlZ2lzdGVyX3BsYXRmb3JtX2RyaXZlciB2cy4gcGxhdGZvcm1f ZHJpdmVyX3ssdW59cmVnaXN0ZXINCj4gDQo+IFRoYXQgb25lIGlzIHBhcnRpY3VsYXJseSBhbm5v eWluZyB0byBtZS4NCj4gDQo+IERhdmlkIERhbmV5DQoNCkFjdHVhbGx5LCBJIHdhcyBwYXJ0aWN1 bGFybHkgdGhpbmtpbmcgb2YgZHJpdmVycy9vZi9mZHQuYywgd2hpY2ggSSB3YXMgcmVjZW50bHkg aGFja2luZyBhcm91bmQgd2l0aCwNCmJ1dCBJJ20gc3VyZSB0aGVyZSBhcmUgb3RoZXJzLi4uIDop DQoNClN0ZXZlDQoKVGhpcyBlbWFpbCBhbmQgYW55IGF0dGFjaG1lbnRzIGFyZSBpbnRlbmRlZCBm b3IgdGhlIHNvbGUgdXNlIG9mIHRoZSBuYW1lZCByZWNpcGllbnQocykgYW5kIGNvbnRhaW4ocykg Y29uZmlkZW50aWFsIGluZm9ybWF0aW9uIHRoYXQgbWF5IGJlIHByb3ByaWV0YXJ5LCBwcml2aWxl Z2VkIG9yIGNvcHlyaWdodGVkIHVuZGVyIGFwcGxpY2FibGUgbGF3LiBJZiB5b3UgYXJlIG5vdCB0 aGUgaW50ZW5kZWQgcmVjaXBpZW50LCBkbyBub3QgcmVhZCwgY29weSwgb3IgZm9yd2FyZCB0aGlz IGVtYWlsIG1lc3NhZ2Ugb3IgYW55IGF0dGFjaG1lbnRzLiBEZWxldGUgdGhpcyBlbWFpbCBtZXNz YWdlIGFuZCBhbnkgYXR0YWNobWVudHMgaW1tZWRpYXRlbHkuCg== ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-24 14:03 RFC: Mega rename of device tree routines from of_*() to dt_*() Michael Ellerman ` (2 preceding siblings ...) 2010-11-24 17:02 ` Stephen Neuendorffer @ 2010-11-24 18:18 ` David VomLehn 2010-11-25 13:34 ` Michael Ellerman 4 siblings, 0 replies; 19+ messages in thread From: David VomLehn @ 2010-11-24 18:18 UTC (permalink / raw) To: Michael Ellerman Cc: linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux On Thu, Nov 25, 2010 at 01:03:33AM +1100, Michael Ellerman wrote: > Hi all, > > There were some murmurings on IRC last week about renaming the of_*() > routines. I was procrastinating at the time and said I'd have a look at > it, so here I am. > > The thinking is that on many platforms that use the of_() routines > OpenFirmware is not involved at all, this is true even on many powerpc > platforms. Also for folks who don't know the OpenFirmware connection it > reads as "of", as in "a can of worms". > > Personally I'm a bit ambivalent about it, the OF name is a bit wrong so > it would be nice to get rid of, but it's a lot of churn. > > So I'm hoping people with either say "YES this is a great idea", or "NO > this is stupid". > > As step one I've just renamed as many routines as I could find to see > what the resulting patch looks like, so we can quantify the churn. I > also did device.of_node, which is used quite a bit. > > Thoughts? I'm looking at it the other way. There are inconsistencies in naming of symbols and files we definitely should clean up. Since we're doing that, let's take the opportunity to move from of* to dt*. With multiple architectures adding device tree support, this is about the last chance to do this without impacting too many people. -- David VL ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-24 14:03 RFC: Mega rename of device tree routines from of_*() to dt_*() Michael Ellerman ` (3 preceding siblings ...) 2010-11-24 18:18 ` RFC: " David VomLehn @ 2010-11-25 13:34 ` Michael Ellerman 2010-11-25 14:01 ` Geert Uytterhoeven ` (2 more replies) 4 siblings, 3 replies; 19+ messages in thread From: Michael Ellerman @ 2010-11-25 13:34 UTC (permalink / raw) To: LKML Cc: linux-arch, linux-mips, microblaze-uclinux, devicetree-discuss, linuxppc-dev list, sparclinux [-- Attachment #1: Type: text/plain, Size: 6771 bytes --] On Thu, 2010-11-25 at 01:03 +1100, Michael Ellerman wrote: > Hi all, > > There were some murmurings on IRC last week about renaming the of_*() > routines. ... > The thinking is that on many platforms that use the of_() routines > OpenFirmware is not involved at all, this is true even on many powerpc > platforms. Also for folks who don't know the OpenFirmware connection > it reads as "of", as in "a can of worms". ... > So I'm hoping people with either say "YES this is a great idea", or "NO > this is stupid". I'm still hoping, but so far it seems most people have got better things to do, and of those that do have an opinion the balance is slightly positive. So here's a first cut of a patch to add the new names. I've not touched of_platform because that is supposed to go away. That will lead to some odd looking code in the interim, but I think is the right approach. Most of these are straight renames, but some have changed more substantially. The routines for the flat tree have all become fdt_foo(). I'd be inclined to drop "early_init" from them too, because they're basically all about early init, but Grant said he'd prefer not to I think. I've also renamed the flat tree tag constants to match libfdt. I've left for_each_child_of_node(), because I read it as "of", but maybe it's "OF"? cheers #ifndef __DT_H #define __DT_H /* include/linux/device.h */ #define dt_match_table of_match_table #define dt_node of_node /* include/linux/mod_devicetable.h */ #define dt_device_id of_device_id /* include/linux/of.h */ #define dt_node_to_nid of_node_to_nid #define dt_chosen of_chosen #define dt_node_is_root of_node_is_root #define dt_node_check_flag of_node_check_flag #define dt_node_set_flag of_node_set_flag #define dt_find_all_nodes of_find_all_nodes #define dt_node_get of_node_get #define dt_node_put of_node_put #define dt_read_number of_read_number #define dt_read_ulong of_read_ulong #define dt_find_node_by_name of_find_node_by_name #define dt_find_node_by_type of_find_node_by_type #define dt_find_compatible_node of_find_compatible_node #define dt_find_matching_node of_find_matching_node #define dt_find_node_by_path of_find_node_by_path #define dt_find_node_by_phandle of_find_node_by_phandle #define dt_get_parent of_get_parent #define dt_get_next_parent of_get_next_parent #define dt_get_next_child of_get_next_child #define dt_find_node_with_property of_find_node_with_property #define dt_device_is_compatible of_device_is_compatible #define dt_device_is_available of_device_is_available #define dt_get_property of_get_property #define dt_n_addr_cells of_n_addr_cells #define dt_n_size_cells of_n_size_cells #define dt_match_node of_match_node #define dt_modalias_node of_modalias_node #define dt_parse_phandle of_parse_phandle #define dt_parse_phandles_with_args of_parse_phandles_with_args #define dt_machine_is_compatible of_machine_is_compatible #define dt_attach_node of_attach_node #define dt_detach_node of_detach_node #define dt_find_property of_find_property /* include/linux/of_fdt.h */ #define fdt_find_string find_flat_dt_string #define fdt_scan of_scan_flat_dt #define fdt_get_prop of_get_flat_dt_prop #define fdt_is_compatible of_flat_dt_is_compatible #define fdt_get_root of_get_flat_dt_root #define fdt_early_init_scan_chosen early_init_dt_scan_chosen #define fdt_early_init_check_for_initrd early_init_dt_check_for_initrd #define fdt_early_init_scan_memory early_init_dt_scan_memory #define fdt_early_init_add_memory_arch early_init_dt_add_memory_arch #define fdt_early_init_alloc_memory_arch early_init_dt_alloc_memory_arch #define fdt_early_init_setup_initrd_arch early_init_dt_setup_initrd_arch #define fdt_early_init_scan_root early_init_dt_scan_root #define fdt_unflatten unflatten_device_tree #define fdt_early_init early_init_devtree #define FDT_MAGIC OF_DT_HEADER #define FDT_BEGIN_NODE OF_DT_BEGIN_NODE #define FDT_END_NODE OF_DT_END_NODE #define FDT_PROP OF_DT_PROP #define FDT_NOP OF_DT_NOP #define FDT_END OF_DT_END #define FDT_VERSION OF_DT_VERSION /* include/linux/of_address.h */ #define dt_translate_address of_translate_address #define dt_address_to_resource of_address_to_resource #define dt_iomap of_iomap #define dt_get_address of_get_address #define dt_get_pci_address of_get_pci_address #define dt_pci_address_to_resource of_pci_address_to_resource /* include/linux/of_device.h */ #define dt_match_device of_match_device #define dt_device_make_bus_id of_device_make_bus_id #define dt_driver_match_device of_driver_match_device #define dt_dev_get of_dev_get #define dt_dev_put of_dev_put #define dt_device_add of_device_add #define dt_device_register of_device_register #define dt_device_unregister of_device_unregister #define dt_device_get_modalias of_device_get_modalias #define dt_device_uevent of_device_uevent #define dt_device_node_put of_device_node_put /* include/linux/of_irq.h */ #define dt_irq of_irq #define dt_irq_parse_and_map irq_of_parse_and_map #define dt_irq_workarounds of_irq_workarounds #define dt_irq_dflt_pic of_irq_dflt_pic #define dt_irq_map_oldworld of_irq_map_oldworld #define dt_irq_map_raw of_irq_map_raw #define dt_irq_map_one of_irq_map_one #define dt_irq_create_mapping irq_create_of_mapping #define dt_irq_to_resource of_irq_to_resource #define dt_irq_count of_irq_count #define dt_irq_to_resource_table of_irq_to_resource_table #define DT_IRQ_MAX_SPEC OF_MAX_IRQ_SPEC #define DT_IRQ_QUIRK_OLDWORLD_MAC OF_IMAP_OLDWORLD_MAC #define DT_IRQ_QUIRK_NO_PHANDLE OF_IMAP_NO_PHANDLE /* include/linux/of_mdio.h */ #define dt_mdiobus_register of_mdiobus_register #define dt_phy_find_device of_phy_find_device #define dt_phy_connect of_phy_connect #define dt_phy_connect_fixed_link of_phy_connect_fixed_link /* include/linux/of_spi.h */ #define dt_register_spi_devices of_register_spi_devices /* include/linux/of_gpio.h */ #define dt_gpio_flags of_gpio_flags #define DT_GPIO_ACTIVE_LOW OF_GPIO_ACTIVE_LOW #define dt_mm_gpio_chip of_mm_gpio_chip #define to_dt_mm_gpio_chip to_of_mm_gpio_chip #define dt_get_gpio_flags of_get_gpio_flags #define dt_gpio_count of_gpio_count #define dt_mm_gpiochip_add of_mm_gpiochip_add #define dt_gpiochip_add of_gpiochip_add #define dt_gpiochip_remove of_gpiochip_remove #define dt_node_to_gpiochip of_node_to_gpiochip #define dt_get_gpio of_get_gpio /* include/linux/dt_i2c.h */ #define dt_i2c_register_devices of_i2c_register_devices #define dt_find_i2c_device_by_node of_find_i2c_device_by_node #endif /* __DT_H */ [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-25 13:34 ` Michael Ellerman @ 2010-11-25 14:01 ` Geert Uytterhoeven 2010-11-25 20:52 ` Benjamin Herrenschmidt 2010-11-25 16:17 ` Grant Likely 2010-11-29 5:55 ` David Gibson 2 siblings, 1 reply; 19+ messages in thread From: Geert Uytterhoeven @ 2010-11-25 14:01 UTC (permalink / raw) To: michael Cc: linux-arch, linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux On Thu, Nov 25, 2010 at 14:34, Michael Ellerman <michael@ellerman.id.au> wr= ote: > I've left for_each_child_of_node(), because I read it as "of", but maybe > it's "OF"? I always read it as "for each child-OF-node", so I would rename it to "dt_for_each_child_node". Gr{oetje,eeting}s, =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k= .org In personal conversations with technical people, I call myself a hacker. Bu= t when I'm talking to journalists I just say "programmer" or something like t= hat. =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0=C2=A0 -- Linus Torvalds ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-25 14:01 ` Geert Uytterhoeven @ 2010-11-25 20:52 ` Benjamin Herrenschmidt 0 siblings, 0 replies; 19+ messages in thread From: Benjamin Herrenschmidt @ 2010-11-25 20:52 UTC (permalink / raw) To: Geert Uytterhoeven Cc: linux-arch, linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux On Thu, 2010-11-25 at 15:01 +0100, Geert Uytterhoeven wrote: > > I always read it as "for each child-OF-node", so I would rename it to > "dt_for_each_child_node". Well, it was meant to be for_child_of_node not _OF_node :-) Cheers, Ben. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-25 13:34 ` Michael Ellerman 2010-11-25 14:01 ` Geert Uytterhoeven @ 2010-11-25 16:17 ` Grant Likely 2010-11-26 3:15 ` Michael Ellerman 2010-11-29 5:55 ` David Gibson 2 siblings, 1 reply; 19+ messages in thread From: Grant Likely @ 2010-11-25 16:17 UTC (permalink / raw) To: michael Cc: linux-arch, linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux, Andrew Morton, Linus Torvalds On Thu, Nov 25, 2010 at 6:34 AM, Michael Ellerman <michael@ellerman.id.au> wrote: > On Thu, 2010-11-25 at 01:03 +1100, Michael Ellerman wrote: >> Hi all, >> >> There were some murmurings on IRC last week about renaming the of_*() >> routines. > ... >> The thinking is that on many platforms that use the of_() routines >> OpenFirmware is not involved at all, this is true even on many powerpc >> platforms. Also for folks who don't know the OpenFirmware connection >> it reads as "of", as in "a can of worms". > ... >> So I'm hoping people with either say "YES this is a great idea", or "NO >> this is stupid". > > I'm still hoping, but so far it seems most people have got better things > to do, and of those that do have an opinion the balance is slightly > positive. I assume you'll be also publishing the script that you use for generating the massive patch. I expect that there will be a few iterations of running the rename script to convert over all the stragglers. It should also be negotiated with Linus about when this patch should get applied. I do NOT want to cause massive merge pain during the merge window. Andrew/Linus: Before Michael proceeds too far with this rename, are you okay with a mass rename of the device tree functions from of_* to dt_*? Nobody likes the ambiguous 'of_' prefix ("of? of what?"), but to fix it means large cross-tree patches and potential merge conflicts. > So here's a first cut of a patch to add the new names. I've not touched > of_platform because that is supposed to go away. That will lead to some > odd looking code in the interim, but I think is the right approach. I would split it up into separate dt*.h files, one for each of*.h file so that the #include lines can be changed in the C code at the same time. Each dt*.h file would include it's of*.h counterpart. Then after the code is renamed, and a release or two has passed to catch the majority of users, the old definitions can be moved into the dt*.h files. However, it may be better to move and rename the definitions immediately, and leave "#define of_* dt_*" macros in the old of*.h files which can be removed with a simple patch after all the users are converted. That would have a smaller impact in the cleanup stage. > Most of these are straight renames, but some have changed more > substantially. The routines for the flat tree have all become fdt_foo(). > I'd be inclined to drop "early_init" from them too, because they're > basically all about early init, but Grant said he'd prefer not to I > think. I've also renamed the flat tree tag constants to match libfdt. It is all about early init now in Linus' tree, but Stephen Neuendorffer has patches that use the fdt code at driver probe time for parsing device tree fragments that describe an FPGA add-in board. > > I've left for_each_child_of_node(), because I read it as "of", but maybe > it's "OF"? hahaha! I never considered that it might be OF, but now I probably won't be able to help but read it that way! I like Geert's suggestion of dt_for_each_child_node g. > > cheers > > #ifndef __DT_H > #define __DT_H > > /* include/linux/device.h */ > #define dt_match_table =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_match_table > #define dt_node =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_node This could be very messy. I've nervous about using #define to rename structure members. You'll need to check that any structure members that use the same name as a global symbol are handled appropriately. > > /* include/linux/mod_devicetable.h */ > #define dt_device_id =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_device_id > > /* include/linux/of.h */ > #define dt_node_to_nid =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_node_to_nid > #define dt_chosen =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_chosen > #define dt_node_is_root =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_node_is_root > #define dt_node_check_flag =A0 =A0 =A0 =A0 =A0 =A0 =A0of_node_check_flag > #define dt_node_set_flag =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_node_set_flag > #define dt_find_all_nodes =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_find_all_nodes > #define dt_node_get =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_node_get > #define dt_node_put =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_node_put > #define dt_read_number =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_read_number > #define dt_read_ulong =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_read_ulong > #define dt_find_node_by_name =A0 =A0 =A0 =A0 =A0 =A0of_find_node_by_name > #define dt_find_node_by_type =A0 =A0 =A0 =A0 =A0 =A0of_find_node_by_type > #define dt_find_compatible_node =A0 =A0 =A0 =A0 of_find_compatible_node > #define dt_find_matching_node =A0 =A0 =A0 =A0 =A0 of_find_matching_node > #define dt_find_node_by_path =A0 =A0 =A0 =A0 =A0 =A0of_find_node_by_path > #define dt_find_node_by_phandle =A0 =A0 =A0 =A0 of_find_node_by_phandle > #define dt_get_parent =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_get_parent > #define dt_get_next_parent =A0 =A0 =A0 =A0 =A0 =A0 =A0of_get_next_parent > #define dt_get_next_child =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_get_next_child > #define dt_find_node_with_property =A0 =A0 =A0of_find_node_with_property > #define dt_device_is_compatible =A0 =A0 =A0 =A0 of_device_is_compatible > #define dt_device_is_available =A0 =A0 =A0 =A0 =A0of_device_is_available > #define dt_get_property =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_get_property > #define dt_n_addr_cells =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_n_addr_cells > #define dt_n_size_cells =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_n_size_cells > #define dt_match_node =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_match_node > #define dt_modalias_node =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_modalias_node > #define dt_parse_phandle =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_parse_phandle > #define dt_parse_phandles_with_args =A0 =A0 of_parse_phandles_with_args > #define dt_machine_is_compatible =A0 =A0 =A0 =A0of_machine_is_compatible > #define dt_attach_node =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_attach_node > #define dt_detach_node =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_detach_node > #define dt_find_property =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_find_property > > /* include/linux/of_fdt.h */ > #define fdt_find_string =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 find_flat_dt_stri= ng > #define fdt_scan =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_scan_f= lat_dt > #define fdt_get_prop =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_get_flat_d= t_prop > #define fdt_is_compatible =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_flat_dt_is_compa= tible > #define fdt_get_root =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_get_flat_d= t_root > #define fdt_early_init_scan_chosen =A0 =A0 =A0early_init_dt_scan_chosen > #define fdt_early_init_check_for_initrd early_init_dt_check_for_initrd > #define fdt_early_init_scan_memory =A0 =A0 =A0early_init_dt_scan_memory > #define fdt_early_init_add_memory_arch =A0early_init_dt_add_memory_arch > #define fdt_early_init_alloc_memory_arch early_init_dt_alloc_memory_arch > #define fdt_early_init_setup_initrd_arch early_init_dt_setup_initrd_arch > #define fdt_early_init_scan_root =A0 =A0 =A0 =A0early_init_dt_scan_root > #define fdt_unflatten =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 unflatten_devic= e_tree > #define fdt_early_init =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0early_init_devt= ree > #define FDT_MAGIC =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 OF_DT_HEADE= R > #define FDT_BEGIN_NODE =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0OF_DT_BEGIN_NOD= E > #define FDT_END_NODE =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0OF_DT_END_NOD= E > #define FDT_PROP =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0OF_DT_PRO= P > #define FDT_NOP =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 OF_DT_NOP > #define FDT_END =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 OF_DT_END > #define FDT_VERSION =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 OF_DT_VERSION > > /* include/linux/of_address.h */ > #define dt_translate_address =A0 =A0 =A0 =A0 =A0 =A0of_translate_address > #define dt_address_to_resource =A0 =A0 =A0 =A0 =A0of_address_to_resource > #define dt_iomap =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_iomap > #define dt_get_address =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_get_address > #define dt_get_pci_address =A0 =A0 =A0 =A0 =A0 =A0 =A0of_get_pci_address > #define dt_pci_address_to_resource =A0 =A0 =A0of_pci_address_to_resource > > /* include/linux/of_device.h */ > #define dt_match_device =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_match_device > #define dt_device_make_bus_id =A0 =A0 =A0 =A0 =A0 of_device_make_bus_id > #define dt_driver_match_device =A0 =A0 =A0 =A0 =A0of_driver_match_device > #define dt_dev_get =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_dev_get > #define dt_dev_put =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_dev_put > #define dt_device_add =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_device_add > #define dt_device_register =A0 =A0 =A0 =A0 =A0 =A0 =A0of_device_register > #define dt_device_unregister =A0 =A0 =A0 =A0 =A0 =A0of_device_unregister > #define dt_device_get_modalias =A0 =A0 =A0 =A0 =A0of_device_get_modalias > #define dt_device_uevent =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_device_uevent > #define dt_device_node_put =A0 =A0 =A0 =A0 =A0 =A0 =A0of_device_node_put > > /* include/linux/of_irq.h */ > #define dt_irq =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_irq > #define dt_irq_parse_and_map =A0 =A0 =A0 =A0 =A0 =A0irq_of_parse_and_map > #define dt_irq_workarounds =A0 =A0 =A0 =A0 =A0 =A0 =A0of_irq_workarounds > #define dt_irq_dflt_pic =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_irq_dflt_pic > #define dt_irq_map_oldworld =A0 =A0 =A0 =A0 =A0 =A0 of_irq_map_oldworld > #define dt_irq_map_raw =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_irq_map_raw > #define dt_irq_map_one =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_irq_map_one > #define dt_irq_create_mapping =A0 =A0 =A0 =A0 =A0 irq_create_of_mapping > #define dt_irq_to_resource =A0 =A0 =A0 =A0 =A0 =A0 =A0of_irq_to_resource > #define dt_irq_count =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_irq_count > #define dt_irq_to_resource_table =A0 =A0 =A0 =A0of_irq_to_resource_table > #define DT_IRQ_MAX_SPEC =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 OF_MAX_IRQ_SPEC > #define DT_IRQ_QUIRK_OLDWORLD_MAC =A0 =A0 =A0 OF_IMAP_OLDWORLD_MAC > #define DT_IRQ_QUIRK_NO_PHANDLE =A0 =A0 =A0 =A0 OF_IMAP_NO_PHANDLE > > /* include/linux/of_mdio.h */ > #define dt_mdiobus_register =A0 =A0 =A0 =A0 =A0 =A0 of_mdiobus_register > #define dt_phy_find_device =A0 =A0 =A0 =A0 =A0 =A0 =A0of_phy_find_device > #define dt_phy_connect =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0of_phy_connect > #define dt_phy_connect_fixed_link =A0 =A0 =A0 of_phy_connect_fixed_link > > /* include/linux/of_spi.h */ > #define dt_register_spi_devices =A0 =A0 =A0 =A0 of_register_spi_devices > > /* include/linux/of_gpio.h */ > #define dt_gpio_flags =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_gpio_flags > #define DT_GPIO_ACTIVE_LOW =A0 =A0 =A0 =A0 =A0 =A0 =A0OF_GPIO_ACTIVE_LOW > #define dt_mm_gpio_chip =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_mm_gpio_chip > #define to_dt_mm_gpio_chip =A0 =A0 =A0 =A0 =A0 =A0 =A0to_of_mm_gpio_chip > #define dt_get_gpio_flags =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_get_gpio_flags > #define dt_gpio_count =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_gpio_count > #define dt_mm_gpiochip_add =A0 =A0 =A0 =A0 =A0 =A0 =A0of_mm_gpiochip_add > #define dt_gpiochip_add =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_gpiochip_add > #define dt_gpiochip_remove =A0 =A0 =A0 =A0 =A0 =A0 =A0of_gpiochip_remove > #define dt_node_to_gpiochip =A0 =A0 =A0 =A0 =A0 =A0 of_node_to_gpiochip > #define dt_get_gpio =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 of_get_gpio > > /* include/linux/dt_i2c.h */ > #define dt_i2c_register_devices =A0 =A0 =A0 =A0 of_i2c_register_devices > #define dt_find_i2c_device_by_node =A0 =A0 =A0of_find_i2c_device_by_node > > #endif /* __DT_H */ > > > > > _______________________________________________ > devicetree-discuss mailing list > devicetree-discuss@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/devicetree-discuss > > --=20 Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-25 16:17 ` Grant Likely @ 2010-11-26 3:15 ` Michael Ellerman 2010-11-26 4:42 ` Mitch Bradley 0 siblings, 1 reply; 19+ messages in thread From: Michael Ellerman @ 2010-11-26 3:15 UTC (permalink / raw) To: Grant Likely Cc: linux-arch, linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux, Andrew Morton, Linus Torvalds [-- Attachment #1: Type: text/plain, Size: 4928 bytes --] On Thu, 2010-11-25 at 09:17 -0700, Grant Likely wrote: > On Thu, Nov 25, 2010 at 6:34 AM, Michael Ellerman > <michael@ellerman.id.au> wrote: > > On Thu, 2010-11-25 at 01:03 +1100, Michael Ellerman wrote: > >> Hi all, > >> > >> There were some murmurings on IRC last week about renaming the of_*() > >> routines. > > ... > >> The thinking is that on many platforms that use the of_() routines > >> OpenFirmware is not involved at all, this is true even on many powerpc > >> platforms. Also for folks who don't know the OpenFirmware connection > >> it reads as "of", as in "a can of worms". > > ... > >> So I'm hoping people with either say "YES this is a great idea", or "NO > >> this is stupid". > > > > I'm still hoping, but so far it seems most people have got better things > > to do, and of those that do have an opinion the balance is slightly > > positive. > > I assume you'll be also publishing the script that you use for > generating the massive patch. I expect that there will be a few > iterations of running the rename script to convert over all the > stragglers. Yep sure, I'll just make it less crap first. > It should also be negotiated with Linus about when this > patch should get applied. I do NOT want to cause massive merge pain > during the merge window. Obviously. > Andrew/Linus: Before Michael proceeds too far with this rename, are > you okay with a mass rename of the device tree functions from of_* to > dt_*? Nobody likes the ambiguous 'of_' prefix ("of? of what?"), but > to fix it means large cross-tree patches and potential merge > conflicts. It'd also be good to hear from DaveM, sparc is the platform with the strongest link to real OF AFAIK, so the of_() names make more sense there. > > So here's a first cut of a patch to add the new names. I've not touched > > of_platform because that is supposed to go away. That will lead to some > > odd looking code in the interim, but I think is the right approach. > > I would split it up into separate dt*.h files, one for each of*.h file > so that the #include lines can be changed in the C code at the same > time. Each dt*.h file would include it's of*.h counterpart. Then > after the code is renamed, and a release or two has passed to catch > the majority of users, the old definitions can be moved into the dt*.h > files. Yep that sounds like a plan. I did it as a single header for starters so I could autogenerate the rename script easily. > However, it may be better to move and rename the definitions > immediately, and leave "#define of_* dt_*" macros in the old of*.h > files which can be removed with a simple patch after all the users are > converted. That would have a smaller impact in the cleanup stage. True, though a bigger impact to start with. I did that originally but decided it might be better to start with the minimal patch to add the new names. That way Linus might accept it this release, meaning we'd have the new names in place for code in -next. > > Most of these are straight renames, but some have changed more > > substantially. The routines for the flat tree have all become fdt_foo(). > > I'd be inclined to drop "early_init" from them too, because they're > > basically all about early init, but Grant said he'd prefer not to I > > think. I've also renamed the flat tree tag constants to match libfdt. > > It is all about early init now in Linus' tree, but Stephen > Neuendorffer has patches that use the fdt code at driver probe time > for parsing device tree fragments that describe an FPGA add-in board. OK fair enough. > > I've left for_each_child_of_node(), because I read it as "of", but maybe > > it's "OF"? > > hahaha! I never considered that it might be OF, but now I probably > won't be able to help but read it that way! I like Geert's suggestion > of dt_for_each_child_node OK, I like it the way it is, but if the consensus is to change it then we can. There's a bunch actually: for_each_node_by_name(dn, name) \ for_each_node_by_type(dn, type) \ for_each_compatible_node(dn, type, compatible) \ for_each_matching_node(dn, matches) \ for_each_child_of_node(parent, child) \ for_each_node_with_property(dn, prop_name) \ So either dt_for_each_blah(), or for_each_dt_node_blah() ? > > /* include/linux/device.h */ > > #define dt_match_table of_match_table > > #define dt_node of_node > > This could be very messy. I've nervous about using #define to rename > structure members. You'll need to check that any structure members > that use the same name as a global symbol are handled appropriately. I'm not sure what you mean about global symbols. I think it's fairly safe, in that direction, ie. defining the dt_* names. Neither of those strings appears anywhere in the tree at the moment (as a token). cheers [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-26 3:15 ` Michael Ellerman @ 2010-11-26 4:42 ` Mitch Bradley 2010-11-26 5:50 ` Michael Ellerman 0 siblings, 1 reply; 19+ messages in thread From: Mitch Bradley @ 2010-11-26 4:42 UTC (permalink / raw) To: michael Cc: linux-arch, linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux, Andrew Morton, Linus Torvalds On 11/25/2010 5:15 PM, Michael Ellerman wrote: > On Thu, 2010-11-25 at 09:17 -0700, Grant Likely wrote: >> On Thu, Nov 25, 2010 at 6:34 AM, Michael Ellerman >> <michael@ellerman.id.au> wrote: >>> On Thu, 2010-11-25 at 01:03 +1100, Michael Ellerman wrote: >>>> Hi all, >>>> >>>> There were some murmurings on IRC last week about renaming the of_*() >>>> routines. >>> ... >>>> The thinking is that on many platforms that use the of_() routines >>>> OpenFirmware is not involved at all, this is true even on many powerpc >>>> platforms. Also for folks who don't know the OpenFirmware connection >>>> it reads as "of", as in "a can of worms". >>> ... >>>> So I'm hoping people with either say "YES this is a great idea", or "NO >>>> this is stupid". >>> >>> I'm still hoping, but so far it seems most people have got better things >>> to do, and of those that do have an opinion the balance is slightly >>> positive. >> >> I assume you'll be also publishing the script that you use for >> generating the massive patch. I expect that there will be a few >> iterations of running the rename script to convert over all the >> stragglers. > > Yep sure, I'll just make it less crap first. > >> It should also be negotiated with Linus about when this >> patch should get applied. I do NOT want to cause massive merge pain >> during the merge window. > > Obviously. > >> Andrew/Linus: Before Michael proceeds too far with this rename, are >> you okay with a mass rename of the device tree functions from of_* to >> dt_*? Nobody likes the ambiguous 'of_' prefix ("of? of what?"), but >> to fix it means large cross-tree patches and potential merge >> conflicts. > > It'd also be good to hear from DaveM, sparc is the platform with the > strongest link to real OF AFAIK, so the of_() names make more sense > there. One Laptop Per Child ships real Open Firmware on its x86 Linux systems, of which approximately 2 million have been shipped or ordered. An ARM version, also with OFW, is in the works. From the standpoint of "number of units in the field actually running Linux", I expect that compares favorably with SPARC. That said, I don't particularly like the abbreviation "of" either; I abbreviate Open Firmware as "OFW". I don't mind using "dt_" to apply to device tree things; I think it's clearer than "of_". Ideally, it would be nice to acknowledge the historical connection in some way, but confusing nomenclature probably is not the way to go about it. > >>> So here's a first cut of a patch to add the new names. I've not touched >>> of_platform because that is supposed to go away. That will lead to some >>> odd looking code in the interim, but I think is the right approach. >> >> I would split it up into separate dt*.h files, one for each of*.h file >> so that the #include lines can be changed in the C code at the same >> time. Each dt*.h file would include it's of*.h counterpart. Then >> after the code is renamed, and a release or two has passed to catch >> the majority of users, the old definitions can be moved into the dt*.h >> files. > > Yep that sounds like a plan. I did it as a single header for starters so > I could autogenerate the rename script easily. > >> However, it may be better to move and rename the definitions >> immediately, and leave "#define of_* dt_*" macros in the old of*.h >> files which can be removed with a simple patch after all the users are >> converted. That would have a smaller impact in the cleanup stage. > > True, though a bigger impact to start with. I did that originally but > decided it might be better to start with the minimal patch to add the > new names. That way Linus might accept it this release, meaning we'd > have the new names in place for code in -next. > >>> Most of these are straight renames, but some have changed more >>> substantially. The routines for the flat tree have all become fdt_foo(). >>> I'd be inclined to drop "early_init" from them too, because they're >>> basically all about early init, but Grant said he'd prefer not to I >>> think. I've also renamed the flat tree tag constants to match libfdt. >> >> It is all about early init now in Linus' tree, but Stephen >> Neuendorffer has patches that use the fdt code at driver probe time >> for parsing device tree fragments that describe an FPGA add-in board. > > OK fair enough. > >>> I've left for_each_child_of_node(), because I read it as "of", but maybe >>> it's "OF"? >> >> hahaha! I never considered that it might be OF, but now I probably >> won't be able to help but read it that way! I like Geert's suggestion >> of dt_for_each_child_node > > OK, I like it the way it is, but if the consensus is to change it then > we can. There's a bunch actually: > > for_each_node_by_name(dn, name) \ > for_each_node_by_type(dn, type) \ > for_each_compatible_node(dn, type, compatible) \ > for_each_matching_node(dn, matches) \ > for_each_child_of_node(parent, child) \ > for_each_node_with_property(dn, prop_name) \ > > So either dt_for_each_blah(), or for_each_dt_node_blah() ? > >>> /* include/linux/device.h */ >>> #define dt_match_table of_match_table >>> #define dt_node of_node >> >> This could be very messy. I've nervous about using #define to rename >> structure members. You'll need to check that any structure members >> that use the same name as a global symbol are handled appropriately. > > I'm not sure what you mean about global symbols. > > I think it's fairly safe, in that direction, ie. defining the dt_* > names. Neither of those strings appears anywhere in the tree at the > moment (as a token). > > cheers > > > > > _______________________________________________ > devicetree-discuss mailing list > devicetree-discuss@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/devicetree-discuss ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-26 4:42 ` Mitch Bradley @ 2010-11-26 5:50 ` Michael Ellerman 2010-11-26 7:15 ` Grant Likely 2010-11-26 7:36 ` Mitch Bradley 0 siblings, 2 replies; 19+ messages in thread From: Michael Ellerman @ 2010-11-26 5:50 UTC (permalink / raw) To: Mitch Bradley Cc: linux-arch, linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux, Andrew Morton, Linus Torvalds [-- Attachment #1: Type: text/plain, Size: 2900 bytes --] On Thu, 2010-11-25 at 18:42 -1000, Mitch Bradley wrote: > On 11/25/2010 5:15 PM, Michael Ellerman wrote: > > On Thu, 2010-11-25 at 09:17 -0700, Grant Likely wrote: > >> On Thu, Nov 25, 2010 at 6:34 AM, Michael Ellerman > >> <michael@ellerman.id.au> wrote: > >>> On Thu, 2010-11-25 at 01:03 +1100, Michael Ellerman wrote: > >>>> Hi all, > >>>> > >>>> There were some murmurings on IRC last week about renaming the of_*() > >>>> routines. > >>> ... > >>>> The thinking is that on many platforms that use the of_() routines > >>>> OpenFirmware is not involved at all, this is true even on many powerpc > >>>> platforms. Also for folks who don't know the OpenFirmware connection > >>>> it reads as "of", as in "a can of worms". > >>> ... > >>>> So I'm hoping people with either say "YES this is a great idea", or "NO > >>>> this is stupid". > >>> > >>> I'm still hoping, but so far it seems most people have got better things > >>> to do, and of those that do have an opinion the balance is slightly > >>> positive. > >> > >> I assume you'll be also publishing the script that you use for > >> generating the massive patch. I expect that there will be a few > >> iterations of running the rename script to convert over all the > >> stragglers. > > > > Yep sure, I'll just make it less crap first. > > > >> It should also be negotiated with Linus about when this > >> patch should get applied. I do NOT want to cause massive merge pain > >> during the merge window. > > > > Obviously. > > > >> Andrew/Linus: Before Michael proceeds too far with this rename, are > >> you okay with a mass rename of the device tree functions from of_* to > >> dt_*? Nobody likes the ambiguous 'of_' prefix ("of? of what?"), but > >> to fix it means large cross-tree patches and potential merge > >> conflicts. > > > > It'd also be good to hear from DaveM, sparc is the platform with the > > strongest link to real OF AFAIK, so the of_() names make more sense > > there. > > > One Laptop Per Child ships real Open Firmware on its x86 Linux systems, > of which approximately 2 million have been shipped or ordered. An ARM > version, also with OFW, is in the works. OK. I don't see any code under arch/x86 or arch/arm that uses of_() routines though? Or is it under drivers or something? > That said, I don't particularly like the abbreviation "of" either; I > abbreviate Open Firmware as "OFW". > > I don't mind using "dt_" to apply to device tree things; I think it's > clearer than "of_". Ideally, it would be nice to acknowledge the > historical connection in some way, but confusing nomenclature probably > is not the way to go about it. Cool. I think there will still be a few things that have OF in the name, at least for a while, and I'm sure the doco will still mention OF, so I don't think the connection will be lost. cheers [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-26 5:50 ` Michael Ellerman @ 2010-11-26 7:15 ` Grant Likely 2010-11-26 7:36 ` Mitch Bradley 1 sibling, 0 replies; 19+ messages in thread From: Grant Likely @ 2010-11-26 7:15 UTC (permalink / raw) To: michael Cc: linux-arch, linux-mips, sparclinux, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, Mitch Bradley, Andrew Morton, Linus Torvalds On Thu, Nov 25, 2010 at 10:50 PM, Michael Ellerman <michael@ellerman.id.au> wrote: > On Thu, 2010-11-25 at 18:42 -1000, Mitch Bradley wrote: >> On 11/25/2010 5:15 PM, Michael Ellerman wrote: >> > On Thu, 2010-11-25 at 09:17 -0700, Grant Likely wrote: >> >> On Thu, Nov 25, 2010 at 6:34 AM, Michael Ellerman >> >> <michael@ellerman.id.au> =A0wrote: >> >>> On Thu, 2010-11-25 at 01:03 +1100, Michael Ellerman wrote: >> >>>> Hi all, >> >>>> >> >>>> There were some murmurings on IRC last week about renaming the of_*= () >> >>>> routines. >> >>> ... >> >>>> The thinking is that on many platforms that use the of_() routines >> >>>> OpenFirmware is not involved at all, this is true even on many powe= rpc >> >>>> platforms. Also for folks who don't know the OpenFirmware connectio= n >> >>>> it reads as "of", as in "a can of worms". >> >>> ... >> >>>> So I'm hoping people with either say "YES this is a great idea", or= "NO >> >>>> this is stupid". >> >>> >> >>> I'm still hoping, but so far it seems most people have got better th= ings >> >>> to do, and of those that do have an opinion the balance is slightly >> >>> positive. >> >> >> >> I assume you'll be also publishing the script that you use for >> >> generating the massive patch. =A0I expect that there will be a few >> >> iterations of running the rename script to convert over all the >> >> stragglers. >> > >> > Yep sure, I'll just make it less crap first. >> > >> >> It should also be negotiated with Linus about when this >> >> patch should get applied. =A0I do NOT want to cause massive merge pai= n >> >> during the merge window. >> > >> > Obviously. >> > >> >> Andrew/Linus: Before Michael proceeds too far with this rename, are >> >> you okay with a mass rename of the device tree functions from of_* to >> >> dt_*? =A0Nobody likes the ambiguous 'of_' prefix ("of? =A0of what?"),= but >> >> to fix it means large cross-tree patches and potential merge >> >> conflicts. >> > >> > It'd also be good to hear from DaveM, sparc is the platform with the >> > strongest link to real OF AFAIK, so the of_() names make more sense >> > there. >> >> >> One Laptop Per Child ships real Open Firmware on its x86 Linux systems, >> of which approximately 2 million have been shipped or ordered. =A0An ARM >> version, also with OFW, is in the works. > > OK. I don't see any code under arch/x86 or arch/arm that uses of_() > routines though? Or is it under drivers or something? > >> That said, I don't particularly like the abbreviation "of" either; I >> abbreviate Open Firmware as "OFW". >> >> I don't mind using "dt_" to apply to device tree things; I think it's >> clearer than "of_". =A0 Ideally, it would be nice to acknowledge the >> historical connection in some way, but confusing nomenclature probably >> is not the way to go about it. Yes, I like the ofw_ prefix too, and briefly considered renaming to that, but decide that dt_ was better due to the number of systems using the device tree without real openfirmware. However, the ofw_ prefix would make sense if any of the promtree code is renamed. > Cool. I think there will still be a few things that have OF in the name, > at least for a while, and I'm sure the doco will still mention OF, so I > don't think the connection will be lost. Considering that pretty much all the documentation makes some reference back to the openfirmware origins, I'm pretty sure the ofw legacy is safe. :-) g. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-26 5:50 ` Michael Ellerman 2010-11-26 7:15 ` Grant Likely @ 2010-11-26 7:36 ` Mitch Bradley 1 sibling, 0 replies; 19+ messages in thread From: Mitch Bradley @ 2010-11-26 7:36 UTC (permalink / raw) To: michael Cc: linux-arch, linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux, Andrew Morton, Andrea Scian, Linus Torvalds >> One Laptop Per Child ships real Open Firmware on its x86 Linux systems, >> of which approximately 2 million have been shipped or ordered. An ARM >> version, also with OFW, is in the works. > > OK. I don't see any code under arch/x86 or arch/arm that uses of_() > routines though? Or is it under drivers or something? > Andres Salomon has been working for some time to get some Open Firmware support for x86 upstream. As you can probably imagine, it has been slow going, but seems to be getting close. The OLPC ARM work is just beginning, so nothing has been submitted yet. The first hardware prototypes are still being debugged. Lennert Buytenhek is the key OS person who will be involved. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-25 13:34 ` Michael Ellerman 2010-11-25 14:01 ` Geert Uytterhoeven 2010-11-25 16:17 ` Grant Likely @ 2010-11-29 5:55 ` David Gibson 2010-11-29 6:07 ` Grant Likely 2 siblings, 1 reply; 19+ messages in thread From: David Gibson @ 2010-11-29 5:55 UTC (permalink / raw) To: Michael Ellerman Cc: linux-arch, linux-mips, microblaze-uclinux, devicetree-discuss, LKML, linuxppc-dev list, sparclinux [-- Attachment #1: Type: text/plain, Size: 1532 bytes --] On Fri, Nov 26, 2010 at 12:34:35AM +1100, Michael Ellerman wrote: > On Thu, 2010-11-25 at 01:03 +1100, Michael Ellerman wrote: > > Hi all, > > > > There were some murmurings on IRC last week about renaming the of_*() > > routines. > ... > > The thinking is that on many platforms that use the of_() routines > > OpenFirmware is not involved at all, this is true even on many powerpc > > platforms. Also for folks who don't know the OpenFirmware connection > > it reads as "of", as in "a can of worms". > ... > > So I'm hoping people with either say "YES this is a great idea", or "NO > > this is stupid". > > I'm still hoping, but so far it seems most people have got better things > to do, and of those that do have an opinion the balance is slightly > positive. > > So here's a first cut of a patch to add the new names. I've not touched > of_platform because that is supposed to go away. That will lead to some > odd looking code in the interim, but I think is the right approach. > > Most of these are straight renames, but some have changed more > substantially. The routines for the flat tree have all become fdt_foo(). I'm a little uneasy about using the same prefix as libfdt (fdt_foo()) for routines that have a different implementation and different names / semantics to the libfdt routines. -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: RFC: Mega rename of device tree routines from of_*() to dt_*() 2010-11-29 5:55 ` David Gibson @ 2010-11-29 6:07 ` Grant Likely 0 siblings, 0 replies; 19+ messages in thread From: Grant Likely @ 2010-11-29 6:07 UTC (permalink / raw) To: Michael Ellerman, LKML, linux-arch, linux-mips, microblaze-uclinux, devicetree-discuss, linuxppc-dev list, sparclinux On Sun, Nov 28, 2010 at 10:55 PM, David Gibson <david@gibson.dropbear.id.au> wrote: > On Fri, Nov 26, 2010 at 12:34:35AM +1100, Michael Ellerman wrote: >> Most of these are straight renames, but some have changed more >> substantially. The routines for the flat tree have all become fdt_foo(). > > I'm a little uneasy about using the same prefix as libfdt (fdt_foo()) > for routines that have a different implementation and different names > / semantics to the libfdt routines. I'd also be okay with either dtflat_ or flatdt_ for the prefix on these routines. g. ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2010-11-29 6:07 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-11-24 14:03 RFC: Mega rename of device tree routines from of_*() to dt_*() Michael Ellerman 2010-11-24 15:44 ` Timur Tabi 2010-11-24 17:00 ` David Daney 2010-11-24 17:02 ` Stephen Neuendorffer 2010-11-24 17:18 ` David Daney 2010-11-24 18:02 ` Grant Likely 2010-11-24 18:32 ` Stephen Neuendorffer 2010-11-24 18:18 ` RFC: " David VomLehn 2010-11-25 13:34 ` Michael Ellerman 2010-11-25 14:01 ` Geert Uytterhoeven 2010-11-25 20:52 ` Benjamin Herrenschmidt 2010-11-25 16:17 ` Grant Likely 2010-11-26 3:15 ` Michael Ellerman 2010-11-26 4:42 ` Mitch Bradley 2010-11-26 5:50 ` Michael Ellerman 2010-11-26 7:15 ` Grant Likely 2010-11-26 7:36 ` Mitch Bradley 2010-11-29 5:55 ` David Gibson 2010-11-29 6:07 ` Grant Likely
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).