lkml.org 
[lkml]   [2020]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] iwlwifi: fix build warnings with format string
Date
This fixes build warnings introduced by commit "iwlegacy: use
<linux/units.h> helpers" (iwlegacy-use-linux-unitsh-helpers.patch in -mm)

The format '%d' has to be changed to '%ld' because the return type of
kelvin_to_celsius() is 'long'.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20200106171452.201c3b4c@canb.auug.org.au
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Stanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
---
drivers/net/wireless/intel/iwlegacy/4965.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlegacy/4965.c b/drivers/net/wireless/intel/iwlegacy/4965.c
index 31b346c..34d0579 100644
--- a/drivers/net/wireless/intel/iwlegacy/4965.c
+++ b/drivers/net/wireless/intel/iwlegacy/4965.c
@@ -1611,7 +1611,7 @@ il4965_hw_get_temperature(struct il_priv *il)
temperature =
(temperature * 97) / 100 + TEMPERATURE_CALIB_KELVIN_OFFSET;

- D_TEMP("Calibrated temperature: %dK, %dC\n", temperature,
+ D_TEMP("Calibrated temperature: %dK, %ldC\n", temperature,
kelvin_to_celsius(temperature));

return temperature;
@@ -1671,11 +1671,11 @@ il4965_temperature_calib(struct il_priv *il)

if (il->temperature != temp) {
if (il->temperature)
- D_TEMP("Temperature changed " "from %dC to %dC\n",
+ D_TEMP("Temperature changed " "from %ldC to %ldC\n",
kelvin_to_celsius(il->temperature),
kelvin_to_celsius(temp));
else
- D_TEMP("Temperature " "initialized to %dC\n",
+ D_TEMP("Temperature " "initialized to %ldC\n",
kelvin_to_celsius(temp));
}

--
2.7.4
\
 
 \ /
  Last update: 2020-01-06 15:55    [W:0.046 / U:9.736 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site