The following commit has been merged in the linux branch: commit 886e71de1f889adadb1065b1a83b0e64625fb716 Author: Reinette Chatre reinette.chatre@intel.com Date: Fri Oct 2 13:44:07 2009 -0700

iwlagn: fix compile warning in iwl5000_gain_computation

The return type of abs() was recently changed from int to long. With min()'s type checking we thus need to make sure that values of the same type are compared.

This fixes:

CC [M] drivers/net/wireless/iwlwifi/iwl-5000.o drivers/net/wireless/iwlwifi/iwl-5000.c: In function ‘iwl5000_gain_computation’: drivers/net/wireless/iwlwifi/iwl-5000.c:320: warning: comparison of distinct pointer types lacks a cast

Signed-off-by: Reinette Chatre reinette.chatre@intel.com Reported-by: Marcel Holtmann marcel@holtmann.org Signed-off-by: John W. Linville linville@tuxdriver.com

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index eb08f44..524e7e4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c @@ -317,7 +317,7 @@ static void iwl5000_gain_computation(struct iwl_priv *priv, (s32)average_noise[i])) / 1500; /* bound gain by 2 bits value max, 3rd bit is sign */ data->delta_gain_code[i] = - min(abs(delta_g), CHAIN_NOISE_MAX_DELTA_GAIN_CODE); + min(abs(delta_g), (long) CHAIN_NOISE_MAX_DELTA_GAIN_CODE);

if (delta_g < 0) /* set negative sign */