mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 14:21:47 +00:00
staging: wlan-ng: use list_for_each_entry*
Use list_for_each_entry*() instead of list_for_each*() to simplify the code. Signed-off-by: Geliang Tang <geliangtang@163.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
6c37e1f957
commit
57477bf0d9
@ -2810,8 +2810,7 @@ void hfa384x_tx_timeout(wlandevice_t *wlandev)
|
||||
static void hfa384x_usbctlx_reaper_task(unsigned long data)
|
||||
{
|
||||
hfa384x_t *hw = (hfa384x_t *)data;
|
||||
struct list_head *entry;
|
||||
struct list_head *temp;
|
||||
hfa384x_usbctlx_t *ctlx, *temp;
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&hw->ctlxq.lock, flags);
|
||||
@ -2819,10 +2818,7 @@ static void hfa384x_usbctlx_reaper_task(unsigned long data)
|
||||
/* This list is guaranteed to be empty if someone
|
||||
* has unplugged the adapter.
|
||||
*/
|
||||
list_for_each_safe(entry, temp, &hw->ctlxq.reapable) {
|
||||
hfa384x_usbctlx_t *ctlx;
|
||||
|
||||
ctlx = list_entry(entry, hfa384x_usbctlx_t, list);
|
||||
list_for_each_entry_safe(ctlx, temp, &hw->ctlxq.reapable, list) {
|
||||
list_del(&ctlx->list);
|
||||
kfree(ctlx);
|
||||
}
|
||||
@ -2847,8 +2843,7 @@ static void hfa384x_usbctlx_reaper_task(unsigned long data)
|
||||
static void hfa384x_usbctlx_completion_task(unsigned long data)
|
||||
{
|
||||
hfa384x_t *hw = (hfa384x_t *)data;
|
||||
struct list_head *entry;
|
||||
struct list_head *temp;
|
||||
hfa384x_usbctlx_t *ctlx, *temp;
|
||||
unsigned long flags;
|
||||
|
||||
int reap = 0;
|
||||
@ -2858,11 +2853,7 @@ static void hfa384x_usbctlx_completion_task(unsigned long data)
|
||||
/* This list is guaranteed to be empty if someone
|
||||
* has unplugged the adapter ...
|
||||
*/
|
||||
list_for_each_safe(entry, temp, &hw->ctlxq.completing) {
|
||||
hfa384x_usbctlx_t *ctlx;
|
||||
|
||||
ctlx = list_entry(entry, hfa384x_usbctlx_t, list);
|
||||
|
||||
list_for_each_entry_safe(ctlx, temp, &hw->ctlxq.completing, list) {
|
||||
/* Call the completion function that this
|
||||
* command was assigned, assuming it has one.
|
||||
*/
|
||||
|
@ -139,8 +139,7 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface)
|
||||
wlandev = (wlandevice_t *)usb_get_intfdata(interface);
|
||||
if (wlandev != NULL) {
|
||||
LIST_HEAD(cleanlist);
|
||||
struct list_head *entry;
|
||||
struct list_head *temp;
|
||||
hfa384x_usbctlx_t *ctlx, *temp;
|
||||
unsigned long flags;
|
||||
|
||||
hfa384x_t *hw = wlandev->priv;
|
||||
@ -184,12 +183,8 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface)
|
||||
* and tell everyone who is waiting for their
|
||||
* responses that we have shut down.
|
||||
*/
|
||||
list_for_each(entry, &cleanlist) {
|
||||
hfa384x_usbctlx_t *ctlx;
|
||||
|
||||
ctlx = list_entry(entry, hfa384x_usbctlx_t, list);
|
||||
list_for_each_entry(ctlx, &cleanlist, list)
|
||||
complete(&ctlx->done);
|
||||
}
|
||||
|
||||
/* Give any outstanding synchronous commands
|
||||
* a chance to complete. All they need to do
|
||||
@ -199,12 +194,8 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface)
|
||||
msleep(100);
|
||||
|
||||
/* Now delete the CTLXs, because no-one else can now. */
|
||||
list_for_each_safe(entry, temp, &cleanlist) {
|
||||
hfa384x_usbctlx_t *ctlx;
|
||||
|
||||
ctlx = list_entry(entry, hfa384x_usbctlx_t, list);
|
||||
list_for_each_entry_safe(ctlx, temp, &cleanlist, list)
|
||||
kfree(ctlx);
|
||||
}
|
||||
|
||||
/* Unhook the wlandev */
|
||||
unregister_wlandev(wlandev);
|
||||
|
Loading…
Reference in New Issue
Block a user