diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-04-29 00:34:03 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-04-29 09:22:19 +0200 |
| commit | cdef6254e17e98f1071ce1bfc8f2a87997c855d0 (patch) | |
| tree | 984f9ac0ce71f9431a2f1d2b4daa120a3abdd30f | |
| parent | PNPACPI: extend irq_flags() to set IORESOURCE_IRQ_SHAREABLE when appropriate (diff) | |
| download | linux-cdef6254e17e98f1071ce1bfc8f2a87997c855d0.tar.xz linux-cdef6254e17e98f1071ce1bfc8f2a87997c855d0.zip | |
PNPACPI: pass pnp_dev instead of acpi_handle
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 <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/pnp/pnpacpi/core.c | 4 | ||||
| -rw-r--r-- | drivers/pnp/pnpacpi/pnpacpi.h | 2 | ||||
| -rw-r--r-- | drivers/pnp/pnpacpi/rsparser.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index fd3fca6dddd3..27546873880c 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c @@ -88,10 +88,10 @@ static int pnpacpi_set_resources(struct pnp_dev *dev, { 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); diff --git a/drivers/pnp/pnpacpi/pnpacpi.h b/drivers/pnp/pnpacpi/pnpacpi.h index f28e2ed66fa3..116c591d8634 100644 --- a/drivers/pnp/pnpacpi/pnpacpi.h +++ b/drivers/pnp/pnpacpi/pnpacpi.h @@ -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 diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index a5f5e2130e75..baaf60212779 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c @@ -777,9 +777,10 @@ static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data) 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; |