aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-03-30 18:43:50 +0200
committerGuido Guenther <agx@bogon.sigxcpu.org>2007-03-31 13:24:47 +0200
commite7d3ff24b32a6ab060fa80dc063ceba354cb7972 (patch)
treedf94fbbecb7497427d34cf13f808809117ab6fbc
parent0e9e604a5b4cd0fb094beedd03b494ba4a79eb73 (diff)
less generic name for wait_completion
(for better oops readability)
-rw-r--r--at76_usb.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/at76_usb.c b/at76_usb.c
index f190337..05c1c80 100644
--- a/at76_usb.c
+++ b/at76_usb.c
@@ -863,7 +863,7 @@ static const char *get_cmd_status_string(u8 cmd_status)
}
/* TODO: should timeout */
-static int wait_completion(struct at76c503 *dev, int cmd)
+static int at76_wait_completion(struct at76c503 *dev, int cmd)
{
struct net_device *netdev = dev->netdev;
int status = 0;
@@ -912,9 +912,9 @@ static int set_mib(struct at76c503 *dev, struct set_mib_buffer *buf)
sizeof(struct at76c503_command) +
buf->size + 4, USB_CTRL_GET_TIMEOUT);
if (ret >= 0)
- if ((ret = wait_completion(dev, CMD_SET_MIB)) !=
+ if ((ret = at76_wait_completion(dev, CMD_SET_MIB)) !=
CMD_STATUS_COMPLETE) {
- info("%s: set_mib: wait_completion failed with %d", dev->netdev->name, ret);
+ info("%s: set_mib: at76_wait_completion failed with %d", dev->netdev->name, ret);
ret = -156; /* ??? */
}
kfree(cmd_buf);
@@ -2272,7 +2272,7 @@ static void at76_devent(struct work_struct *work)
goto end_startibss;
}
- ret = wait_completion(dev, CMD_START_IBSS);
+ ret = at76_wait_completion(dev, CMD_START_IBSS);
if (ret != CMD_STATUS_COMPLETE) {
err("%s start_ibss failed to complete,%d",
dev->netdev->name, ret);
@@ -2325,7 +2325,7 @@ end_startibss:
goto end_join;
}
- ret = wait_completion(dev, CMD_JOIN);
+ ret = at76_wait_completion(dev, CMD_JOIN);
if (ret != CMD_STATUS_COMPLETE) {
if (ret != CMD_STATUS_TIME_OUT)
err("%s join_bss completed with %d",
@@ -4331,13 +4331,13 @@ static int startup_device(struct at76c503 *dev)
return ret;
}
- wait_completion(dev, CMD_STARTUP);
+ at76_wait_completion(dev, CMD_STARTUP);
/* remove BSSID from previous run */
memset(dev->bssid, 0, ETH_ALEN);
if (set_radio(dev, 1) == 1)
- wait_completion(dev, CMD_RADIO);
+ at76_wait_completion(dev, CMD_RADIO);
if ((ret = set_preamble(dev, dev->preamble_type)) < 0)
return ret;