[PATCH 5.10 1/1] usb: hso: remove the bailout parameter

[PATCH 5.10 1/1] usb: hso: remove the bailout parameter

[Ovidiu Panait]

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>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
Backport this cleanup patch to 5.10 and 5.14 in order to keep the
codebase consistent with the following 4.14/4.19/5.4 patchseries:
[4.14] https://lore.kernel.org/stable/20210928151544.270412-1-ovidiu.panait@windriver.com/T/#m3212ee8701e6e6a532c681e26aa557a324628577
[4.19] https://lore.kernel.org/stable/20210928143001.202223-1-ovidiu.panait@windriver.com/T/#mfc27ef6f6bb647d051f27ebc6ea19a423e8b67cc
[5.4] https://lore.kernel.org/stable/YVNs%2FmLb9YXNz7G+@eldamar.lan/T/#m5a020c3314a5e1c686f923efdf6fdb6a6aa90652

 drivers/net/usb/hso.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index f269337c82c5..6940fbe4f096 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2354,7 +2354,7 @@ static int remove_net_device(struct hso_device *hso_dev)
 }
 
 /* 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 hso_device *hso_dev, bool bailout)
 	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);
@@ -3139,7 +3139,7 @@ static void hso_free_interface(struct usb_interface *interface)
 				rfkill_unregister(rfk);
 				rfkill_destroy(rfk);
 			}
-			hso_free_net_device(network_table[i], false);
+			hso_free_net_device(network_table[i]);
 		}
 	}
 }
-- 
2.25.1

[PATCH 5.14 1/1] usb: hso: remove the bailout parameter

[Ovidiu Panait]

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>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
Backport this cleanup patch to 5.10 and 5.14 in order to keep the
codebase consistent with the following 4.14/4.19/5.4 patchseries:
[4.14] https://lore.kernel.org/stable/20210928151544.270412-1-ovidiu.panait@windriver.com/T/#m3212ee8701e6e6a532c681e26aa557a324628577
[4.19] https://lore.kernel.org/stable/20210928143001.202223-1-ovidiu.panait@windriver.com/T/#mfc27ef6f6bb647d051f27ebc6ea19a423e8b67cc
[5.4] https://lore.kernel.org/stable/YVNs%2FmLb9YXNz7G+@eldamar.lan/T/#m5a020c3314a5e1c686f923efdf6fdb6a6aa90652

 drivers/net/usb/hso.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 18e0ca85f653..bae881608f47 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2353,7 +2353,7 @@ static int remove_net_device(struct hso_device *hso_dev)
 }
 
 /* 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);
@@ -2376,7 +2376,7 @@ static void hso_free_net_device(struct hso_device *hso_dev, bool bailout)
 	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);
@@ -3138,7 +3138,7 @@ static void hso_free_interface(struct usb_interface *interface)
 				rfkill_unregister(rfk);
 				rfkill_destroy(rfk);
 			}
-			hso_free_net_device(network_table[i], false);
+			hso_free_net_device(network_table[i]);
 		}
 	}
 }
-- 
2.25.1

Re: [PATCH 5.14 1/1] usb: hso: remove the bailout parameter

[Greg KH]

On Wed, Sep 29, 2021 at 10:59:40AM +0300, Ovidiu Panait wrote:
> 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>
> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
> ---
> Backport this cleanup patch to 5.10 and 5.14 in order to keep the
> codebase consistent with the following 4.14/4.19/5.4 patchseries:
> [4.14] https://lore.kernel.org/stable/20210928151544.270412-1-ovidiu.panait@windriver.com/T/#m3212ee8701e6e6a532c681e26aa557a324628577
> [4.19] https://lore.kernel.org/stable/20210928143001.202223-1-ovidiu.panait@windriver.com/T/#mfc27ef6f6bb647d051f27ebc6ea19a423e8b67cc
> [5.4] https://lore.kernel.org/stable/YVNs%2FmLb9YXNz7G+@eldamar.lan/T/#m5a020c3314a5e1c686f923efdf6fdb6a6aa90652

Ick, but ok, now queued up....

greg k-h