diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-06-18 13:09:58 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-06-28 15:41:33 -0400 |
commit | 1636f8ac2b08410df4766449f7c86b912443cd99 (patch) | |
tree | 9c923c017e956779f237d4ffa51d49beb3de6d3e /drivers/net/niu.c | |
parent | 2b07be2493681220cac4d185494a4edb0b8efd1e (diff) |
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>
Diffstat (limited to 'drivers/net/niu.c')
-rw-r--r-- | drivers/net/niu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index 63e8e3893bd6..5dd50b6ae776 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
@@ -9119,12 +9119,12 @@ static int __devinit niu_n2_irq_init(struct niu *np, u8 *ldg_num_map) | |||
9119 | if (!int_prop) | 9119 | if (!int_prop) |
9120 | return -ENODEV; | 9120 | return -ENODEV; |
9121 | 9121 | ||
9122 | for (i = 0; i < op->num_irqs; i++) { | 9122 | for (i = 0; i < op->archdata.num_irqs; i++) { |
9123 | ldg_num_map[i] = int_prop[i]; | 9123 | ldg_num_map[i] = int_prop[i]; |
9124 | np->ldg[i].irq = op->irqs[i]; | 9124 | np->ldg[i].irq = op->archdata.irqs[i]; |
9125 | } | 9125 | } |
9126 | 9126 | ||
9127 | np->num_ldg = op->num_irqs; | 9127 | np->num_ldg = op->archdata.num_irqs; |
9128 | 9128 | ||
9129 | return 0; | 9129 | return 0; |
9130 | #else | 9130 | #else |