| From dcb713d53e2eadf42b878c12a471e74dc6ed3145 Mon Sep 17 00:00:00 2001 |
| From: Dongliang Mu <mudongliangabcd@gmail.com> |
| Date: Wed, 21 Jul 2021 16:14:57 +0800 |
| Subject: usb: hso: remove the bailout parameter |
| |
| From: Dongliang Mu <mudongliangabcd@gmail.com> |
| |
| commit dcb713d53e2eadf42b878c12a471e74dc6ed3145 upstream. |
| |
| There are two invocation sites of hso_free_net_device. After |
| refactoring hso_create_net_device, this parameter is useless. |
| Remove the bailout in the hso_free_net_device and change the invocation |
| sites of this function. |
| |
| Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| [Backport this cleanup patch to 5.10 and 5.14 in order to keep the |
| codebase consistent with the 4.14/4.19/5.4 patchseries] |
| Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/usb/hso.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/usb/hso.c |
| +++ b/drivers/net/usb/hso.c |
| @@ -2354,7 +2354,7 @@ static int remove_net_device(struct hso_ |
| } |
| |
| /* Frees our network device */ |
| -static void hso_free_net_device(struct hso_device *hso_dev, bool bailout) |
| +static void hso_free_net_device(struct hso_device *hso_dev) |
| { |
| int i; |
| struct hso_net *hso_net = dev2net(hso_dev); |
| @@ -2377,7 +2377,7 @@ static void hso_free_net_device(struct h |
| kfree(hso_net->mux_bulk_tx_buf); |
| hso_net->mux_bulk_tx_buf = NULL; |
| |
| - if (hso_net->net && !bailout) |
| + if (hso_net->net) |
| free_netdev(hso_net->net); |
| |
| kfree(hso_dev); |
| @@ -3137,7 +3137,7 @@ static void hso_free_interface(struct us |
| rfkill_unregister(rfk); |
| rfkill_destroy(rfk); |
| } |
| - hso_free_net_device(network_table[i], false); |
| + hso_free_net_device(network_table[i]); |
| } |
| } |
| } |
