| Message ID | a294f5f3af7e29212a27cc7d17503fba346266b5.1672864635.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] fjes: Fix an error handling path in fjes_probe() | expand |
Wed, Jan 04, 2023 at 09:40:47PM CET, christophe.jaillet@wanadoo.fr wrote: >free_netdev() already calls netif_napi_del(), no need to call it >explicitly. >It's harmless, but useless. > >Remove the call, make the error handling path of the probe and the remove >function be consistent one with the other. > >Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Jiri Pirko <jiri@nvidia.com>
diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c index 5805e4a56385..db9c0da82f33 100644 --- a/drivers/net/fjes/fjes_main.c +++ b/drivers/net/fjes/fjes_main.c @@ -1324,8 +1324,6 @@ static int fjes_remove(struct platform_device *plat_dev) fjes_hw_exit(hw); - netif_napi_del(&adapter->napi); - free_netdev(netdev); return 0;
free_netdev() already calls netif_napi_del(), no need to call it explicitly. It's harmless, but useless. Remove the call, make the error handling path of the probe and the remove function be consistent one with the other. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- Change in v2: - Leave the error handling path of the probe as-is, and simplify the remove function instead. - Removes the Fixes tag. It's finally not at fix, just a consistency issue. (was Fixes: 265859309a76 ("fjes: NAPI polling function")) - As a consequence, target net-next instead of net, now. v1: https://lore.kernel.org/all/fde673f106d2b264ad76759195901aae94691b5c.1671569785.git.christophe.jaillet@wanadoo.fr/ --- drivers/net/fjes/fjes_main.c | 2 -- 1 file changed, 2 deletions(-)