rtc: dont reference pnp_resource_table directly
authorBjorn Helgaas <bjorn.helgaas@hp.com>
Mon, 28 Apr 2008 22:34:27 +0000 (16:34 -0600)
committerLen Brown <len.brown@intel.com>
Tue, 29 Apr 2008 07:22:27 +0000 (03:22 -0400)
pnp_resource_table is going away soon, so use the more
generic public interfaces instead.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/rtc/rtc-cmos.c

index dcdc142a3441114ccc9a5446496af48a4746d704..d060a06ce05b67c7351a73e3a76bbd34444eb54c 100644 (file)
@@ -854,11 +854,12 @@ cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
                 * don't define the IRQ. It should always be safe to
                 * hardcode it in these cases
                 */
-               return cmos_do_probe(&pnp->dev, &pnp->res.port_resource[0], 8);
+               return cmos_do_probe(&pnp->dev,
+                               pnp_get_resource(pnp, IORESOURCE_IO, 0), 8);
        else
                return cmos_do_probe(&pnp->dev,
-                                    &pnp->res.port_resource[0],
-                                    pnp->res.irq_resource[0].start);
+                               pnp_get_resource(pnp, IORESOURCE_IO, 0),
+                               pnp_irq(pnp, 0));
 }
 
 static void __exit cmos_pnp_remove(struct pnp_dev *pnp)