Re: [patch 41/54] PNP: remove pnp_resource_table references fromresource decoders

[Rene Herman]

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/