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

Commit 9ee62630 authored by Hannes Eder's avatar Hannes Eder Committed by David S. Miller
Browse files

wanrouter: fix sparse warnings: context imbalance 



Impact: Attribute functions with __acquires(...) resp. __releases(...).

Fix this sparse warnings:
  net/wanrouter/wanproc.c:82:13: warning: context imbalance in 'r_start' - wrong count at exit
  net/wanrouter/wanproc.c:103:13: warning: context imbalance in 'r_stop' - unexpected unlock
  net/wanrouter/wanmain.c:765:13: warning: context imbalance in 'lock_adapter_irq' - wrong count at exit
  net/wanrouter/wanmain.c:771:13: warning: context imbalance in 'unlock_adapter_irq' - unexpected unlock

Signed-off-by: default avatarHannes Eder <hannes@hanneseder.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 56bca31f

net/wanrouter/wanmain.c

+6 −2
Original line number Diff line number Diff line
@@ -86,8 +86,10 @@ static int wanrouter_device_del_if(struct wan_device *wandev, 


static struct wan_device *wanrouter_find_device(char *name);

static int wanrouter_delete_interface(struct wan_device *wandev, char *name);

static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags);

static void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags);

static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags)

	__acquires(lock);

static void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags)

	__releases(lock);
@@ -763,12 +765,14 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name) 
}



static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags)

	__acquires(lock)

{

	spin_lock_irqsave(lock, *smp_flags);

}





static void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags)

	__releases(lock)

{

	spin_unlock_irqrestore(lock, *smp_flags);

}

net/wanrouter/wanproc.c

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static struct proc_dir_entry *proc_router; 
 *	Iterator

 */

static void *r_start(struct seq_file *m, loff_t *pos)

	__acquires(kernel_lock)

{

	struct wan_device *wandev;

	loff_t l = *pos;
@@ -101,6 +102,7 @@ static void *r_next(struct seq_file *m, void *v, loff_t *pos) 
}



static void r_stop(struct seq_file *m, void *v)

	__releases(kernel_lock)

{

	unlock_kernel();

}