aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2014-07-30 00:20:26 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-30 18:50:22 -0400
commit8884de6a47dda88f8fdf4efa9960149fb5a8a46f (patch)
tree2e15b3feb388a577b1395822ae1feef8f6ac8c1d
parentc12f07d17c12193256a99e20c9a0f130fb8f7be8 (diff)
ACPICA: Work around an ancient GCC bug.
warning: cast from function call of type 'char *' to non-matching type 'long unsigned int' Since acpi_ut_format_number() hasn't been enabled for the Linux kernel, this patch doesn't affect the Linux kernel. 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/utprint.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/utprint.c b/drivers/acpi/acpica/utprint.c
index 10311648f701..080e22aaba15 100644
--- a/drivers/acpi/acpica/utprint.c
+++ b/drivers/acpi/acpica/utprint.c
@@ -242,6 +242,7 @@ static char *acpi_ut_format_number(char *string,
242 u64 number, 242 u64 number,
243 u8 base, s32 width, s32 precision, u8 type) 243 u8 base, s32 width, s32 precision, u8 type)
244{ 244{
245 char *pos;
245 char sign; 246 char sign;
246 char zero; 247 char zero;
247 u8 need_prefix; 248 u8 need_prefix;
@@ -289,9 +290,8 @@ static char *acpi_ut_format_number(char *string,
289 290
290 /* Generate full string in reverse order */ 291 /* Generate full string in reverse order */
291 292
292 i = ACPI_PTR_DIFF(acpi_ut_put_number 293 pos = acpi_ut_put_number(reversed_string, number, base, upper);
293 (reversed_string, number, base, upper), 294 i = ACPI_PTR_DIFF(pos, reversed_string);
294 reversed_string);
295 295
296 /* Printing 100 using %2d gives "100", not "00" */ 296 /* Printing 100 using %2d gives "100", not "00" */
297 297