| Message ID | 20220513075611.1972-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b321dfafb0b99e285d14bcaae00b4f9093556eb6 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,net-next] net: wwan: t7xx: Fix return type of t7xx_dl_add_timedout() | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 13 May 2022 15:56:11 +0800 you wrote: > t7xx_dl_add_timedout() now return int 'ret', but the return type > is bool. Change the return type to int for furthor errcode upstream. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > v2: Remove unneeded ret variable > > [...] Here is the summary with links: - [v2,net-next] net: wwan: t7xx: Fix return type of t7xx_dl_add_timedout() https://git.kernel.org/netdev/net-next/c/b321dfafb0b9 You are awesome, thank you!
diff --git a/drivers/net/wwan/t7xx/t7xx_dpmaif.c b/drivers/net/wwan/t7xx/t7xx_dpmaif.c index c8bf6929af51..6d3edadecbec 100644 --- a/drivers/net/wwan/t7xx/t7xx_dpmaif.c +++ b/drivers/net/wwan/t7xx/t7xx_dpmaif.c @@ -1043,15 +1043,13 @@ unsigned int t7xx_dpmaif_dl_dlq_pit_get_wr_idx(struct dpmaif_hw_info *hw_info, return value & DPMAIF_DL_RD_WR_IDX_MSK; } -static bool t7xx_dl_add_timedout(struct dpmaif_hw_info *hw_info) +static int t7xx_dl_add_timedout(struct dpmaif_hw_info *hw_info) { u32 value; - int ret; - ret = ioread32_poll_timeout_atomic(hw_info->pcie_base + DPMAIF_DL_BAT_ADD, + return ioread32_poll_timeout_atomic(hw_info->pcie_base + DPMAIF_DL_BAT_ADD, value, !(value & DPMAIF_DL_ADD_NOT_READY), 0, DPMAIF_CHECK_TIMEOUT_US); - return ret; } int t7xx_dpmaif_dl_snd_hw_bat_cnt(struct dpmaif_hw_info *hw_info, unsigned int bat_entry_cnt)
t7xx_dl_add_timedout() now return int 'ret', but the return type is bool. Change the return type to int for furthor errcode upstream. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- v2: Remove unneeded ret variable --- drivers/net/wwan/t7xx/t7xx_dpmaif.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)