Pass the pnp_dev pointer when possible instead of the acpi_handle. This allows better error messages and reduces the chance of error in the caller. Signed-off-by: Bjorn Helgaas Acked-By: Rene Herman Index: work10/drivers/pnp/pnpacpi/core.c =================================================================== --- work10.orig/drivers/pnp/pnpacpi/core.c 2008-04-28 16:09:12.000000000 -0600 +++ work10/drivers/pnp/pnpacpi/core.c 2008-04-28 16:09:18.000000000 -0600 @@ -88,10 +88,10 @@ { acpi_handle handle = dev->data; struct acpi_buffer buffer; - int ret = 0; + int ret; acpi_status status; - ret = pnpacpi_build_resource_template(handle, &buffer); + ret = pnpacpi_build_resource_template(dev, &buffer); if (ret) return ret; ret = pnpacpi_encode_resources(res, &buffer); Index: work10/drivers/pnp/pnpacpi/pnpacpi.h =================================================================== --- work10.orig/drivers/pnp/pnpacpi/pnpacpi.h 2008-04-28 15:57:04.000000000 -0600 +++ work10/drivers/pnp/pnpacpi/pnpacpi.h 2008-04-28 16:09:18.000000000 -0600 @@ -8,5 +8,5 @@ acpi_status pnpacpi_parse_allocated_resource(acpi_handle, struct pnp_resource_table*); acpi_status pnpacpi_parse_resource_option_data(acpi_handle, struct pnp_dev*); int pnpacpi_encode_resources(struct pnp_resource_table *, struct acpi_buffer *); -int pnpacpi_build_resource_template(acpi_handle, struct acpi_buffer*); +int pnpacpi_build_resource_template(struct pnp_dev *, struct acpi_buffer *); #endif Index: work10/drivers/pnp/pnpacpi/rsparser.c =================================================================== --- work10.orig/drivers/pnp/pnpacpi/rsparser.c 2008-04-28 16:09:17.000000000 -0600 +++ work10/drivers/pnp/pnpacpi/rsparser.c 2008-04-28 16:09:18.000000000 -0600 @@ -777,9 +777,10 @@ return AE_OK; } -int pnpacpi_build_resource_template(acpi_handle handle, +int pnpacpi_build_resource_template(struct pnp_dev *dev, struct acpi_buffer *buffer) { + acpi_handle handle = dev->data; struct acpi_resource *resource; int res_cnt = 0; acpi_status status; -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/