summaryrefslogtreecommitdiffstats
path: root/drivers/pnp
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pnp')
-rw-r--r--drivers/pnp/interface.c6
-rw-r--r--drivers/pnp/isapnp/core.c4
-rw-r--r--drivers/pnp/manager.c5
-rw-r--r--drivers/pnp/pnpacpi/core.c2
-rw-r--r--drivers/pnp/pnpacpi/rsparser.c3
-rw-r--r--drivers/pnp/pnpbios/core.c2
-rw-r--r--drivers/pnp/pnpbios/rsparser.c3
7 files changed, 14 insertions, 11 deletions
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index e882896bdbd..cdc3ecfde6e 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -351,14 +351,14 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
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 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
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))
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 6740016437d..6f1007548c9 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -424,7 +424,7 @@ static struct pnp_dev *__init isapnp_parse_device(struct pnp_card *card,
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 @@ static int isapnp_get_resources(struct pnp_dev *dev)
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();
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 945c6201719..c9af87a8fb1 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -272,6 +272,11 @@ void pnp_init_resource_table(struct pnp_resource_table *table)
}
}
+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
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 1ac894d2df5..7e4512a60f5 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -212,7 +212,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
/* clear out the damaged flags */
if (!dev->active)
- pnp_init_resource_table(&dev->res);
+ pnp_init_resources(dev);
pnp_add_device(dev);
num++;
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index c5adf7631ac..33dbf3644f2 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -410,8 +410,7 @@ acpi_status pnpacpi_parse_allocated_resource(struct pnp_dev *dev)
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);
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 76d398531da..f5477ca8595 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -347,7 +347,7 @@ static int __init insert_device(struct pnp_bios_node *node)
/* 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);
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index 7428f62db4d..e90a3d4360b 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -145,8 +145,7 @@ static unsigned char *pnpbios_parse_allocated_resource_data(struct pnp_dev *dev,
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) {