bcm43xx: replace limit_value macro with clamp_val

index 2ebd2ed..dc956b4 100644
@@ -978,20 +978,4 @@ int bcm43xx_pci_write_config32(struct bcm43xx_private *bcm, int offset, u32 valu
 	return pci_write_config_dword(bcm->pci_dev, offset, value);
 }
 
-/** Limit a value between two limits */
-#ifdef limit_value
-# undef limit_value
-#endif
-#define limit_value(value, min, max)  \
-	({						\
-		typeof(value) __value = (value);	\
-	 	typeof(value) __min = (min);		\
-	 	typeof(value) __max = (max);		\
-	 	if (__value < __min)			\
-	 		__value = __min;		\
-	 	else if (__value > __max)		\
-	 		__value = __max;		\
-	 	__value;				\
-	})
-
 #endif /* BCM43xx_H_ */

index b96a325..67d8765 100644
@@ -1494,10 +1494,10 @@ static void handle_irq_noise(struct bcm43xx_private *bcm)
 	/* Get the noise samples. */
 	assert(bcm->noisecalc.nr_samples < 8);
 	i = bcm->noisecalc.nr_samples;
-	noise[0] = limit_value(noise[0], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
-	noise[1] = limit_value(noise[1], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
-	noise[2] = limit_value(noise[2], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
-	noise[3] = limit_value(noise[3], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
+	noise[0] = clamp_val(noise[0], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
+	noise[1] = clamp_val(noise[1], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
+	noise[2] = clamp_val(noise[2], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
+	noise[3] = clamp_val(noise[3], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);
 	bcm->noisecalc.samples[i][0] = radio->nrssi_lt[noise[0]];
 	bcm->noisecalc.samples[i][1] = radio->nrssi_lt[noise[1]];
 	bcm->noisecalc.samples[i][2] = radio->nrssi_lt[noise[2]];

@@ -2854,9 +2854,9 @@ static int bcm43xx_wireless_core_init(struct bcm43xx_private *bcm,
 	 * The retry-limit is a 4-bit counter. Enforce this to avoid overflowing
 	 * the chip-internal counter.
 	 */
-	limit = limit_value(modparam_short_retry, 0, 0xF);
+	limit = clamp_val(modparam_short_retry, 0, 0xF);
 	bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0006, limit);
-	limit = limit_value(modparam_long_retry, 0, 0xF);
+	limit = clamp_val(modparam_long_retry, 0, 0xF);
 	bcm43xx_shm_write32(bcm, BCM43xx_SHM_WIRELESS, 0x0007, limit);
 
 	bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0044, 3);

index af3de33..1d909ed 100644
@@ -1265,7 +1265,7 @@ static void bcm43xx_phy_initg(struct bcm43xx_private *bcm)
 		 * the value 0x7FFFFFFF here. I think that is some weird
 		 * compiler optimization in the original driver.
 		 * Essentially, what we do here is resetting all NRSSI LT
-		 * entries to -32 (see the limit_value() in nrssi_hw_update())
+		 * entries to -32 (see the clamp_val() in nrssi_hw_update())
 		 */
 		bcm43xx_nrssi_hw_update(bcm, 0xFFFF);
 		bcm43xx_calc_nrssi_threshold(bcm);

@@ -1908,13 +1908,13 @@ static s8 bcm43xx_phy_estimate_power_out(struct bcm43xx_private *bcm, s8 tssi)
 	switch (phy->type) {
 		case BCM43xx_PHYTYPE_A:
 			tmp += 0x80;
-			tmp = limit_value(tmp, 0x00, 0xFF);
+			tmp = clamp_val(tmp, 0x00, 0xFF);
 			dbm = phy->tssi2dbm[tmp];
 			TODO(); //TODO: There's a FIXME on the specs
 			break;
 		case BCM43xx_PHYTYPE_B:
 		case BCM43xx_PHYTYPE_G:
-			tmp = limit_value(tmp, 0x00, 0x3F);
+			tmp = clamp_val(tmp, 0x00, 0x3F);
 			dbm = phy->tssi2dbm[tmp];
 			break;
 		default:

@@ -1998,7 +1998,7 @@ void bcm43xx_phy_xmitpower(struct bcm43xx_private *bcm)
 			where REG is the max power as per the regulatory domain
 		*/
 
-		desired_pwr = limit_value(radio->txpower_desired, 0, max_pwr);
+		desired_pwr = clamp_val(radio->txpower_desired, 0, max_pwr);
 		/* Check if we need to adjust the current power. */
 		pwr_adjust = desired_pwr - estimated_pwr;
 		radio_att_delta = -(pwr_adjust + 7) >> 3;

@@ -2034,7 +2034,7 @@ void bcm43xx_phy_xmitpower(struct bcm43xx_private *bcm)
 				radio_attenuation++;
 			}
 		}
-		baseband_attenuation = limit_value(baseband_attenuation, 0, 11);
+		baseband_attenuation = clamp_val(baseband_attenuation, 0, 11);
 
 		txpower = radio->txctl1;
 		if ((radio->version == 0x2050) && (radio->revision == 2)) {

@@ -2059,8 +2059,8 @@ void bcm43xx_phy_xmitpower(struct bcm43xx_private *bcm)
 			}
 		}
 		radio->txctl1 = txpower;
-		baseband_attenuation = limit_value(baseband_attenuation, 0, 11);
-		radio_attenuation = limit_value(radio_attenuation, 0, 9);
+		baseband_attenuation = clamp_val(baseband_attenuation, 0, 11);
+		radio_attenuation = clamp_val(radio_attenuation, 0, 9);
 
 		bcm43xx_phy_lock(bcm, phylock_flags);
 		bcm43xx_radio_lock(bcm);

@@ -2102,7 +2102,7 @@ s8 bcm43xx_tssi2dbm_entry(s8 entry [], u8 index, s16 pab0, s16 pab1, s16 pab2)
 		f = q;
 		i++;
 	} while (delta >= 2);
-	entry[index] = limit_value(bcm43xx_tssi2dbm_ad(m1 * f, 8192), -127, 128);
+	entry[index] = clamp_val(bcm43xx_tssi2dbm_ad(m1 * f, 8192), -127, 128);
 	return 0;
 }
 

index c605099..2a05b67 100644
@@ -343,7 +343,7 @@ void bcm43xx_nrssi_hw_update(struct bcm43xx_private *bcm, u16 val)
 	for (i = 0; i < 64; i++) {
 		tmp = bcm43xx_nrssi_hw_read(bcm, i);
 		tmp -= val;
-		tmp = limit_value(tmp, -32, 31);
+		tmp = clamp_val(tmp, -32, 31);
 		bcm43xx_nrssi_hw_write(bcm, i, tmp);
 	}
 }

@@ -360,7 +360,7 @@ void bcm43xx_nrssi_mem_update(struct bcm43xx_private *bcm)
 		tmp = (i - delta) * radio->nrssislope;
 		tmp /= 0x10000;
 		tmp += 0x3A;
-		tmp = limit_value(tmp, 0, 0x3F);
+		tmp = clamp_val(tmp, 0, 0x3F);
 		radio->nrssi_lt[i] = tmp;
 	}
 }

@@ -801,7 +801,7 @@ void bcm43xx_calc_nrssi_threshold(struct bcm43xx_private *bcm)
 		} else
 			threshold = radio->nrssi[1] - 5;
 
-		threshold = limit_value(threshold, 0, 0x3E);
+		threshold = clamp_val(threshold, 0, 0x3E);
 		bcm43xx_phy_read(bcm, 0x0020); /* dummy read */
 		bcm43xx_phy_write(bcm, 0x0020, (((u16)threshold) << 8) | 0x001C);
 

@@ -851,7 +851,7 @@ void bcm43xx_calc_nrssi_threshold(struct bcm43xx_private *bcm)
 			else
 				a += 32;
 			a = a >> 6;
-			a = limit_value(a, -31, 31);
+			a = clamp_val(a, -31, 31);
 
 			b = b * (radio->nrssi[1] - radio->nrssi[0]);
 			b += (radio->nrssi[0] << 6);

@@ -860,7 +860,7 @@ void bcm43xx_calc_nrssi_threshold(struct bcm43xx_private *bcm)
 			else
 				b += 32;
 			b = b >> 6;
-			b = limit_value(b, -31, 31);
+			b = clamp_val(b, -31, 31);
 
 			tmp_u16 = bcm43xx_phy_read(bcm, 0x048A) & 0xF000;
 			tmp_u16 |= ((u32)b & 0x0000003F);

@@ -1919,7 +1919,7 @@ void bcm43xx_radio_set_txpower_a(struct bcm43xx_private *bcm, u16 txpower)
 	struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
 	u16 pamp, base, dac, ilt;
 
-	txpower = limit_value(txpower, 0, 63);
+	txpower = clamp_val(txpower, 0, 63);
 
 	pamp = bcm43xx_get_txgain_freq_power_amp(txpower);
 	pamp <<= 5;

index 6acfdc4..c5d9aca 100644
@@ -466,7 +466,7 @@ static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev,
 			maxpower = bcm->sprom.maxpower_aphy;
 		else
 			maxpower = bcm->sprom.maxpower_bgphy;
-		radio->txpower_desired = limit_value(data->txpower.value << 2,
+		radio->txpower_desired = clamp_val(data->txpower.value << 2,
 						     0, maxpower);
 		bcm43xx_phy_xmitpower(bcm);
 	}