mwifiex: consolidate mwifiex_sdio_probe() error paths

Instead of duplicating part of the cleanups needed in case of an error
in .probe callback, have a single error path and use goto labels as is
common practice in the kernel.

This also has the nice side effect that the cleanup operations are made
in the inverse order of their counterparts, which was not the case for
the mwifiex_add_card() error path.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
index b248d10f09df203ba47d7161caea939f56a97973..a3fd0a1a0941e45dab5a4fac37b9bf0b0dcfc6d4 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -183,8 +183,7 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)
 
        if (ret) {
                pr_err("%s: failed to enable function\n", __func__);
-               kfree(card);
-               return ret;
+               goto err_free;
        }
 
        /* device tree node parsing and platform specific configuration*/
@@ -195,12 +194,18 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)
                               MWIFIEX_SDIO);
        if (ret) {
                pr_err("%s: add card failed\n", __func__);
-               kfree(card);
-               sdio_claim_host(func);
-               sdio_disable_func(func);
-               sdio_release_host(func);
+               goto err_disable;
        }
 
+       return 0;
+
+err_disable:
+       sdio_claim_host(func);
+       sdio_disable_func(func);
+       sdio_release_host(func);
+err_free:
+       kfree(card);
+
        return ret;
 }