diff options
| author | Kumar Gala <galak@gate.crashing.org> | 2006-01-11 20:27:32 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-12 22:31:51 +0100 |
| commit | 1d5326774c9245fef77334a9e0f11cd4f8aa7b4e (patch) | |
| tree | 20b581ec56b6a336492dd911a19d1d563eed398f | |
| parent | [PATCH] gfar: fix compile error (diff) | |
| download | linux-1d5326774c9245fef77334a9e0f11cd4f8aa7b4e.tar.xz linux-1d5326774c9245fef77334a9e0f11cd4f8aa7b4e.zip | |
[PATCH] gianfar mii: Use proper resource for MII memory region
We can now have the gianfar mii platform device have a proper resource for the
IO memory region for its registers. Previously we passed this information
that the platform_data structure because we couldn't handle overlapping memory
regions for platform devices.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| -rw-r--r-- | drivers/net/gianfar_mii.c | 5 | ||||
| -rw-r--r-- | include/linux/fsl_devices.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c index 04a462c2a5b7..74e52fcbf806 100644 --- a/drivers/net/gianfar_mii.c +++ b/drivers/net/gianfar_mii.c @@ -128,6 +128,7 @@ int gfar_mdio_probe(struct device *dev) struct gianfar_mdio_data *pdata; struct gfar_mii *regs; struct mii_bus *new_bus; + struct resource *r; int err = 0; if (NULL == dev) @@ -151,8 +152,10 @@ int gfar_mdio_probe(struct device *dev) return -ENODEV; } + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); + /* Set the PHY base address */ - regs = (struct gfar_mii *) ioremap(pdata->paddr, + regs = (struct gfar_mii *) ioremap(r->start, sizeof (struct gfar_mii)); if (NULL == regs) { diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 934aa9bda481..a7a2b855ba72 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -55,9 +55,6 @@ struct gianfar_platform_data { }; struct gianfar_mdio_data { - /* device specific information */ - u32 paddr; - /* board specific information */ int irq[32]; }; |