From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: [patch 35/37] rtc: dont reference pnp_resource_table directly Date: Tue, 01 Apr 2008 09:17:09 -0600 Message-ID: <20080401151742.662774841@ldl.fc.hp.com> References: <20080401151634.730901933@ldl.fc.hp.com> Return-path: Received: from g4t0015.houston.hp.com ([15.201.24.18]:17527 "EHLO g4t0015.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756743AbYDAPSg (ORCPT ); Tue, 1 Apr 2008 11:18:36 -0400 Content-Disposition: inline; filename=rtc-remove-pnp_resource_table-use Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Len Brown Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Adam Belay , Li Shaohua , Matthieu Castet , Thomas Renninger , Rene Herman , Jaroslav Kysela , Andrew Morton pnp_resource_table is going away soon, so use the more generic public interfaces instead. Signed-off-by: Bjorn Helgaas Index: work7/drivers/rtc/rtc-cmos.c =================================================================== --- work7.orig/drivers/rtc/rtc-cmos.c 2008-03-25 17:04:44.000000000 -0600 +++ work7/drivers/rtc/rtc-cmos.c 2008-03-25 17:04:45.000000000 -0600 @@ -855,11 +855,12 @@ * 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) --