aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/pnpacpi
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-04-28 18:34:05 -0400
committerLen Brown <len.brown@intel.com>2008-04-29 03:22:21 -0400
commit59284cb4099411bc6f4915a5a4cb76414440c447 (patch)
tree2965bbad48655a6c1e0bf2ef5d51994ab28d627d /drivers/pnp/pnpacpi
parentc1caf06ccfd3a4efd4b489f89bcdabd2362f31d0 (diff)
PNP: remove pnp_resource_table from internal get/set interfaces
When we call protocol->get() and protocol->set() methods, we currently supply pointers to both the pnp_dev and the pnp_resource_table even though the pnp_resource_table should always be the one associated with the pnp_dev. This removes the pnp_resource_table arguments to make it clear that these methods only operate on the specified pnp_dev. 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>
Diffstat (limited to 'drivers/pnp/pnpacpi')
-rw-r--r--drivers/pnp/pnpacpi/core.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 27546873880c..590fbcb0ee89 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -73,8 +73,7 @@ static int __init ispnpidacpi(char *id)
73 return 1; 73 return 1;
74} 74}
75 75
76static int pnpacpi_get_resources(struct pnp_dev *dev, 76static int pnpacpi_get_resources(struct pnp_dev *dev)
77 struct pnp_resource_table *res)
78{ 77{
79 acpi_status status; 78 acpi_status status;
80 79
@@ -83,8 +82,7 @@ static int pnpacpi_get_resources(struct pnp_dev *dev,
83 return ACPI_FAILURE(status) ? -ENODEV : 0; 82 return ACPI_FAILURE(status) ? -ENODEV : 0;
84} 83}
85 84
86static int pnpacpi_set_resources(struct pnp_dev *dev, 85static int pnpacpi_set_resources(struct pnp_dev *dev)
87 struct pnp_resource_table *res)
88{ 86{
89 acpi_handle handle = dev->data; 87 acpi_handle handle = dev->data;
90 struct acpi_buffer buffer; 88 struct acpi_buffer buffer;
@@ -94,7 +92,7 @@ static int pnpacpi_set_resources(struct pnp_dev *dev,
94 ret = pnpacpi_build_resource_template(dev, &buffer); 92 ret = pnpacpi_build_resource_template(dev, &buffer);
95 if (ret) 93 if (ret)
96 return ret; 94 return ret;
97 ret = pnpacpi_encode_resources(res, &buffer); 95 ret = pnpacpi_encode_resources(&dev->res, &buffer);
98 if (ret) { 96 if (ret) {
99 kfree(buffer.pointer); 97 kfree(buffer.pointer);
100 return ret; 98 return ret;