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

Commit 71329965 authored by Devendra Naga's avatar Devendra Naga Committed by Greg Kroah-Hartman
Browse files

staging: slicoss: clean the spinlock code in slic_entry_open 



the locked variable is used for checking whether the function
acquired lock, then unlock. actually with out this we
can achieve the same lock and unlock senario, remove the locked
variable and also cleanup the code around.

Signed-off-by: default avatarDevendra Naga <devendra.aaru@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 92adcc80

drivers/staging/slicoss/slicoss.c

+5 −15
Original line number Diff line number Diff line
@@ -3132,7 +3132,6 @@ static int slic_entry_open(struct net_device *dev) 
{

	struct adapter *adapter = netdev_priv(dev);

	struct sliccard *card = adapter->card;

	u32 locked = 0;

	int status;



	ASSERT(adapter);
@@ -3142,7 +3141,6 @@ static int slic_entry_open(struct net_device *dev) 


	spin_lock_irqsave(&slic_global.driver_lock.lock,

				slic_global.driver_lock.flags);

	locked = 1;

	if (!adapter->activated) {

		card->adapters_activated++;

		slic_global.num_slic_ports_active++;
@@ -3156,23 +3154,15 @@ static int slic_entry_open(struct net_device *dev) 
			slic_global.num_slic_ports_active--;

			adapter->activated = 0;

		}

		if (locked) {

			spin_unlock_irqrestore(&slic_global.driver_lock.lock,

						slic_global.driver_lock.flags);

			locked = 0;

		}

		return status;

		goto spin_unlock;

	}

	if (!card->master)

		card->master = adapter;



	if (locked) {

spin_unlock:

	spin_unlock_irqrestore(&slic_global.driver_lock.lock,

			       slic_global.driver_lock.flags);

		locked = 0;

	}



	return 0;

	return status;

}



static void slic_card_cleanup(struct sliccard *card)