mwifiex: remove unneeded NULL check
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 21 Sep 2011 07:13:56 +0000 (10:13 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Sep 2011 20:19:44 +0000 (16:19 -0400)
We dereference "rate" on the lines before so the checks here are too
late to help.  This function is only called from
mwifiex_dump_station_info() and "rate" is always a non-NULL pointer
so the check can be removed.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/mwifiex/sta_ioctl.c

index 215c65ae23ee7013e45b19bc6c6408e7d43bd324..1df5ef6b4953bc51b25c59c0e94183077daf5cd5 100644 (file)
@@ -868,10 +868,10 @@ int mwifiex_drv_get_data_rate(struct mwifiex_private *priv,
        ret = mwifiex_rate_ioctl_cfg(priv, rate);
 
        if (!ret) {
-               if (rate && rate->is_rate_auto)
+               if (rate->is_rate_auto)
                        rate->rate = mwifiex_index_to_data_rate(priv->tx_rate,
                                                        priv->tx_htinfo);
-               else if (rate)
+               else
                        rate->rate = priv->data_rate;
        } else {
                ret = -1;