diff options
author | Bob Moore <robert.moore@intel.com> | 2017-04-26 04:18:02 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-04-26 18:31:00 -0400 |
commit | 2e337c72a3c24f0cf9bf639dc93de0f887d56dba (patch) | |
tree | 0cdfc8c32d5fecf73b630a296d6f4f9187ab005c | |
parent | 1b8f77aa0deca22a995a4bdd65914aa24bda0386 (diff) |
ACPICA: Fix several incorrect invocations of ACPICA return macro
ACPICA commit 521bedc49b42e59116de1b54dcd95d30d36cac90
Not needed since there is no function tracing for the
validation function in hwvalid.c
Link: https://github.com/acpica/acpica/commit/521bedc4
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/acpi/acpica/hwvalid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c index 0b102e071802..3094cec4eab4 100644 --- a/drivers/acpi/acpica/hwvalid.c +++ b/drivers/acpi/acpica/hwvalid.c | |||
@@ -135,7 +135,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) | |||
135 | if ((bit_width != 8) && (bit_width != 16) && (bit_width != 32)) { | 135 | if ((bit_width != 8) && (bit_width != 16) && (bit_width != 32)) { |
136 | ACPI_ERROR((AE_INFO, | 136 | ACPI_ERROR((AE_INFO, |
137 | "Bad BitWidth parameter: %8.8X", bit_width)); | 137 | "Bad BitWidth parameter: %8.8X", bit_width)); |
138 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 138 | return (AE_BAD_PARAMETER); |
139 | } | 139 | } |
140 | 140 | ||
141 | port_info = acpi_protected_ports; | 141 | port_info = acpi_protected_ports; |
@@ -153,13 +153,13 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) | |||
153 | ACPI_ERROR((AE_INFO, | 153 | ACPI_ERROR((AE_INFO, |
154 | "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X", | 154 | "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X", |
155 | ACPI_FORMAT_UINT64(address), byte_width)); | 155 | ACPI_FORMAT_UINT64(address), byte_width)); |
156 | return_ACPI_STATUS(AE_LIMIT); | 156 | return (AE_LIMIT); |
157 | } | 157 | } |
158 | 158 | ||
159 | /* Exit if requested address is not within the protected port table */ | 159 | /* Exit if requested address is not within the protected port table */ |
160 | 160 | ||
161 | if (address > acpi_protected_ports[ACPI_PORT_INFO_ENTRIES - 1].end) { | 161 | if (address > acpi_protected_ports[ACPI_PORT_INFO_ENTRIES - 1].end) { |
162 | return_ACPI_STATUS(AE_OK); | 162 | return (AE_OK); |
163 | } | 163 | } |
164 | 164 | ||
165 | /* Check request against the list of protected I/O ports */ | 165 | /* Check request against the list of protected I/O ports */ |
@@ -198,7 +198,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) | |||
198 | } | 198 | } |
199 | } | 199 | } |
200 | 200 | ||
201 | return_ACPI_STATUS(AE_OK); | 201 | return (AE_OK); |
202 | } | 202 | } |
203 | 203 | ||
204 | /****************************************************************************** | 204 | /****************************************************************************** |