wl1271: remove workaround to ignore -EIO from radio and general params

We were ignoring the -EIO return value from wl1271_cmd_radio_params() and
wl1271_cmd_general_params(), because they were always returning an error and
we didn't know why.  Now this has been fixed, so the workaround can be
removed.

Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/wl12xx/wl1271_init.c b/drivers/net/wireless/wl12xx/wl1271_init.c
index 44896accffd40ccfa11dba1bac43a1ebab73f7bb..11249b436cf1745a2c93ab3db7df4ba4147f29d7 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_init.c
+++ b/drivers/net/wireless/wl12xx/wl1271_init.c
@@ -197,15 +197,12 @@ int wl1271_hw_init(struct wl1271 *wl)
 {
        int ret;
 
-       /* FIXME: the following parameter setting functions return error
-        * codes - the reason is so far unknown. The -EIO is therefore
-        * ignored for the time being. */
        ret = wl1271_cmd_general_parms(wl);
-       if (ret < 0 && ret != -EIO)
+       if (ret < 0)
                return ret;
 
        ret = wl1271_cmd_radio_parms(wl);
-       if (ret < 0 && ret != -EIO)
+       if (ret < 0)
                return ret;
 
        /* Template settings */

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index b75557e0e68662e987c3ae1c4bbb72f2f8df15f7..64d05265f7e0316de9c8a2ed787240aa95352c38 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -354,15 +354,12 @@ static int wl1271_plt_init(struct wl1271 *wl)
 {
        int ret;
 
-       /* FIXME: the following parameter setting functions return error
-        * codes - the reason is so far unknown. The -EIO is therefore
-        * ignored for the time being. */
        ret = wl1271_cmd_general_parms(wl);
-       if (ret < 0 && ret != -EIO)
+       if (ret < 0)
                return ret;
 
        ret = wl1271_cmd_radio_parms(wl);
-       if (ret < 0 && ret != -EIO)
+       if (ret < 0)
                return ret;
 
        ret = wl1271_acx_init_mem_config(wl);