system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-21 03:28:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: ipa: ipa_stop() does not return an error

Browse source 
In ipa_modem_stop(), if the modem netdev pointer is non-null we call
ipa_stop().  We check for an error and if one is returned we handle
it.  But ipa_stop() never returns an error, so this extra handling
is unnecessary.  Simplify the code in ipa_modem_stop() based on the
knowledge no error handling is needed at this spot.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Alex Elder 2021-04-09 13:07:19 -05:00 committed by Jakub Kicinski
parent 57f63faf05
commit 077e770f26
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/ipa/ipa_modem.c
View file

@ -240,7 +240,6 @@ int ipa_modem_stop(struct ipa *ipa)
{ {
struct net_device *netdev = ipa->modem_netdev; struct net_device *netdev = ipa->modem_netdev;
enum ipa_modem_state state; enum ipa_modem_state state;
int ret;
/* Only attempt to stop the modem if it's running */ /* Only attempt to stop the modem if it's running */
state = atomic_cmpxchg(&ipa->modem_state, IPA_MODEM_STATE_RUNNING, state = atomic_cmpxchg(&ipa->modem_state, IPA_MODEM_STATE_RUNNING,
@ -257,29 +256,20 @@ int ipa_modem_stop(struct ipa *ipa)
/* Prevent the modem from triggering a call to ipa_setup() */ /* Prevent the modem from triggering a call to ipa_setup() */
ipa_smp2p_disable(ipa); ipa_smp2p_disable(ipa);
/* Stop the queue and disable the endpoints if it's open */
if (netdev) { if (netdev) {
/* Stop the queue and disable the endpoints if it's open */ (void)ipa_stop(netdev);
ret = ipa_stop(netdev);
if (ret)
goto out_set_state;
ipa->name_map[IPA_ENDPOINT_AP_MODEM_RX]->netdev = NULL; ipa->name_map[IPA_ENDPOINT_AP_MODEM_RX]->netdev = NULL;
ipa->name_map[IPA_ENDPOINT_AP_MODEM_TX]->netdev = NULL; ipa->name_map[IPA_ENDPOINT_AP_MODEM_TX]->netdev = NULL;
ipa->modem_netdev = NULL; ipa->modem_netdev = NULL;
unregister_netdev(netdev); unregister_netdev(netdev);
free_netdev(netdev); free_netdev(netdev);
} else {
ret = 0;
} }
out_set_state: atomic_set(&ipa->modem_state, IPA_MODEM_STATE_STOPPED);
if (ret)
atomic_set(&ipa->modem_state, IPA_MODEM_STATE_RUNNING);
else
atomic_set(&ipa->modem_state, IPA_MODEM_STATE_STOPPED);
smp_mb__after_atomic(); smp_mb__after_atomic();
return ret; return 0;
} }
/* Treat a "clean" modem stop the same as a crash */ /* Treat a "clean" modem stop the same as a crash */