staging: wilc1000: use goto labels on error path

Use goto labels on error path for probe functions. This makes
code easier to read.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>

Author: claudiubeznea

drivers/staging/wilc1000/sdio.c

@@ -163,8 +163,7 @@ static int wilc_sdio_probe(struct sdio_func *func,
 	ret = wilc_cfg80211_init(&wilc, &func->dev, io_type, &wilc_hif_sdio);
 	if (ret) {
 		dev_err(&func->dev, "Couldn't initialize netdev\n");
-		kfree(sdio_priv);
-		return ret;
+		goto free;
 	}
 	sdio_set_drvdata(func, wilc);
 	wilc->bus_data = sdio_priv;
@@ -184,18 +183,20 @@ static int wilc_sdio_probe(struct sdio_func *func,
 
 	if (!init_power) {
 		ret = wilc_wlan_power_on_sequence(wilc);
-		if (ret) {
-			wilc_netdev_cleanup(wilc);
-			kfree(sdio_priv);
-			return ret;
-		}
+		if (ret)
+			goto netdev_cleanup;
 		init_power = 1;
 	}
 
 	wilc_bt_init(wilc);
 
 	dev_info(&func->dev, "Driver Initializing success\n");
 	return 0;
+netdev_cleanup:
+	wilc_netdev_cleanup(wilc);
+free:
+	kfree(sdio_priv);
+	return ret;
 }
 
 static void wilc_sdio_remove(struct sdio_func *func)

drivers/staging/wilc1000/spi.c

@@ -125,10 +125,8 @@ static int wilc_bus_probe(struct spi_device *spi)
 		return -ENOMEM;
 
 	ret = wilc_cfg80211_init(&wilc, dev, WILC_HIF_SPI, &wilc_hif_spi);
-	if (ret) {
-		kfree(spi_priv);
-		return ret;
-	}
+	if (ret)
+		goto free;
 
 	spi_set_drvdata(spi, wilc);
 	wilc->dev = &spi->dev;
@@ -144,18 +142,20 @@ static int wilc_bus_probe(struct spi_device *spi)
 
 	if (!init_power) {
 		ret = wilc_wlan_power_on_sequence(wilc);
-		if (ret) {
-			wilc_netdev_cleanup(wilc);
-			kfree(spi_priv);
-			return ret;
-		}
+		if (ret)
+			goto netdev_cleanup;
 		init_power = 1;
 	}
 
 	wilc_bt_init(wilc);
 
 	dev_info(dev, "WILC SPI probe success\n");
 	return 0;
+netdev_cleanup:
+	wilc_netdev_cleanup(wilc);
+free:
+	kfree(spi_priv);
+	return ret;
 }
 
 static int wilc_bus_remove(struct spi_device *spi)