Skip to content

of: prom.h clean-up and removal

Rob Herring linux-arch linux-can linux-devicetree linux-hexagon linux-mips linuxppc-dev lkml netdev sparclinux 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest21 patches 14 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/21drivers: remove unnecessary prom.h includesdrivers/net/can/grcan.c drivers/net/can/sja1000/sja1000_of_platform.c+0 -43 replies
2/21of: remove unnecessary prom.h includesdrivers/of/of_pci_irq.c drivers/of/pdt.c+0 -20 replies
3/21ARM: keystone: remove unnecessary prom.h includearch/arm/mach-keystone/platsmp.c+0 -10 replies
4/21arm64: remove unnecessary prom.h includearch/arm64/mm/init.c+0 -11 reply
5/21openrisc: remove unnecessary prom.h includearch/openrisc/kernel/prom.c+0 -10 replies
6/21arc: remove unnecessary prom.h includesarch/arc/kernel/devtree.c arch/arc/kernel/setup.c+0 -21 reply
7/21hexagon: remove unnecessary prom.h includesarch/hexagon/kernel/setup.c+0 -31 reply
8/21metag: move setup_machine_fdt declaration from prom.harch/metag/include/asm/prom.h arch/metag/include/asm/setup.h arch/metag/kernel/setup.c+1 -30 replies
9/21microblaze: clean-up prom.h implicit includesarch/microblaze/include/asm/prom.h arch/microblaze/kernel/prom.c arch/microblaze/kernel/setup.c +3 more+6 -270 replies
10/21drivers: clean-up prom.h implicit includesdrivers/ata/sata_fsl.c drivers/char/bsr.c drivers/char/hw_random/pasemi-rng.c +28 more+49 -10 replies
11/21mips: add explicit includes of prom.harch/mips/lantiq/prom.c arch/mips/mti-sead3/sead3-setup.c arch/mips/ralink/of.c+4 -00 replies
12/21x86: add necessary includes for prom.harch/x86/kernel/devicetree.c+1 -00 replies
13/21of: implement pci_address_to_pio as weak functionarch/microblaze/include/asm/prom.h arch/mips/include/asm/prom.h arch/powerpc/include/asm/prom.h +5 more+9 -430 replies
14/21of: implement of_node_to_nid as a weak functionarch/powerpc/include/asm/prom.h arch/sparc/include/asm/prom.h drivers/of/base.c +1 more+11 -181 reply
15/21of: remove HAVE_ARCH_DEVTREE_FIXUPSarch/arc/include/asm/prom.h arch/arm/include/asm/prom.h arch/metag/include/asm/prom.h +6 more+0 -181 reply
16/21of: move of_address_to_resource and of_iomap declarations from sparcarch/sparc/include/asm/prom.h include/linux/of_address.h+17 -210 replies
17/21of: move of_translate_dma_address to of_address.harch/powerpc/include/asm/prom.h include/linux/of_address.h+4 -40 replies
18/21powerpc: clean-up include ordering in prom.harch/powerpc/include/asm/prom.h+7 -100 replies
19/21powerpc: add explicit OF includesarch/powerpc/kernel/epapr_paravirt.c arch/powerpc/platforms/512x/clock.c arch/powerpc/platforms/512x/pdm360ng.c +17 more+31 -40 replies
20/21of: only include prom.h on sparcinclude/linux/of.h+2 -00 replies
21/21of: remove empty arch prom.h headersarch/arc/include/asm/prom.h arch/arm64/include/asm/prom.h arch/c6x/include/asm/prom.h +3 more+0 -582 replies

Reviews trailers per patch

6 of 21 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchVineet GuptaCatalin MarinasRichard KuoGrant Likely
SeriesA-b
1/21
2/21
3/21
4/21A-b
5/21
6/21A-b
7/21A-b
8/21
9/21
10/21
11/21
12/21
13/21
14/21A-b
15/21A-b
16/21
17/21
18/21
19/21
20/21
21/21A-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v1 thread

Cover letter [PATCH 00/21] of: prom.h clean-up and removal

From: Rob Herring <[email protected]>

This is the second series of clean-up for architecture DT code. The first series is here [1].

As the number of DT enabled architectures has grown, there has been a lot of copy/paste duplication of prom.h. The include ordering for prom.h is complex and has resulted in many implicit includes. This series cleans up prom.h and removes the dependency of prom.h includes in the core DT code on all architectures except sparc. This removes prom.h on several architectures and makes it an architecture specific include on the rest.

Compiled on arm, arm64, microblaze, mips, openrisc, powerpc, sparc, xtensa. Mostly defconfigs and some allyesconfigs. The 0-day builder has also caught some issues.

A branch with both series is available here:
git://sources.calxeda.com/kernel/linux.git dt-cleanup

Rob

[1] http://www.spinics.net/lists/devicetree/msg04865.html

Rob Herring (21):
drivers: remove unnecessary prom.h includes
of: remove unnecessary prom.h includes
ARM: keystone: remove unnecessary prom.h include
arm64: remove unnecessary prom.h include
openrisc: remove unnecessary prom.h include
arc: remove unnecessary prom.h includes
hexagon: remove unnecessary prom.h includes
metag: move setup_machine_fdt declaration from prom.h
microblaze: clean-up prom.h implicit includes
drivers: clean-up prom.h implicit includes
mips: add explicit includes of prom.h
x86: add necessary includes for prom.h
of: implement pci_address_to_pio as weak function
of: implement of_node_to_nid as a weak function
of: remove HAVE_ARCH_DEVTREE_FIXUPS
of: move of_address_to_resource and of_iomap declarations from sparc
of: move of_translate_dma_address to of_address.h
powerpc: clean-up include ordering in prom.h
powerpc: add explicit OF includes
of: only include prom.h on sparc
of: remove empty arch prom.h headers

 arch/arc/include/asm/prom.h                      | 14 ---------
 arch/arc/kernel/devtree.c                        |  1 -
 arch/arc/kernel/setup.c                          |  1 -
 arch/arm/include/asm/prom.h                      |  2 --
 arch/arm/mach-keystone/platsmp.c                 |  1 -
 arch/arm64/include/asm/prom.h                    |  1 -
 arch/arm64/mm/init.c                             |  1 -
 arch/c6x/include/asm/prom.h                      |  1 -
 arch/hexagon/kernel/setup.c                      |  3 --
 arch/metag/include/asm/prom.h                    | 23 --------------
 arch/metag/include/asm/setup.h                   |  1 +
 arch/metag/kernel/setup.c                        |  1 -
 arch/microblaze/include/asm/prom.h               | 39 +-----------------------
 arch/microblaze/kernel/prom.c                    |  1 +
 arch/microblaze/kernel/setup.c                   |  1 +
 arch/microblaze/kernel/timer.c                   |  1 +
 arch/microblaze/pci/pci-common.c                 |  1 +
 arch/mips/include/asm/prom.h                     | 11 -------
 arch/mips/lantiq/prom.c                          |  1 +
 arch/mips/mti-sead3/sead3-setup.c                |  2 ++
 arch/mips/ralink/of.c                            |  1 +
 arch/openrisc/include/asm/prom.h                 | 22 -------------
 arch/openrisc/kernel/prom.c                      |  1 -
 arch/powerpc/include/asm/prom.h                  | 33 ++++----------------
 arch/powerpc/kernel/epapr_paravirt.c             |  1 +
 arch/powerpc/platforms/512x/clock.c              |  1 +
 arch/powerpc/platforms/512x/pdm360ng.c           |  2 ++
 arch/powerpc/platforms/82xx/mpc8272_ads.c        |  2 ++
 arch/powerpc/platforms/82xx/pq2fads.c            |  2 ++
 arch/powerpc/platforms/83xx/suspend.c            |  2 ++
 arch/powerpc/platforms/86xx/pic.c                |  1 +
 arch/powerpc/platforms/embedded6xx/flipper-pic.c |  1 +
 arch/powerpc/platforms/embedded6xx/hlwd-pic.c    |  2 ++
 arch/powerpc/platforms/pasemi/gpio_mdio.c        |  1 +
 arch/powerpc/platforms/powermac/pfunc_base.c     |  1 +
 arch/powerpc/platforms/powernv/opal-lpc.c        |  1 +
 arch/powerpc/platforms/powernv/opal.c            |  1 +
 arch/powerpc/platforms/powernv/setup.c           |  1 +
 arch/powerpc/platforms/pseries/hotplug-memory.c  |  2 ++
 arch/powerpc/sysdev/cpm_common.c                 |  1 +
 arch/powerpc/sysdev/fsl_gtm.c                    |  2 ++
 arch/powerpc/sysdev/fsl_pmc.c                    |  1 +
 arch/powerpc/sysdev/mpic.c                       |  8 ++---
 arch/powerpc/sysdev/mpic_timer.c                 |  2 ++
 arch/sparc/include/asm/prom.h                    | 12 --------
 arch/x86/include/asm/prom.h                      |  5 ---
 arch/x86/kernel/devicetree.c                     | 11 +------
 arch/xtensa/include/asm/prom.h                   |  6 ----
 drivers/ata/sata_fsl.c                           |  2 ++
 drivers/char/bsr.c                               |  1 +
 drivers/char/hw_random/pasemi-rng.c              |  1 +
 drivers/cpufreq/pasemi-cpufreq.c                 |  1 +
 drivers/crypto/caam/ctrl.c                       |  3 ++
 drivers/crypto/caam/jr.c                         |  2 ++
 drivers/dma/fsldma.c                             |  2 ++
 drivers/edac/cell_edac.c                         |  1 +
 drivers/i2c/busses/i2c-mpc.c                     |  2 ++
 drivers/i2c/busses/i2c-powermac.c                |  1 +
 drivers/input/serio/xilinx_ps2.c                 |  1 +
 drivers/macintosh/macio_asic.c                   |  2 ++
 drivers/macintosh/rack-meter.c                   |  2 ++
 drivers/macintosh/smu.c                          |  1 +
 drivers/macintosh/via-pmu.c                      |  2 ++
 drivers/mtd/nand/fsl_elbc_nand.c                 |  1 +
 drivers/mtd/nand/pasemi_nand.c                   |  2 ++
 drivers/net/can/grcan.c                          |  3 --
 drivers/net/can/sja1000/sja1000_of_platform.c    |  1 -
 drivers/net/ethernet/ibm/emac/core.c             |  2 ++
 drivers/net/ethernet/ibm/emac/mal.c              |  1 +
 drivers/net/ethernet/ibm/emac/rgmii.c            |  1 +
 drivers/net/ethernet/ibm/emac/tah.c              |  1 +
 drivers/net/ethernet/ibm/emac/zmii.c             |  1 +
 drivers/net/ethernet/xilinx/ll_temac_main.c      |  1 +
 drivers/of/address.c                             |  8 +++++
 drivers/of/base.c                                |  7 +++++
 drivers/of/of_pci.c                              |  1 -
 drivers/of/of_pci_irq.c                          |  1 -
 drivers/of/pdt.c                                 |  1 -
 drivers/pcmcia/electra_cf.c                      |  2 ++
 drivers/tty/ehv_bytechan.c                       |  1 +
 drivers/tty/serial/pmac_zilog.c                  |  2 ++
 drivers/usb/host/ehci-ppc-of.c                   |  2 ++
 drivers/usb/host/ohci-ppc-of.c                   |  2 ++
 fs/proc/proc_devtree.c                           |  3 --
 include/linux/of.h                               | 13 ++++----
 include/linux/of_address.h                       | 39 +++++++++++++-----------
 sound/aoa/core/gpio-feature.c                    |  3 +-
 sound/aoa/soundbus/i2sbus/core.c                 |  2 ++
 sound/ppc/pmac.c                                 |  2 ++
 sound/ppc/tumbler.c                              |  1 +
 90 files changed, 141 insertions(+), 220 deletions(-)
 delete mode 100644 arch/arc/include/asm/prom.h
 delete mode 100644 arch/arm64/include/asm/prom.h
 delete mode 100644 arch/c6x/include/asm/prom.h
 delete mode 100644 arch/metag/include/asm/prom.h
 delete mode 100644 arch/openrisc/include/asm/prom.h
 delete mode 100644 arch/xtensa/include/asm/prom.h
Signature · 1 line
1.8.1.2