diff options
| author | Dan Williams | 2007-12-10 21:24:47 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-01-29 00:06:37 +0100 |
| commit | 852e1f2a2627274102a3c2dc70a6547aeab99cb6 (patch) | |
| tree | 6701d518c17e15b488bfe4b977d385b290d0a2d6 | |
| parent | libertas: remove pre_open_check() (diff) | |
| download | kernel-qcow2-linux-852e1f2a2627274102a3c2dc70a6547aeab99cb6.tar.gz kernel-qcow2-linux-852e1f2a2627274102a3c2dc70a6547aeab99cb6.tar.xz kernel-qcow2-linux-852e1f2a2627274102a3c2dc70a6547aeab99cb6.zip | |
libertas: clean up is_command_allowed_in_ps()
Total overkill to have an array when there's only one command in it.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/libertas/cmd.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index c7c226c09502..2efba5708041 100644 --- a/drivers/net/wireless/libertas/cmd.c +++ b/drivers/net/wireless/libertas/cmd.c @@ -19,26 +19,20 @@ void lbs_set_cmd_ctrl_node(struct lbs_private *priv, u16 wait_option, void *pdata_buf); -static u16 commands_allowed_in_ps[] = { - CMD_802_11_RSSI, -}; - /** - * @brief This function checks if the commans is allowed - * in PS mode not. + * @brief Checks whether a command is allowed in Power Save mode * * @param command the command ID - * @return TRUE or FALSE + * @return 1 if allowed, 0 if not allowed */ -static u8 is_command_allowed_in_ps(__le16 command) +static u8 is_command_allowed_in_ps(u16 cmd) { - int i; - - for (i = 0; i < ARRAY_SIZE(commands_allowed_in_ps); i++) { - if (command == cpu_to_le16(commands_allowed_in_ps[i])) - return 1; + switch (cmd) { + case CMD_802_11_RSSI: + return 1; + default: + break; } - return 0; } @@ -1715,7 +1709,7 @@ int lbs_execute_next_command(struct lbs_private *priv) if (cmdnode) { cmdptr = (struct cmd_ds_command *)cmdnode->bufvirtualaddr; - if (is_command_allowed_in_ps(cmdptr->command)) { + if (is_command_allowed_in_ps(le16_to_cpu(cmdptr->command))) { if ((priv->psstate == PS_STATE_SLEEP) || (priv->psstate == PS_STATE_PRE_SLEEP)) { lbs_deb_host( |