From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758677AbYDZW2U (ORCPT ); Sat, 26 Apr 2008 18:28:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756352AbYDZW2K (ORCPT ); Sat, 26 Apr 2008 18:28:10 -0400 Received: from smtpq1.tilbu1.nb.home.nl ([213.51.146.200]:49553 "EHLO smtpq1.tilbu1.nb.home.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755683AbYDZW2J (ORCPT ); Sat, 26 Apr 2008 18:28:09 -0400 Message-ID: <4813AC7D.9000006@keyaccess.nl> Date: Sun, 27 Apr 2008 00:28:13 +0200 From: Rene Herman User-Agent: Thunderbird 2.0.0.12 (X11/20080213) MIME-Version: 1.0 To: Bjorn Helgaas CC: Len Brown , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Adam Belay , Adam M Belay , Li Shaohua , Matthieu Castet , Thomas Renninger , Jaroslav Kysela , Andrew Morton Subject: Re: [patch 41/54] PNP: remove pnp_resource_table references from resource decoders References: <20080425183807.366134771@ldl.fc.hp.com> <20080425183932.457629051@ldl.fc.hp.com> In-Reply-To: <20080425183932.457629051@ldl.fc.hp.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -1.0 (-) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 25-04-08 20:38, Bjorn Helgaas wrote: > Index: work10/drivers/pnp/pnpacpi/rsparser.c > =================================================================== > --- work10.orig/drivers/pnp/pnpacpi/rsparser.c 2008-04-25 11:15:08.000000000 -0600 > +++ work10/drivers/pnp/pnpacpi/rsparser.c 2008-04-25 11:15:09.000000000 -0600 > @@ -82,8 +82,8 @@ > u32 gsi, int triggering, > int polarity, int shareable) > { > - struct pnp_resource_table *res = dev->res; > - int i = 0; > + struct resource *res; > + int i; > int irq; > int p, t; > static unsigned char warned; > @@ -91,9 +91,11 @@ > if (!valid_IRQ(gsi)) > return; > > - while (!(res->irq_resource[i].flags & IORESOURCE_UNSET) && > - i < PNP_MAX_IRQ) > - i++; > + for (i = 0; i < PNP_MAX_IRQ; i++) { > + res = &dev->res->irq_resource[i]; > + if (res->flags & IORESOURCE_UNSET) > + break; > + } Another possible user of pnp_resource_valid. > + for (i = 0; i < PNP_MAX_DMA; i++) { > + res = &dev->res->dma_resource[i]; > + if (res->flags & IORESOURCE_UNSET) > + break; > + } . > + for (i = 0; i < PNP_MAX_PORT; i++) { > + res = &dev->res->port_resource[i]; > + if (res->flags & IORESOURCE_UNSET) > + break; > + } . > + for (i = 0; i < PNP_MAX_MEM; i++) { > + res = &dev->res->mem_resource[i]; > + if (res->flags & IORESOURCE_UNSET) > + break; > + } . > Index: work10/drivers/pnp/pnpbios/rsparser.c > =================================================================== > --- work10.orig/drivers/pnp/pnpbios/rsparser.c 2008-04-25 11:15:08.000000000 -0600 > +++ work10/drivers/pnp/pnpbios/rsparser.c 2008-04-25 11:15:09.000000000 -0600 > @@ -56,80 +56,90 @@ > > static void pnpbios_parse_allocated_irqresource(struct pnp_dev *dev, int irq) > { > - struct pnp_resource_table *res = dev->res; > - int i = 0; > + struct resource *res; > + int i; > + > + for (i = 0; i < PNP_MAX_IRQ; i++) { > + res = &dev->res->irq_resource[i]; > + if (res->flags & IORESOURCE_UNSET) > + break; > + } . > + for (i = 0; i < PNP_MAX_DMA; i++) { > + res = &dev->res->dma_resource[i]; > + if (res->flags & IORESOURCE_UNSET) > + break; > + } . > + for (i = 0; i < PNP_MAX_PORT; i++) { > + res = &dev->res->port_resource[i]; > + if (res->flags & IORESOURCE_UNSET) > + break; > + } . > + for (i = 0; i < PNP_MAX_MEM; i++) { > + res = &dev->res->mem_resource[i]; > + if (res->flags & IORESOURCE_UNSET) > + break; > + } . Rene