2010-05-22 20:33:42

by Dan Carpenter

Subject: [patch] ath9k: cleanup: remove unneeded null check

We dereference "wmi" on the line before and also when we initialize "ah".
This check has always been after a dereference since the first commit a
couple months ago. Looking through the code, it looks like "wmi" can't
actually be null here so I just removed the check.

Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c
index e23172c..6260faa 100644
--- a/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -279,9 +279,6 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,
if (wmi->drv_priv->op_flags & OP_UNPLUGGED)
return 0;

- if (!wmi)
- return -EINVAL;
-
skb = alloc_skb(headroom + cmd_len, GFP_ATOMIC);
if (!skb)
return -ENOMEM;

2010-05-24 04:13:56

by Sujith

Subject: [patch] ath9k: cleanup: remove unneeded null check

Dan Carpenter wrote:
> We dereference "wmi" on the line before and also when we initialize "ah".
> This check has always been after a dereference since the first commit a
> couple months ago. Looking through the code, it looks like "wmi" can't
> actually be null here so I just removed the check.
>
> Signed-off-by: Dan Carpenter <[email protected]>

Thanks.

Acked-by: Sujith <[email protected]>

> diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c
> index e23172c..6260faa 100644
> --- a/drivers/net/wireless/ath/ath9k/wmi.c
> +++ b/drivers/net/wireless/ath/ath9k/wmi.c
> @@ -279,9 +279,6 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,
> if (wmi->drv_priv->op_flags & OP_UNPLUGGED)
> return 0;
>
> - if (!wmi)
> - return -EINVAL;
> -
> skb = alloc_skb(headroom + cmd_len, GFP_ATOMIC);
> if (!skb)
> return -ENOMEM;