From 27a9095aa00426f80660df0e5f857a06852e1496 Mon Sep 17 00:00:00 2001 From: Lorenz Haspel Date: Wed, 19 Jun 2013 10:43:07 +0200 Subject: silicom: checkpatch: errors caused by macros fixed checkpatch error: added parenthesis around complex macro. Macro with return was only used once in the code, so I expandet it in-place. Signed-off-by: Lorenz Haspel Signed-off-by: Michael Banken Signed-off-by: Greg Kroah-Hartman --- drivers/staging/silicom/bpctl_mod.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'drivers') diff --git a/drivers/staging/silicom/bpctl_mod.c b/drivers/staging/silicom/bpctl_mod.c index 3919d16cb84..4b3a1ae250c 100644 --- a/drivers/staging/silicom/bpctl_mod.c +++ b/drivers/staging/silicom/bpctl_mod.c @@ -43,11 +43,6 @@ MODULE_DESCRIPTION(BP_MOD_DESCR); MODULE_VERSION(BP_MOD_VER); spinlock_t bpvm_lock; -#define lock_bpctl() \ -if (down_interruptible(&bpctl_sema)) { \ - return -ERESTARTSYS; \ -} \ - #define unlock_bpctl() \ up(&bpctl_sema); @@ -5414,7 +5409,8 @@ static long device_ioctl(struct file *file, /* see include/linux/fs.h */ static bpctl_dev_t *pbpctl_dev; /* lock_kernel(); */ - lock_bpctl(); + if (down_interruptible(&bpctl_sema)) + return -ERESTARTSYS; /* local_irq_save(flags); */ /* if(!spin_trylock_irqsave(&bpvm_lock)){ local_irq_restore(flags); @@ -7871,7 +7867,8 @@ int bypass_proc_create_dev_sd(bpctl_dev_t *pbp_device_block) } current_pfs->bypass_entry = procfs_dir; -#define ENTRY(x) ret |= procfs_add(#x, &x##_ops, pbp_device_block) +#define ENTRY(x) (ret |= procfs_add(#x, &x##_ops, pbp_device_block)) + ENTRY(bypass_info); if (pbp_device_block->bp_caps & SW_CTL_CAP) { /* Create set param proc's */ -- cgit v1.2.3-70-g09d2