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_sabre.c b/arch/sparc/kernel/pci_sabre.c
index 6dad8e3b7506..99c6dba7d4fd 100644
--- a/arch/sparc/kernel/pci_sabre.c
+++ b/arch/sparc/kernel/pci_sabre.c
@@ -329,7 +329,7 @@ static void sabre_register_error_handlers(struct pci_pbm_info *pbm)
          * 2: CE ERR
          * 3: POWER FAIL
          */
-        if (op->num_irqs < 4)
+        if (op->archdata.num_irqs < 4)
                 return;
 
         /* We clear the error bits in the appropriate AFSR before
@@ -341,7 +341,7 @@ static void sabre_register_error_handlers(struct pci_pbm_info *pbm)
                     SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE),
                    base + SABRE_UE_AFSR);
 
-        err = request_irq(op->irqs[1], sabre_ue_intr, 0, "SABRE_UE", pbm);
+        err = request_irq(op->archdata.irqs[1], sabre_ue_intr, 0, "SABRE_UE", pbm);
         if (err)
                 printk(KERN_WARNING "%s: Couldn't register UE, err=%d.\n",
                        pbm->name, err);
@@ -351,11 +351,11 @@ static void sabre_register_error_handlers(struct pci_pbm_info *pbm)
                    base + SABRE_CE_AFSR);
 
 
-        err = request_irq(op->irqs[2], sabre_ce_intr, 0, "SABRE_CE", pbm);
+        err = request_irq(op->archdata.irqs[2], sabre_ce_intr, 0, "SABRE_CE", pbm);
         if (err)
                 printk(KERN_WARNING "%s: Couldn't register CE, err=%d.\n",
                        pbm->name, err);
-        err = request_irq(op->irqs[0], psycho_pcierr_intr, 0,
+        err = request_irq(op->archdata.irqs[0], psycho_pcierr_intr, 0,
                           "SABRE_PCIERR", pbm);
         if (err)
                 printk(KERN_WARNING "%s: Couldn't register PCIERR, err=%d.\n",