diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-10-13 13:10:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-10-13 13:10:23 +1100 |
| commit | 55c123fcb77b12c42d72f4598b20f9f8b98d80ca (patch) | |
| tree | b8386a7944d646b9ed693d679cdf0c8d1b3322b2 | |
| parent | 7cc8559d847cb1bf882a0894c1c625ac0cf5abc2 (diff) | |
| parent | 2652bf614ed69d2a47d26c4c3a730b324a574f13 (diff) | |
Merge branch 'akpm/master'
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 | ||||
| -rw-r--r-- | include/linux/mlx5/device.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c index e9cef9de9ed8..c96f9b1d948a 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c @@ -900,8 +900,7 @@ static void iwlagn_gain_computation(struct iwl_priv *priv, /* bound gain by 2 bits value max, 3rd bit is sign */ data->delta_gain_code[i] = - min(abs(delta_g), - (s32) CHAIN_NOISE_MAX_DELTA_GAIN_CODE); + min(abs(delta_g), CHAIN_NOISE_MAX_DELTA_GAIN_CODE); if (delta_g < 0) /* diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h index 77c141797152..37a130eff270 100644 --- a/include/linux/mlx5/device.h +++ b/include/linux/mlx5/device.h @@ -93,8 +93,6 @@ __mlx5_mask(typ, fld)) }) #define MLX5_SET64(typ, p, fld, v) do { \ - BUILD_BUG_ON(__mlx5_bit_sz(typ, fld) != 64); \ - BUILD_BUG_ON(__mlx5_bit_off(typ, fld) % 64); \ *((__be64 *)(p) + __mlx5_64_off(typ, fld)) = cpu_to_be64(v); \ } while (0) |