From: Dongliang Mu <mudongliangabcd@gmail.com>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Johan Hovold <johan@kernel.org>,
Oliver Neukum <oneukum@suse.com>,
Anirudh Rayabharam <mail@anirudhrb.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Dongliang Mu <mudongliangabcd@gmail.com>,
YueHaibing <yuehaibing@huawei.com>,
Dan Carpenter <dan.carpenter@oracle.com>
Cc: Emil Renner Berthing <kernel@esmil.dk>,
linux-usb@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] usb: hso: remove the bailout parameter
Date: Wed, 14 Jul 2021 15:15:33 +0800 [thread overview]
Message-ID: <20210714071547.656587-2-mudongliangabcd@gmail.com> (raw)
In-Reply-To: <20210714071547.656587-1-mudongliangabcd@gmail.com>
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>
---
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 90fa4d9fa119..91cace7aa657 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);
@@ -3137,7 +3137,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
next prev parent reply other threads:[~2021-07-14 7:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 7:15 [PATCH 1/2] usb: hso: fix error handling code of hso_create_net_device Dongliang Mu
2021-07-14 7:15 ` Dongliang Mu [this message]
2021-07-14 7:22 ` Dongliang Mu
2021-07-14 7:36 ` Dan Carpenter
2021-07-14 7:59 ` Dongliang Mu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210714071547.656587-2-mudongliangabcd@gmail.com \
--to=mudongliangabcd@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=kernel@esmil.dk \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mail@anirudhrb.com \
--cc=netdev@vger.kernel.org \
--cc=oneukum@suse.com \
--cc=yuehaibing@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).