| Message ID | 1498464091-26753-4-git-send-email-amit.pundir@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Stable commits picked up from lede project | expand |
On Mon, Jun 26, 2017 at 01:31:27PM +0530, Amit Pundir wrote: > From: Stanislaw Gruszka <sgruszka@redhat.com> > > commit 6232c17438ed01f43665197db5a98a4a4f77ef47 upstream. > > As reported by Felix: > > Though protected by an ifdef, introducing an usb symbol dependency in > the rt2x00lib module is a major inconvenience for distributions that > package kernel modules split into individual packages. > > Get rid of this unnecessary dependency by calling the usb related > function from a more suitable place. > > Cc: Vishal Thanki <vishalthanki@gmail.com> > Reported-by: Felix Fietkau <nbd@nbd.name> > Fixes: 8b4c0009313f ("rt2x00usb: Use usb anchor to manage URB") > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> > Signed-off-by: Amit Pundir <amit.pundir@linaro.org> > --- > drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 23 ++++++++--------------- > drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 5 +++++ > 2 files changed, 13 insertions(+), 15 deletions(-) I keep skipping this patch, but people keep submitting it, so I might as well give in and take it this time :) thanks, greg k-h
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c index b7273be9303d..c8d9075339cf 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c @@ -1422,21 +1422,6 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) cancel_work_sync(&rt2x00dev->intf_work); cancel_delayed_work_sync(&rt2x00dev->autowakeup_work); cancel_work_sync(&rt2x00dev->sleep_work); -#if IS_ENABLED(CONFIG_RT2X00_LIB_USB) - if (rt2x00_is_usb(rt2x00dev)) { - usb_kill_anchored_urbs(rt2x00dev->anchor); - hrtimer_cancel(&rt2x00dev->txstatus_timer); - cancel_work_sync(&rt2x00dev->rxdone_work); - cancel_work_sync(&rt2x00dev->txdone_work); - } -#endif - if (rt2x00dev->workqueue) - destroy_workqueue(rt2x00dev->workqueue); - - /* - * Free the tx status fifo. - */ - kfifo_free(&rt2x00dev->txstatus_fifo); /* * Kill the tx status tasklet. @@ -1452,6 +1437,14 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) */ rt2x00lib_uninitialize(rt2x00dev); + if (rt2x00dev->workqueue) + destroy_workqueue(rt2x00dev->workqueue); + + /* + * Free the tx status fifo. + */ + kfifo_free(&rt2x00dev->txstatus_fifo); + /* * Free extra components */ diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c index 662705e31136..631df690adbe 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c @@ -740,6 +740,11 @@ void rt2x00usb_uninitialize(struct rt2x00_dev *rt2x00dev) { struct data_queue *queue; + usb_kill_anchored_urbs(rt2x00dev->anchor); + hrtimer_cancel(&rt2x00dev->txstatus_timer); + cancel_work_sync(&rt2x00dev->rxdone_work); + cancel_work_sync(&rt2x00dev->txdone_work); + queue_for_each(rt2x00dev, queue) rt2x00usb_free_entries(queue); }