sparc/of: Move of_device fields into struct pdev_archdata

This patch moves SPARC architecture specific data members out of
struct of_device and into the pdev_archdata structure.  The reason
for this change is to unify the struct of_device definition amongst
all the architectures.  It also remvoes the .sysdata, .slot, .portid
and .clock_freq properties because they aren't actually used by
anything.

A subsequent patch will replace struct of_device entirely with struct
platform_device and the of_platform support code will share common
routines with the platform bus (but the bus instances themselves can
remain separate).

This patch also adds 'struct resources *resource' and num_resources
to match the fields defined in struct platform_device.  After this
change, 'struct platform_device' can be used as a drop-in replacement
for 'struct of_platform'.

This change is in preparation for merging the of_platform_bus_type
with the platform_bus_type.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/sparc/kernel/pci_psycho.c b/arch/sparc/kernel/pci_psycho.c
index 558a70512824..93011e6e7ddc 100644
--- a/arch/sparc/kernel/pci_psycho.c
+++ b/arch/sparc/kernel/pci_psycho.c
@@ -302,23 +302,23 @@ static void psycho_register_error_handlers(struct pci_pbm_info *pbm)
          * 5: POWER MANAGEMENT
          */
 
-        if (op->num_irqs < 6)
+        if (op->archdata.num_irqs < 6)
                 return;
 
         /* We really mean to ignore the return result here.  Two
          * PCI controller share the same interrupt numbers and
          * drive the same front-end hardware.
          */
-        err = request_irq(op->irqs[1], psycho_ue_intr, IRQF_SHARED,
+        err = request_irq(op->archdata.irqs[1], psycho_ue_intr, IRQF_SHARED,
                           "PSYCHO_UE", pbm);
-        err = request_irq(op->irqs[2], psycho_ce_intr, IRQF_SHARED,
+        err = request_irq(op->archdata.irqs[2], psycho_ce_intr, IRQF_SHARED,
                           "PSYCHO_CE", pbm);
 
         /* This one, however, ought not to fail.  We can just warn
          * about it since the system can still operate properly even
          * if this fails.
          */
-        err = request_irq(op->irqs[0], psycho_pcierr_intr, IRQF_SHARED,
+        err = request_irq(op->archdata.irqs[0], psycho_pcierr_intr, IRQF_SHARED,
                           "PSYCHO_PCIERR", pbm);
         if (err)
                 printk(KERN_WARNING "%s: Could not register PCIERR, "