Home » Mailing list archives » linux-kernel » 2008 » April » 18

[patch 28/53] PNP: convert resource assign functions to use pnp_get_resource(), not pnp_resource_table

Previous thread: [patch 21/53] PNP: use dev_printk when possible by Bjorn Helgaas on Friday, April 18, 2008 - 4:50 pm. (1 message)

Next thread: [patch 29/53] PNP: convert sysfs interface to use pnp_get_resource(), not pnp_resource_table by Bjorn Helgaas on Friday, April 18, 2008 - 4:50 pm. (1 message)
[view original message]
From: Bjorn Helgaas <bjorn.helgaas@...>
To: Len Brown <lenb@...>
Cc: <linux-acpi@...>, Rene Herman <rene.herman@...>, <linux-kernel@...>, Adam Belay <ambx1@...>, Li Shaohua <shaohua.li@...>, Matthieu Castet <castet.matthieu@...>, Thomas Renninger <trenn@...>, Rene Herman <rene.herman@...>, Jaroslav Kysela <perex@...>, Andrew Morton <akpm@...>
Subject: [patch 28/53] PNP: convert resource assign functions to use pnp_get_resource(), not pnp_resource_table
Date: Friday, April 18, 2008 - 4:50 pm

This removes more direct references to pnp_resource_table.


Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>

Acked-By: Rene Herman <rene.herman@gmail.com>


Index: work8/drivers/pnp/manager.c

===================================================================

--- work8.orig/drivers/pnp/manager.c	2008-04-10 15:20:30.000000000 -0600

+++ work8/drivers/pnp/manager.c	2008-04-10 15:36:06.000000000 -0600

@@ -19,22 +19,24 @@


 static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)

 {

+	struct resource *res;

 	resource_size_t *start, *end;

 	unsigned long *flags;


-	if (idx >= PNP_MAX_PORT) {

+	res = pnp_get_resource(dev, IORESOURCE_IO, idx);

+	if (!res) {

 		dev_err(&dev->dev, "too many I/O port resources\n");

 		/* pretend we were successful so at least the manager won't try again */

 		return 1;

 	}


 	/* check if this resource has been manually set, if so skip */

-	if (!(dev->res.port_resource[idx].flags & IORESOURCE_AUTO))

+	if (!(res->flags & IORESOURCE_AUTO))

 		return 1;


-	start = &dev->res.port_resource[idx].start;

-	end = &dev->res.port_resource[idx].end;

-	flags = &dev->res.port_resource[idx].flags;

+	start = &res->start;

+	end = &res->end;

+	flags = &res->flags;


 	/* set the initial values */

 	*flags |= rule->flags | IORESOURCE_IO;

@@ -60,22 +62,24 @@


 static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)

 {

+	struct resource *res;

 	resource_size_t *start, *end;

 	unsigned long *flags;


-	if (idx >= PNP_MAX_MEM) {

+	res = pnp_get_resource(dev, IORESOURCE_MEM, idx);

+	if (!res) {

 		dev_err(&dev->dev, "too many memory resources\n");

 		/* pretend we were successful so at least the manager won't try again */

 		return 1;

 	}


 	/* check if this resource has been manually set, if so skip */

-	if (!(dev->res.mem_resource[idx].flags & IORESOURCE_AUTO))

+	if (!(res->flags & IORESOURCE_AUTO))

 ...
[ message continues ]
Previous thread: [patch 21/53] PNP: use dev_printk when possible by Bjorn Helgaas on Friday, April 18, 2008 - 4:50 pm. (1 message)

Next thread: [patch 29/53] PNP: convert sysfs interface to use pnp_get_resource(), not pnp_resource_table by Bjorn Helgaas on Friday, April 18, 2008 - 4:50 pm. (1 message)