aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/pnpacpi/rsparser.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pnp/pnpacpi/rsparser.c')
-rw-r--r--drivers/pnp/pnpacpi/rsparser.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index a0784fe5bcd8..0e3b8d0ff06b 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -240,8 +240,7 @@ static void pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res
240static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res, 240static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
241 void *data) 241 void *data)
242{ 242{
243 struct pnp_resource_table *res_table = 243 struct pnp_resource_table *res_table = data;
244 (struct pnp_resource_table *)data;
245 int i; 244 int i;
246 245
247 switch (res->type) { 246 switch (res->type) {
@@ -564,8 +563,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
564 void *data) 563 void *data)
565{ 564{
566 int priority = 0; 565 int priority = 0;
567 struct acpipnp_parse_option_s *parse_data = 566 struct acpipnp_parse_option_s *parse_data = data;
568 (struct acpipnp_parse_option_s *)data;
569 struct pnp_dev *dev = parse_data->dev; 567 struct pnp_dev *dev = parse_data->dev;
570 struct pnp_option *option = parse_data->option; 568 struct pnp_option *option = parse_data->option;
571 569
@@ -703,7 +701,7 @@ static int pnpacpi_supported_resource(struct acpi_resource *res)
703static acpi_status pnpacpi_count_resources(struct acpi_resource *res, 701static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
704 void *data) 702 void *data)
705{ 703{
706 int *res_cnt = (int *)data; 704 int *res_cnt = data;
707 705
708 if (pnpacpi_supported_resource(res)) 706 if (pnpacpi_supported_resource(res))
709 (*res_cnt)++; 707 (*res_cnt)++;
@@ -712,7 +710,7 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
712 710
713static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data) 711static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)
714{ 712{
715 struct acpi_resource **resource = (struct acpi_resource **)data; 713 struct acpi_resource **resource = data;
716 714
717 if (pnpacpi_supported_resource(res)) { 715 if (pnpacpi_supported_resource(res)) {
718 (*resource)->type = res->type; 716 (*resource)->type = res->type;
@@ -884,8 +882,7 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
884 int i = 0; 882 int i = 0;
885 /* pnpacpi_build_resource_template allocates extra mem */ 883 /* pnpacpi_build_resource_template allocates extra mem */
886 int res_cnt = (buffer->length - 1) / sizeof(struct acpi_resource) - 1; 884 int res_cnt = (buffer->length - 1) / sizeof(struct acpi_resource) - 1;
887 struct acpi_resource *resource = 885 struct acpi_resource *resource = buffer->pointer;
888 (struct acpi_resource *)buffer->pointer;
889 int port = 0, irq = 0, dma = 0, mem = 0; 886 int port = 0, irq = 0, dma = 0, mem = 0;
890 887
891 pnp_dbg("res cnt %d", res_cnt); 888 pnp_dbg("res cnt %d", res_cnt);