From: Zhaoxiu Zeng <zhaoxiu.z...@gmail.com> Signed-off-by: Zhaoxiu Zeng <zhaoxiu.z...@gmail.com> --- drivers/net/ethernet/broadcom/tg3.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 3010080..802a429 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -12939,11 +12939,7 @@ static int tg3_test_nvram(struct tg3 *tp) err = -EIO; for (i = 0; i < NVRAM_SELFBOOT_DATA_SIZE; i++) { - u8 hw8 = hweight8(data[i]); - - if ((hw8 & 0x1) && parity[i]) - goto out; - else if (!(hw8 & 0x1) && !parity[i]) + if (parity8(data[i]) == !!parity[i]) goto out; } err = 0; -- 2.5.0