diff options
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r-- | drivers/acpi/ec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index e5d796362854..d560b5e8dd3f 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -716,7 +716,7 @@ static void acpi_ec_gpe_poll_query(void *ec_cxt) | |||
716 | } | 716 | } |
717 | static void acpi_ec_gpe_intr_query(void *ec_cxt) | 717 | static void acpi_ec_gpe_intr_query(void *ec_cxt) |
718 | { | 718 | { |
719 | union acpi_ec *ec = (union acpi_ec *)ec_cxt; | 719 | union acpi_ec *ec = ec_cxt; |
720 | u32 value; | 720 | u32 value; |
721 | int result = -ENODATA; | 721 | int result = -ENODATA; |
722 | static char object_name[5] = { '_', 'Q', '0', '0', '\0' }; | 722 | static char object_name[5] = { '_', 'Q', '0', '0', '\0' }; |
@@ -752,7 +752,7 @@ static u32 acpi_ec_gpe_handler(void *data) | |||
752 | static u32 acpi_ec_gpe_poll_handler(void *data) | 752 | static u32 acpi_ec_gpe_poll_handler(void *data) |
753 | { | 753 | { |
754 | acpi_status status = AE_OK; | 754 | acpi_status status = AE_OK; |
755 | union acpi_ec *ec = (union acpi_ec *)data; | 755 | union acpi_ec *ec = data; |
756 | 756 | ||
757 | if (!ec) | 757 | if (!ec) |
758 | return ACPI_INTERRUPT_NOT_HANDLED; | 758 | return ACPI_INTERRUPT_NOT_HANDLED; |
@@ -770,7 +770,7 @@ static u32 acpi_ec_gpe_intr_handler(void *data) | |||
770 | { | 770 | { |
771 | acpi_status status = AE_OK; | 771 | acpi_status status = AE_OK; |
772 | u32 value; | 772 | u32 value; |
773 | union acpi_ec *ec = (union acpi_ec *)data; | 773 | union acpi_ec *ec = data; |
774 | 774 | ||
775 | if (!ec) | 775 | if (!ec) |
776 | return ACPI_INTERRUPT_NOT_HANDLED; | 776 | return ACPI_INTERRUPT_NOT_HANDLED; |
@@ -848,7 +848,7 @@ acpi_ec_space_handler(u32 function, | |||
848 | return AE_BAD_PARAMETER; | 848 | return AE_BAD_PARAMETER; |
849 | } | 849 | } |
850 | 850 | ||
851 | ec = (union acpi_ec *)handler_context; | 851 | ec = handler_context; |
852 | 852 | ||
853 | next_byte: | 853 | next_byte: |
854 | switch (function) { | 854 | switch (function) { |
@@ -905,7 +905,7 @@ static struct proc_dir_entry *acpi_ec_dir; | |||
905 | 905 | ||
906 | static int acpi_ec_read_info(struct seq_file *seq, void *offset) | 906 | static int acpi_ec_read_info(struct seq_file *seq, void *offset) |
907 | { | 907 | { |
908 | union acpi_ec *ec = (union acpi_ec *)seq->private; | 908 | union acpi_ec *ec = seq->private; |
909 | 909 | ||
910 | 910 | ||
911 | if (!ec) | 911 | if (!ec) |
@@ -1136,7 +1136,7 @@ static int acpi_ec_remove(struct acpi_device *device, int type) | |||
1136 | static acpi_status | 1136 | static acpi_status |
1137 | acpi_ec_io_ports(struct acpi_resource *resource, void *context) | 1137 | acpi_ec_io_ports(struct acpi_resource *resource, void *context) |
1138 | { | 1138 | { |
1139 | union acpi_ec *ec = (union acpi_ec *)context; | 1139 | union acpi_ec *ec = context; |
1140 | struct acpi_generic_address *addr; | 1140 | struct acpi_generic_address *addr; |
1141 | 1141 | ||
1142 | if (resource->type != ACPI_RESOURCE_TYPE_IO) { | 1142 | if (resource->type != ACPI_RESOURCE_TYPE_IO) { |