Преглед на файлове

[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>
Kumar Gala преди 19 години
родител
ревизия
1d5326774c
променени са 2 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 4 1
      drivers/net/gianfar_mii.c
  2. 0 3
      include/linux/fsl_devices.h

+ 4 - 1
drivers/net/gianfar_mii.c

@@ -128,6 +128,7 @@ int gfar_mdio_probe(struct device *dev)
 	struct gianfar_mdio_data *pdata;
 	struct gianfar_mdio_data *pdata;
 	struct gfar_mii *regs;
 	struct gfar_mii *regs;
 	struct mii_bus *new_bus;
 	struct mii_bus *new_bus;
+	struct resource *r;
 	int err = 0;
 	int err = 0;
 
 
 	if (NULL == dev)
 	if (NULL == dev)
@@ -151,8 +152,10 @@ int gfar_mdio_probe(struct device *dev)
 		return -ENODEV;
 		return -ENODEV;
 	}
 	}
 
 
+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
 	/* Set the PHY base address */
 	/* Set the PHY base address */
-	regs = (struct gfar_mii *) ioremap(pdata->paddr, 
+	regs = (struct gfar_mii *) ioremap(r->start,
 			sizeof (struct gfar_mii));
 			sizeof (struct gfar_mii));
 
 
 	if (NULL == regs) {
 	if (NULL == regs) {

+ 0 - 3
include/linux/fsl_devices.h

@@ -55,9 +55,6 @@ struct gianfar_platform_data {
 };
 };
 
 
 struct gianfar_mdio_data {
 struct gianfar_mdio_data {
-	/* device specific information */
-	u32 paddr;
-
 	/* board specific information */
 	/* board specific information */
 	int irq[32];
 	int irq[32];
 };
 };