Use <linux/of_{platform, device}.h> and not <asm/...> variants.

From: Jon Loeliger <[email protected]>

---

Paul,

Continue to fight the Good Fight by removing
old include file references that managed to
creep in recently.

These are the last few in arch/powerpc directly.
If you could pick this up for .25, that be good!

jdl

 arch/powerpc/kernel/of_device.c      |    2 +-
 arch/powerpc/platforms/44x/rainier.c |    3 ++-
 arch/powerpc/platforms/maple/setup.c |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

index 3388ad6..5748ddb 100644
@@ -5,10 +5,10 @@
 #include <linux/module.h>
 #include <linux/mod_devicetable.h>
 #include <linux/slab.h>
+#include <linux/of_device.h>
 
 #include <asm/errno.h>
 #include <asm/dcr.h>
-#include <asm/of_device.h>
 
 static void of_device_make_bus_id(struct of_device *dev)
 {

index a4ce5ba..a7fae1c 100644
@@ -14,12 +14,13 @@
  * option) any later version.
  */
 #include <linux/init.h>
+#include <linux/of_platform.h>
+
 #include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
 #include <asm/time.h>
 #include <asm/uic.h>
-#include <asm/of_platform.h>
 #include <asm/pci-bridge.h>
 #include "44x.h"
 

index 144177d..3ce2d73 100644
@@ -42,6 +42,7 @@
 #include <linux/serial.h>
 #include <linux/smp.h>
 #include <linux/bitops.h>
+#include <linux/of_device.h>
 
 #include <asm/processor.h>
 #include <asm/sections.h>

@@ -56,7 +57,6 @@
 #include <asm/dma.h>
 #include <asm/cputable.h>
 #include <asm/time.h>
-#include <asm/of_device.h>
 #include <asm/lmb.h>
 #include <asm/mpic.h>
 #include <asm/rtas.h>

1.5.4.rc0

Hi Jon,

Thanks for doing this.

Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/

So, like, the other day Stephen Rothwell mumbled:

By $DIETY, I'll obtain Janitorial Karma one way or another!

The question now is, what next? I'm thinking about picking on arch/sparc/, then drivers/ and sound/, and finally pick off /include.

To be honest, I'm not sure what the final /include structure is supposed to look like or do as both pairs of these files mutually include their counterpart. (i/l/of_d.h includes i/a/of_d.h which includes i/l/of_d.h) (i/l/of_p.h includes i/a/of_p.h which includes i/l/of_p.h)

But, of course, the various asm/of_{platform,device}.h files are different for each arch/, so I wasn't sure if the longer term plan had folding the arch variants straight into the include/linux/ version of the file or not. Seems there will come a point when the sparc and powerpc variants will need to be more unified...

arch/sparc/kernel/ioport.c:#include <asm/of_device.h> arch/sparc/kernel/time.c:#include <asm/of_device.h> arch/sparc64/kernel/auxio.c:#include <asm/of_device.h> arch/sparc64/kernel/ebus.c:#include <asm/of_device.h> arch/sparc64/kernel/isa.c:#include <asm/of_device.h> arch/sparc64/kernel/pci_common.c:#include <asm/of_device.h> arch/sparc64/kernel/pci_psycho.c:#include <asm/of_device.h> arch/sparc64/kernel/pci_sabre.c:#include <asm/of_device.h> arch/sparc64/kernel/pci_schizo.c:#include <asm/of_device.h> arch/sparc64/kernel/power.c:#include <asm/of_device.h> arch/sparc64/kernel/prom.c:#include <asm/of_device.h> arch/sparc64/kernel/time.c:#include <asm/of_device.h>

drivers/char/ipmi/ipmi_si_intf.c:#include <asm/of_device.h> drivers/hwmon/ams/ams.h:#include <asm/of_device.h> drivers/input/serio/i8042-sparcio.h:#include <asm/of_device.h> drivers/macintosh/smu.c:#include <asm/of_device.h> drivers/macintosh/therm_pm72.c:#include <asm/of_device.h> drivers/net/fs_enet/mac-fcc.c:#include <asm/of_device.h> drivers/net/fs_enet/mac-fec.c:#include <asm/of_device.h> drivers/pcmcia/m8xx_pcmcia.c:#include <asm/of_device.h> drivers/sbus/sbus.c:#include <asm/of_device.h> drivers/serial/sunhv.c:#include <asm/of_device.h> drivers/serial/sunsab.c:#include <asm/of_device.h> drivers/serial/sunsu.c:#include <asm/of_device.h> drivers/serial/sunzilog.c:#include <asm/of_device.h> drivers/video/bw2.c:#include <asm/of_device.h> drivers/video/cg14.c:#include <asm/of_device.h> drivers/video/cg3.c:#include <asm/of_device.h> drivers/video/cg6.c:#include <asm/of_device.h> drivers/video/ffb.c:#include <asm/of_device.h> drivers/video/leo.c:#include <asm/of_device.h> drivers/video/p9100.c:#include <asm/of_device.h> drivers/video/platinumfb.c:#include <asm/of_device.h> drivers/video/sunxvr2500.c:#include <asm/of_device.h> drivers/video/sunxvr500.c:#include <asm/of_device.h> drivers/video/tcx.c:#include <asm/of_device.h>

drivers/ata/pata_mpc52xx.c:#include <asm/of_platform.h> drivers/char/hw_random/pasemi-rng.c:#include <asm/of_platform.h> drivers/char/ipmi/ipmi_si_intf.c:#include <asm/of_platform.h> drivers/hwmon/ams/ams-core.c:#include <asm/of_platform.h> drivers/macintosh/smu.c:#include <asm/of_platform.h> drivers/macintosh/therm_adt746x.c:#include <asm/of_platform.h> drivers/macintosh/therm_pm72.c:#include <asm/of_platform.h> drivers/macintosh/therm_windtunnel.c:#include <asm/of_platform.h> drivers/net/fs_enet/fs_enet-main.c:#include <asm/of_platform.h> drivers/net/fs_enet/mac-scc.c:#include <asm/of_platform.h> drivers/net/fs_enet/mii-fec.c:#include <asm/of_platform.h> drivers/net/ibm_newemac/core.h:#include <asm/of_platform.h> drivers/net/ucc_geth.c:#include <asm/of_platform.h> drivers/net/ucc_geth_mii.c:#include <asm/of_platform.h> drivers/pcmcia/electra_cf.c:#include <asm/of_platform.h> drivers/pcmcia/m8xx_pcmcia.c:#include <asm/of_platform.h> drivers/serial/mpc52xx_uart.c:#include <asm/of_platform.h> drivers/serial/of_serial.c:#include <asm/of_platform.h> drivers/spi/mpc52xx_psc_spi.c:#include <asm/of_platform.h> drivers/usb/host/ohci-ppc-of.c:#include <asm/of_platform.h> drivers/video/platinumfb.c:#include <asm/of_platform.h> drivers/watchdog/mpc5200_wdt.c:#include <asm/of_platform.h>

sound/aoa/soundbus/soundbus.h:#include <asm/of_device.h>

include/asm-powerpc/macio.h:#include <asm/of_device.h> include/asm-powerpc/pmi.h:#include <asm/of_device.h> include/asm-sparc/ebus.h:#include <asm/of_device.h> include/asm-sparc/sbus.h:#include <asm/of_device.h> include/asm-sparc64/ebus.h:#include <asm/of_device.h> include/asm-sparc64/isa.h:#include <asm/of_device.h> include/asm-sparc64/parport.h:#include <asm/of_device.h> include/asm-sparc64/sbus.h:#include <asm/of_device.h>

include/linux/of_device.h:#include <asm/of_device.h>

include/linux/of_platform.h:#include <asm/of_platform.h>

:-)

arch/sparc{,64} should be easy if you have a cross compiler (though it should work, Dave gets cranky if you break his tree :-)) Dave should just take the patches if you do test compile them. Tell him I sent you :-)

The intention is that everyone only includes linux/of*.h (except for linux/of*.h of course) at which point we should be able to remove the includes of linux/of*.h from asm*/of*.h.

Some more unification should be possible over time, but that is much harder.

Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/

linuxppc-dev-bounces+stephen.neuendorffer=3Dxilinx.com@ozlabs.org [mailto:linuxppc-dev-

Stephen Rothwell

<asm/...>variants.

One of the unified bits I'd really like to see for the microblaze is the interrupt handling stuff, i.e. irq_of_parse_and_map().

Steve