[patch 22/55] PNP: add pnp_init_resources(struct pnp_dev *) interface

Bjorn Helgaas
2008-04-28T22:36:52Z

[-- Attachment #1: pnp-remove-pnp_resource_table-from-init --]
[-- Type: text/plain, Size: 6299 bytes --]

Add pnp_init_resources(struct pnp_dev *) to replace
pnp_init_resource_table(), which takes a pointer to the
pnp_resource_table itself. Passing only the pnp_dev * reduces
the possibility for error in the caller and removes the
pnp_resource_table implementation detail from the interface.

Even though pnp_init_resource_table() is exported, I did not
export pnp_init_resources() because it is used only by the PNP
core.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>

---
drivers/pnp/interface.c | 6 +++---
drivers/pnp/isapnp/core.c | 4 ++--
drivers/pnp/manager.c | 5 +++++
drivers/pnp/pnpacpi/core.c | 2 +-
drivers/pnp/pnpacpi/rsparser.c | 3 +--
drivers/pnp/pnpbios/core.c | 2 +-
drivers/pnp/pnpbios/rsparser.c | 3 +--
include/linux/pnp.h | 2 ++
8 files changed, 16 insertions(+), 11 deletions(-)

Index: work10/include/linux/pnp.h
===================================================================
--- work10.orig/include/linux/pnp.h 2008-04-28 16:09:19.000000000 -0600
+++ work10/include/linux/pnp.h 2008-04-28 16:09:22.000000000 -0600
@@ -391,6 +391,7 @@
int pnp_register_mem_resource(struct pnp_dev *dev, struct pnp_option *option,
struct pnp_mem *data);
void pnp_init_resource_table(struct pnp_resource_table *table);
+void pnp_init_resources(struct pnp_dev *dev);
int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res,
int mode);
int pnp_auto_config_dev(struct pnp_dev *dev);
@@ -438,6 +439,7 @@
static inline int pnp_register_port_resource(struct pnp_dev *dev, struct pnp_option *option, struct pnp_port *data) { return -ENODEV; }
static inline int pnp_register_mem_resource(struct pnp_dev *dev, struct pnp_option *option, struct pnp_mem *data) { return -ENODEV; }
static inline void pnp_init_resource_table(struct pnp_resource_table *table) { }
+static inline void pnp_init_resources(struct pnp_dev *dev) { }
static inline int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res, int mode) { return -ENODEV; }
static inline int pnp_auto_config_dev(struct pnp_dev *dev) { return -ENODEV; }
static inline int pnp_validate_config(struct pnp_dev *dev) { return -ENODEV; }
Index: work10/drivers/pnp/manager.c
===================================================================
--- work10.orig/drivers/pnp/manager.c 2008-04-28 16:09:22.000000000 -0600
+++ work10/drivers/pnp/manager.c 2008-04-28 16:09:22.000000000 -0600
@@ -272,6 +272,11 @@
}
}

+void pnp_init_resources(struct pnp_dev *dev)
+{
+ pnp_init_resource_table(&dev->res);
+}
+
/**
* pnp_clean_resources - clears resources that were not manually set
* @res: the resources to clean
Index: work10/drivers/pnp/interface.c
===================================================================
--- work10.orig/drivers/pnp/interface.c 2008-04-28 16:09:19.000000000 -0600
+++ work10/drivers/pnp/interface.c 2008-04-28 16:09:22.000000000 -0600
@@ -351,14 +351,14 @@
if (!strnicmp(buf, "auto", 4)) {
if (dev->active)
goto done;
- pnp_init_resource_table(&dev->res);
+ pnp_init_resources(dev);
retval = pnp_auto_config_dev(dev);
goto done;
}
if (!strnicmp(buf, "clear", 5)) {
if (dev->active)
goto done;
- pnp_init_resource_table(&dev->res);
+ pnp_init_resources(dev);
goto done;
}
if (!strnicmp(buf, "get", 3)) {
@@ -373,7 +373,7 @@
if (dev->active)
goto done;
buf += 3;
- pnp_init_resource_table(&dev->res);
+ pnp_init_resources(dev);
mutex_lock(&pnp_res_mutex);
while (1) {
while (isspace(*buf))
Index: work10/drivers/pnp/isapnp/core.c
===================================================================
--- work10.orig/drivers/pnp/isapnp/core.c 2008-04-28 16:09:21.000000000 -0600
+++ work10/drivers/pnp/isapnp/core.c 2008-04-28 16:09:22.000000000 -0600
@@ -424,7 +424,7 @@
dev->capabilities |= PNP_READ;
dev->capabilities |= PNP_WRITE;
dev->capabilities |= PNP_DISABLE;
- pnp_init_resource_table(&dev->res);
+ pnp_init_resources(dev);
return dev;
}

@@ -981,7 +981,7 @@
int ret;

dev_dbg(&dev->dev, "get resources\n");
- pnp_init_resource_table(&dev->res);
+ pnp_init_resources(dev);
isapnp_cfg_begin(dev->card->number, dev->number);
ret = isapnp_read_resources(dev);
isapnp_cfg_end();
Index: work10/drivers/pnp/pnpacpi/core.c
===================================================================
--- work10.orig/drivers/pnp/pnpacpi/core.c 2008-04-28 16:09:21.000000000 -0600
+++ work10/drivers/pnp/pnpacpi/core.c 2008-04-28 16:09:22.000000000 -0600
@@ -212,7 +212,7 @@

/* clear out the damaged flags */
if (!dev->active)
- pnp_init_resource_table(&dev->res);
+ pnp_init_resources(dev);
pnp_add_device(dev);
num++;

Index: work10/drivers/pnp/pnpbios/core.c
===================================================================
--- work10.orig/drivers/pnp/pnpbios/core.c 2008-04-28 16:09:21.000000000 -0600
+++ work10/drivers/pnp/pnpbios/core.c 2008-04-28 16:09:22.000000000 -0600
@@ -347,7 +347,7 @@

/* clear out the damaged flags */
if (!dev->active)
- pnp_init_resource_table(&dev->res);
+ pnp_init_resources(dev);

pnp_add_device(dev);
pnpbios_interface_attach_device(node);
Index: work10/drivers/pnp/pnpacpi/rsparser.c
===================================================================
--- work10.orig/drivers/pnp/pnpacpi/rsparser.c 2008-04-28 16:09:21.000000000 -0600
+++ work10/drivers/pnp/pnpacpi/rsparser.c 2008-04-28 16:09:22.000000000 -0600
@@ -410,8 +410,7 @@

dev_dbg(&dev->dev, "parse allocated resources\n");

- /* Blank the resource table values */
- pnp_init_resource_table(&dev->res);
+ pnp_init_resources(dev);

return acpi_walk_resources(handle, METHOD_NAME__CRS,
pnpacpi_allocated_resource, dev);
Index: work10/drivers/pnp/pnpbios/rsparser.c
===================================================================
--- work10.orig/drivers/pnp/pnpbios/rsparser.c 2008-04-28 16:09:21.000000000 -0600
+++ work10/drivers/pnp/pnpbios/rsparser.c 2008-04-28 16:09:22.000000000 -0600
@@ -145,8 +145,7 @@

dev_dbg(&dev->dev, "parse allocated resources\n");

- /* Blank the resource table values */
- pnp_init_resource_table(&dev->res);
+ pnp_init_resources(dev);

while ((char *)p < (char *)end) {

--