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, 10 insertions, 10 deletions

diff --git a/arch/sparc/kernel/pci_schizo.c b/arch/sparc/kernel/pci_schizo.c
index 97a1ae2e1c02..9041dae7aaca 100644
--- a/arch/sparc/kernel/pci_schizo.c
+++ b/arch/sparc/kernel/pci_schizo.c
@@ -857,14 +857,14 @@ static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)
          */
 
         if (pbm_routes_this_ino(pbm, SCHIZO_UE_INO)) {
-                err = request_irq(op->irqs[1], schizo_ue_intr, 0,
+                err = request_irq(op->archdata.irqs[1], schizo_ue_intr, 0,
                                   "TOMATILLO_UE", pbm);
                 if (err)
                         printk(KERN_WARNING "%s: Could not register UE, "
                                "err=%d\n", pbm->name, err);
         }
         if (pbm_routes_this_ino(pbm, SCHIZO_CE_INO)) {
-                err = request_irq(op->irqs[2], schizo_ce_intr, 0,
+                err = request_irq(op->archdata.irqs[2], schizo_ce_intr, 0,
                                   "TOMATILLO_CE", pbm);
                 if (err)
                         printk(KERN_WARNING "%s: Could not register CE, "
@@ -872,10 +872,10 @@ static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)
         }
         err = 0;
         if (pbm_routes_this_ino(pbm, SCHIZO_PCIERR_A_INO)) {
-                err = request_irq(op->irqs[0], schizo_pcierr_intr, 0,
+                err = request_irq(op->archdata.irqs[0], schizo_pcierr_intr, 0,
                                   "TOMATILLO_PCIERR", pbm);
         } else if (pbm_routes_this_ino(pbm, SCHIZO_PCIERR_B_INO)) {
-                err = request_irq(op->irqs[0], schizo_pcierr_intr, 0,
+                err = request_irq(op->archdata.irqs[0], schizo_pcierr_intr, 0,
                                   "TOMATILLO_PCIERR", pbm);
         }
         if (err)
@@ -883,7 +883,7 @@ static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)
                        "err=%d\n", pbm->name, err);
 
         if (pbm_routes_this_ino(pbm, SCHIZO_SERR_INO)) {
-                err = request_irq(op->irqs[3], schizo_safarierr_intr, 0,
+                err = request_irq(op->archdata.irqs[3], schizo_safarierr_intr, 0,
                                   "TOMATILLO_SERR", pbm);
                 if (err)
                         printk(KERN_WARNING "%s: Could not register SERR, "
@@ -952,14 +952,14 @@ static void schizo_register_error_handlers(struct pci_pbm_info *pbm)
          */
 
         if (pbm_routes_this_ino(pbm, SCHIZO_UE_INO)) {
-                err = request_irq(op->irqs[1], schizo_ue_intr, 0,
+                err = request_irq(op->archdata.irqs[1], schizo_ue_intr, 0,
                                   "SCHIZO_UE", pbm);
                 if (err)
                         printk(KERN_WARNING "%s: Could not register UE, "
                                "err=%d\n", pbm->name, err);
         }
         if (pbm_routes_this_ino(pbm, SCHIZO_CE_INO)) {
-                err = request_irq(op->irqs[2], schizo_ce_intr, 0,
+                err = request_irq(op->archdata.irqs[2], schizo_ce_intr, 0,
                                   "SCHIZO_CE", pbm);
                 if (err)
                         printk(KERN_WARNING "%s: Could not register CE, "
@@ -967,10 +967,10 @@ static void schizo_register_error_handlers(struct pci_pbm_info *pbm)
         }
         err = 0;
         if (pbm_routes_this_ino(pbm, SCHIZO_PCIERR_A_INO)) {
-                err = request_irq(op->irqs[0], schizo_pcierr_intr, 0,
+                err = request_irq(op->archdata.irqs[0], schizo_pcierr_intr, 0,
                                   "SCHIZO_PCIERR", pbm);
         } else if (pbm_routes_this_ino(pbm, SCHIZO_PCIERR_B_INO)) {
-                err = request_irq(op->irqs[0], schizo_pcierr_intr, 0,
+                err = request_irq(op->archdata.irqs[0], schizo_pcierr_intr, 0,
                                   "SCHIZO_PCIERR", pbm);
         }
         if (err)
@@ -978,7 +978,7 @@ static void schizo_register_error_handlers(struct pci_pbm_info *pbm)
                        "err=%d\n", pbm->name, err);
 
         if (pbm_routes_this_ino(pbm, SCHIZO_SERR_INO)) {
-                err = request_irq(op->irqs[3], schizo_safarierr_intr, 0,
+                err = request_irq(op->archdata.irqs[3], schizo_safarierr_intr, 0,
                                   "SCHIZO_SERR", pbm);
                 if (err)
                         printk(KERN_WARNING "%s: Could not register SERR, "