Commit a50d37b7 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: don't use u32p_replace_bits() 



In two spots we use u32_replace_bits() to replace a set of bits in a
register while preserving the rest.  Both of those cases just zero
the bits being replaced, and this can be done more simply without
using that function.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4dfa5f05

drivers/net/ipa/ipa_table.c

+2 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ static void ipa_filter_tuple_zero(struct ipa_endpoint *endpoint) 
	val = ioread32(endpoint->ipa->reg_virt + offset);



	/* Zero all filter-related fields, preserving the rest */

	u32p_replace_bits(&val, 0, IPA_REG_ENDP_FILTER_HASH_MSK_ALL);

	val &= ~IPA_REG_ENDP_FILTER_HASH_MSK_ALL;



	iowrite32(val, endpoint->ipa->reg_virt + offset);

}
@@ -571,7 +571,7 @@ static void ipa_route_tuple_zero(struct ipa *ipa, u32 route_id) 
	val = ioread32(ipa->reg_virt + offset);



	/* Zero all route-related fields, preserving the rest */

	u32p_replace_bits(&val, 0, IPA_REG_ENDP_ROUTER_HASH_MSK_ALL);

	val &= ~IPA_REG_ENDP_ROUTER_HASH_MSK_ALL;



	iowrite32(val, ipa->reg_virt + offset);

}