Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b255c6e authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove the use of goto label in wilc_init() 



Added direct return in wilc_init() instead of goto label. Changes
are done to avoid the use of '_' in label name.

Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b2d26c8c

drivers/staging/wilc1000/host_interface.c

+8 −11
Original line number Diff line number Diff line
@@ -3331,7 +3331,6 @@ static void get_periodic_rssi(struct timer_list *unused) 


int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)

{

	int result = 0;

	struct host_if_drv *hif_drv;

	struct wilc_vif *vif;

	struct wilc *wilc;
@@ -3345,10 +3344,9 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler) 
	init_completion(&hif_wait_response);



	hif_drv  = kzalloc(sizeof(*hif_drv), GFP_KERNEL);

	if (!hif_drv) {

		result = -ENOMEM;

		goto _fail_;

	}

	if (!hif_drv)

		return -ENOMEM;



	*hif_drv_handler = hif_drv;

	for (i = 0; i < wilc->vif_num; i++)

		if (dev == wilc->vif[i]->ndev) {
@@ -3374,8 +3372,8 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler) 
		hif_workqueue = create_singlethread_workqueue("WILC_wq");

		if (!hif_workqueue) {

			netdev_err(vif->ndev, "Failed to create workqueue\n");

			result = -ENOMEM;

			goto _fail_;

			kfree(hif_drv);

			return -ENOMEM;

		}



		periodic_rssi_vif = vif;
@@ -3403,8 +3401,7 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler) 


	clients_count++;



_fail_:

	return result;

	return 0;

}



int wilc_deinit(struct wilc_vif *vif)