linux-next: build warnings after merge of the akpm-current tree
Subsystems (2)
Hi all,
After merging the akpm-current tree, today's linux-next build (x86_64 allmodconfig) produced these warnings:
In file included from include/linux/device.h:15,
from include/linux/pci.h:37,
from drivers/net/wireless/intel/iwlegacy/4965.c:14:drivers/net/wireless/intel/iwlegacy/4965.c: In function 'il4965_hw_get_temperature':drivers/net/wireless/intel/iwlegacy/common.h:2928:32: warning: format '%d' expects argument of type 'int', but argument 6 has type 'long int' [-Wformat=]
2928 | dev_err(&il->hw->wiphy->dev, "%c %s " fmt, \
| ^~~~~~~~include/linux/dev_printk.h:19:22: note: in definition of macro 'dev_fmt'
19 | #define dev_fmt(fmt) fmt
| ^~~drivers/net/wireless/intel/iwlegacy/common.h:2928:3: note: in expansion of macro 'dev_err'
2928 | dev_err(&il->hw->wiphy->dev, "%c %s " fmt, \
| ^~~~~~~
drivers/net/wireless/intel/iwlegacy/common.h:3027:26: note: in expansion of macro 'IL_DBG'
3027 | #define D_TEMP(f, a...) IL_DBG(IL_DL_TEMP, f, ## a)
| ^~~~~~
drivers/net/wireless/intel/iwlegacy/4965.c:1614:2: note: in expansion of macro 'D_TEMP'
1614 | D_TEMP("Calibrated temperature: %dK, %dC\n", temperature,
| ^~~~~~
drivers/net/wireless/intel/iwlegacy/4965.c:1614:40: note: format string is defined here
1614 | D_TEMP("Calibrated temperature: %dK, %dC\n", temperature,
| ~^
| |
| int
| %ld
In file included from include/linux/device.h:15,
from include/linux/pci.h:37,
from drivers/net/wireless/intel/iwlegacy/4965.c:14:drivers/net/wireless/intel/iwlegacy/4965.c: In function 'il4965_temperature_calib':drivers/net/wireless/intel/iwlegacy/common.h:2928:32: warning: format '%d' expects argument of type 'int', but argument 5 has type 'long int' [-Wformat=]
2928 | dev_err(&il->hw->wiphy->dev, "%c %s " fmt, \
| ^~~~~~~~include/linux/dev_printk.h:19:22: note: in definition of macro 'dev_fmt'
19 | #define dev_fmt(fmt) fmt
| ^~~drivers/net/wireless/intel/iwlegacy/common.h:2928:3: note: in expansion of macro 'dev_err'
2928 | dev_err(&il->hw->wiphy->dev, "%c %s " fmt, \
| ^~~~~~~
drivers/net/wireless/intel/iwlegacy/common.h:3027:26: note: in expansion of macro 'IL_DBG'
3027 | #define D_TEMP(f, a...) IL_DBG(IL_DL_TEMP, f, ## a)
| ^~~~~~
drivers/net/wireless/intel/iwlegacy/4965.c:1674:4: note: in expansion of macro 'D_TEMP'
1674 | D_TEMP("Temperature changed " "from %dC to %dC\n",
| ^~~~~~
drivers/net/wireless/intel/iwlegacy/4965.c:1674:41: note: format string is defined here
1674 | D_TEMP("Temperature changed " "from %dC to %dC\n",
| ~^
| |
| int
| %ld
In file included from include/linux/device.h:15,
from include/linux/pci.h:37,
from drivers/net/wireless/intel/iwlegacy/4965.c:14:drivers/net/wireless/intel/iwlegacy/common.h:2928:32: warning: format '%d' expects argument of type 'int', but argument 6 has type 'long int' [-Wformat=]
2928 | dev_err(&il->hw->wiphy->dev, "%c %s " fmt, \
| ^~~~~~~~include/linux/dev_printk.h:19:22: note: in definition of macro 'dev_fmt'
19 | #define dev_fmt(fmt) fmt
| ^~~drivers/net/wireless/intel/iwlegacy/common.h:2928:3: note: in expansion of macro 'dev_err'
2928 | dev_err(&il->hw->wiphy->dev, "%c %s " fmt, \
| ^~~~~~~
drivers/net/wireless/intel/iwlegacy/common.h:3027:26: note: in expansion of macro 'IL_DBG'
3027 | #define D_TEMP(f, a...) IL_DBG(IL_DL_TEMP, f, ## a)
| ^~~~~~
drivers/net/wireless/intel/iwlegacy/4965.c:1674:4: note: in expansion of macro 'D_TEMP'
1674 | D_TEMP("Temperature changed " "from %dC to %dC\n",
| ^~~~~~
drivers/net/wireless/intel/iwlegacy/4965.c:1674:48: note: format string is defined here
1674 | D_TEMP("Temperature changed " "from %dC to %dC\n",
| ~^
| |
| int
| %ld
In file included from include/linux/device.h:15,
from include/linux/pci.h:37,
from drivers/net/wireless/intel/iwlegacy/4965.c:14:drivers/net/wireless/intel/iwlegacy/common.h:2928:32: warning: format '%d' expects argument of type 'int', but argument 5 has type 'long int' [-Wformat=]
2928 | dev_err(&il->hw->wiphy->dev, "%c %s " fmt, \
| ^~~~~~~~include/linux/dev_printk.h:19:22: note: in definition of macro 'dev_fmt'
19 | #define dev_fmt(fmt) fmt
| ^~~drivers/net/wireless/intel/iwlegacy/common.h:2928:3: note: in expansion of macro 'dev_err'
2928 | dev_err(&il->hw->wiphy->dev, "%c %s " fmt, \
| ^~~~~~~
drivers/net/wireless/intel/iwlegacy/common.h:3027:26: note: in expansion of macro 'IL_DBG'
3027 | #define D_TEMP(f, a...) IL_DBG(IL_DL_TEMP, f, ## a)
| ^~~~~~
drivers/net/wireless/intel/iwlegacy/4965.c:1678:4: note: in expansion of macro 'D_TEMP'
1678 | D_TEMP("Temperature " "initialized to %dC\n",
| ^~~~~~
drivers/net/wireless/intel/iwlegacy/4965.c:1678:43: note: format string is defined here
1678 | D_TEMP("Temperature " "initialized to %dC\n",
| ~^
| |
| int
| %ldPresumably introduced by commit
7a24660b5c25 ("iwlegacy: use <linux/units.h> helpers")
Signature · 2 lines
Cheers, Stephen Rothwell
PATCH 1/1 iwlwifi: fix build warnings with format string
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'.
--- drivers/net/wireless/intel/iwlegacy/4965.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlegacy/4965.c +3 -3
@@ -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)); }
Signature · 1 line
2.7.4
Re: [PATCH] iwlwifi: fix build warnings with format string
(please cc linux-wireless on all wireless patches)
Quoted 11 lines · Akinobu Mita
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 <[email protected]>Cc Kalle Valo <[email protected]>Cc Stanislaw Gruszka <[email protected]>Signed-off-by Akinobu Mita <[email protected]>
I don't know what's Andrew's workflow, but shouldn't the original patch be fixed instead?
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches