iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PNPACPI: move _CRS/_PRS warnings closer to the action

Browse Source 
Move warnings about _CRS and _PRS problems to the place where we
actually make the ACPI calls.  Then we don't have to pass around
acpi_status values any more than necessary.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bjorn Helgaas 2008-04-28 16:34:39 -06:00 committed by Len Brown
parent 01115e7d41
commit d152cf5d0c
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/pnp/pnpacpi/core.c
View File

@ -75,11 +75,8 @@ static int __init ispnpidacpi(char *id)
static int pnpacpi_get_resources(struct pnp_dev *dev) static int pnpacpi_get_resources(struct pnp_dev *dev)
{ {
acpi_status status;
dev_dbg(&dev->dev, "get resources\n"); dev_dbg(&dev->dev, "get resources\n");
status = pnpacpi_parse_allocated_resource(dev); return pnpacpi_parse_allocated_resource(dev);
return ACPI_FAILURE(status) ? -ENODEV : 0;
} }
static int pnpacpi_set_resources(struct pnp_dev *dev) static int pnpacpi_set_resources(struct pnp_dev *dev)
@ -182,22 +179,11 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
else else
strncpy(dev->name, acpi_device_bid(device), sizeof(dev->name)); strncpy(dev->name, acpi_device_bid(device), sizeof(dev->name));
if (dev->active) { if (dev->active)
/* parse allocated resource */ pnpacpi_parse_allocated_resource(dev);
status = pnpacpi_parse_allocated_resource(dev);
if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
pnp_err("PnPACPI: METHOD_NAME__CRS failure for %s",
acpi_device_hid(device));
}
}
if (dev->capabilities & PNP_CONFIGURABLE) { if (dev->capabilities & PNP_CONFIGURABLE)
status = pnpacpi_parse_resource_option_data(dev); pnpacpi_parse_resource_option_data(dev);
if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
pnp_err("PnPACPI: METHOD_NAME__PRS failure for %s",
acpi_device_hid(device));
}
}
if (device->flags.compatible_ids) { if (device->flags.compatible_ids) {
struct acpi_compatible_id_list *cid_list = device->pnp.cid_list; struct acpi_compatible_id_list *cid_list = device->pnp.cid_list;

4
drivers/pnp/pnpacpi/pnpacpi.h
View File

@ -5,8 +5,8 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/pnp.h> #include <linux/pnp.h>
acpi_status pnpacpi_parse_allocated_resource(struct pnp_dev *); int pnpacpi_parse_allocated_resource(struct pnp_dev *);
acpi_status pnpacpi_parse_resource_option_data(struct pnp_dev *); int pnpacpi_parse_resource_option_data(struct pnp_dev *);
int pnpacpi_encode_resources(struct pnp_dev *, struct acpi_buffer *); int pnpacpi_encode_resources(struct pnp_dev *, struct acpi_buffer *);
int pnpacpi_build_resource_template(struct pnp_dev *, struct acpi_buffer *); int pnpacpi_build_resource_template(struct pnp_dev *, struct acpi_buffer *);
#endif #endif

30
drivers/pnp/pnpacpi/rsparser.c
View File

@ -339,16 +339,24 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
return AE_OK; return AE_OK;
} }
acpi_status pnpacpi_parse_allocated_resource(struct pnp_dev *dev) int pnpacpi_parse_allocated_resource(struct pnp_dev *dev)
{ {
acpi_handle handle = dev->data; acpi_handle handle = dev->data;
acpi_status status;
dev_dbg(&dev->dev, "parse allocated resources\n"); dev_dbg(&dev->dev, "parse allocated resources\n");
pnp_init_resources(dev); pnp_init_resources(dev);
return acpi_walk_resources(handle, METHOD_NAME__CRS, status = acpi_walk_resources(handle, METHOD_NAME__CRS,
pnpacpi_allocated_resource, dev); pnpacpi_allocated_resource, dev);
if (ACPI_FAILURE(status)) {
if (status != AE_NOT_FOUND)
dev_err(&dev->dev, "can't evaluate _CRS: %d", status);
return -EPERM;
}
return 0;
} }
static __init void pnpacpi_parse_dma_option(struct pnp_dev *dev, static __init void pnpacpi_parse_dma_option(struct pnp_dev *dev,
@ -670,7 +678,7 @@ static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res,
return AE_OK; return AE_OK;
} }
acpi_status __init pnpacpi_parse_resource_option_data(struct pnp_dev *dev) int __init pnpacpi_parse_resource_option_data(struct pnp_dev *dev)
{ {
acpi_handle handle = dev->data; acpi_handle handle = dev->data;
acpi_status status; acpi_status status;
@ -680,13 +688,19 @@ acpi_status __init pnpacpi_parse_resource_option_data(struct pnp_dev *dev)
parse_data.option = pnp_register_independent_option(dev); parse_data.option = pnp_register_independent_option(dev);
if (!parse_data.option) if (!parse_data.option)
return AE_ERROR; return -ENOMEM;
parse_data.option_independent = parse_data.option; parse_data.option_independent = parse_data.option;
parse_data.dev = dev; parse_data.dev = dev;
status = acpi_walk_resources(handle, METHOD_NAME__PRS, status = acpi_walk_resources(handle, METHOD_NAME__PRS,
pnpacpi_option_resource, &parse_data); pnpacpi_option_resource, &parse_data);
return status; if (ACPI_FAILURE(status)) {
if (status != AE_NOT_FOUND)
dev_err(&dev->dev, "can't evaluate _PRS: %d", status);
return -EPERM;
}
return 0;
} }
static int pnpacpi_supported_resource(struct acpi_resource *res) static int pnpacpi_supported_resource(struct acpi_resource *res)
@ -745,7 +759,7 @@ int pnpacpi_build_resource_template(struct pnp_dev *dev,
status = acpi_walk_resources(handle, METHOD_NAME__CRS, status = acpi_walk_resources(handle, METHOD_NAME__CRS,
pnpacpi_count_resources, &res_cnt); pnpacpi_count_resources, &res_cnt);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
dev_err(&dev->dev, "can't evaluate _CRS\n"); dev_err(&dev->dev, "can't evaluate _CRS: %d\n", status);
return -EINVAL; return -EINVAL;
} }
if (!res_cnt) if (!res_cnt)
@ -760,7 +774,7 @@ int pnpacpi_build_resource_template(struct pnp_dev *dev,
pnpacpi_type_resources, &resource); pnpacpi_type_resources, &resource);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
kfree(buffer->pointer); kfree(buffer->pointer);
dev_err(&dev->dev, "can't evaluate _CRS\n"); dev_err(&dev->dev, "can't evaluate _CRS: %d\n", status);
return -EINVAL; return -EINVAL;
} }
/* resource will pointer the end resource now */ /* resource will pointer the end resource now */