[folded-merged] iwlegacy-use-linux-unitsh-helpers-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: iwlegacy: fix build warnings with format string
has been removed from the -mm tree.  Its filename was
     iwlegacy-use-linux-unitsh-helpers-fix.patch

This patch was dropped because it was folded into iwlegacy-use-linux-unitsh-helpers.patch

------------------------------------------------------
From: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Subject: iwlegacy: 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'.

Link: http://lkml.kernel.org/r/1579014483-9226-1-git-send-email-akinobu.mita@xxxxxxxxx
Link: https://lore.kernel.org/r/20200106171452.201c3b4c@xxxxxxxxxxxxxxxx
Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Kalle Valo <kvalo@xxxxxxxxxxxxxx>
Cc: Stanislaw Gruszka <stf_xl@xxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/net/wireless/intel/iwlegacy/4965.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/net/wireless/intel/iwlegacy/4965.c~iwlegacy-use-linux-unitsh-helpers-fix
+++ a/drivers/net/wireless/intel/iwlegacy/4965.c
@@ -1611,7 +1611,7 @@ il4965_hw_get_temperature(struct il_priv
 	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
 
 	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));
 	}
 
_

Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are

add-helpers-for-kelvin-to-from-celsius-conversion.patch
acpi-thermal-switch-to-use-linux-unitsh-helpers.patch
platform-x86-asus-wmi-switch-to-use-linux-unitsh-helpers.patch
platform-x86-intel_menlow-switch-to-use-linux-unitsh-helpers.patch
thermal-int340x-switch-to-use-linux-unitsh-helpers.patch
thermal-intel_pch-switch-to-use-linux-unitsh-helpers.patch
nvme-hwmon-switch-to-use-linux-unitsh-helpers.patch
thermal-remove-kelvin-to-from-celsius-conversion-helpers-from-linux-thermalh.patch
iwlegacy-use-linux-unitsh-helpers.patch
iwlwifi-use-linux-unitsh-helpers.patch
thermal-armada-remove-unused-to_mcelsius-macro.patch
iio-adc-qcom-vadc-common-use-linux-unitsh-helpers.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux