Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdef6254 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent cd7ec927

drivers/pnp/pnpacpi/core.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/pnp/pnpacpi/pnpacpi.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/pnp/pnpacpi/rsparser.c

+2 −1
Original line number Diff line number Diff line
@@ -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;