[PATCH 2/4] prism54: remove questionable down_interruptible usage

Daniel Walker
2007-12-21T21:14:22Z

[-- Attachment #1: wireless-prism54-fix-down_interruptible-usage.patch --]
[-- Type: text/plain, Size: 1781 bytes --]

Reviewing the semaphore usage I noticed these down_interruptible
calls. Most of these aren't returning anything, so a caller can't
tell if the operation completed or not. prism54_wpa_bss_ie_get()
returns zero, but it's treated as the function failing which doesn't
seem correct.

Signed-off-by: Daniel Walker <dwalker@mvista.com>
---
drivers/net/wireless/prism54/isl_ioctl.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)

Index: linux-2.6.23/drivers/net/wireless/prism54/isl_ioctl.c
===================================================================
--- linux-2.6.23.orig/drivers/net/wireless/prism54/isl_ioctl.c
+++ linux-2.6.23/drivers/net/wireless/prism54/isl_ioctl.c
@@ -165,8 +165,7 @@ prism54_update_stats(struct work_struct
struct obj_bss bss, *bss2;
union oid_res_t r;

- if (down_interruptible(&priv->stats_sem))
- return;
+ down(&priv->stats_sem);

/* Noise floor.
* I'm not sure if the unit is dBm.
@@ -1793,8 +1792,7 @@ prism54_clear_mac(struct islpci_acl *acl
struct list_head *ptr, *next;
struct mac_entry *entry;

- if (down_interruptible(&acl->sem))
- return;
+ down(&acl->sem);

if (acl->size == 0) {
up(&acl->sem);
@@ -2116,8 +2114,7 @@ prism54_wpa_bss_ie_add(islpci_private *p
if (wpa_ie_len > MAX_WPA_IE_LEN)
wpa_ie_len = MAX_WPA_IE_LEN;

- if (down_interruptible(&priv->wpa_sem))
- return;
+ down(&priv->wpa_sem);

/* try to use existing entry */
list_for_each(ptr, &priv->bss_wpa_list) {
@@ -2178,8 +2175,7 @@ prism54_wpa_bss_ie_get(islpci_private *p
struct islpci_bss_wpa_ie *bss = NULL;
size_t len = 0;

- if (down_interruptible(&priv->wpa_sem))
- return 0;
+ down(&priv->wpa_sem);

list_for_each(ptr, &priv->bss_wpa_list) {
bss = list_entry(ptr, struct islpci_bss_wpa_ie, list);

--