[PATCH 01/13] kernel/fs/security: removing redundant ifdefs

[PATCH 01/13] kernel/fs/security: removing redundant ifdefs

[Jiri Olsa]

wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 fs/ext4/super.c                |    2 --
 include/linux/socket.h         |    4 ----
 kernel/sched.c                 |    6 ------
 kernel/srcu.c                  |    2 --
 security/capability.c          |    2 --
 sound/pci/au88x0/au88x0_core.c |    4 ----
 6 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index e14d22c..afba6f0 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1067,9 +1067,7 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
 				const char *data, size_t len, loff_t off);
 
 static const struct dquot_operations ext4_quota_operations = {
-#ifdef CONFIG_QUOTA
 	.get_reserved_space = ext4_get_reserved_space,
-#endif
 	.write_dquot	= ext4_write_dquot,
 	.acquire_dquot	= ext4_acquire_dquot,
 	.release_dquot	= ext4_release_dquot,
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 354cc56..9fda7c4 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -27,12 +27,10 @@ struct __kernel_sockaddr_storage {
 #define __sockaddr_check_size(size)	\
 	BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))
 
-#ifdef __KERNEL__
 # ifdef CONFIG_PROC_FS
 struct seq_file;
 extern void socket_seq_show(struct seq_file *seq);
 # endif
-#endif /* __KERNEL__ */
 
 typedef unsigned short	sa_family_t;
 
@@ -305,7 +303,6 @@ struct ucred {
 /* IPX options */
 #define IPX_TYPE	1
 
-#ifdef __KERNEL__
 extern int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len);
 extern int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov,
 			       int offset, int len);
@@ -326,6 +323,5 @@ struct timespec;
 
 extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
 			  unsigned int flags, struct timespec *timeout);
-#endif
 #endif /* not kernel and not glibc */
 #endif /* _LINUX_SOCKET_H */
diff --git a/kernel/sched.c b/kernel/sched.c
index 9a0f37c..fcbe30e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -311,12 +311,8 @@ static inline struct task_group *task_group(struct task_struct *p)
 {
 	struct task_group *tg;
 
-#ifdef CONFIG_CGROUP_SCHED
 	tg = container_of(task_subsys_state(p, cpu_cgroup_subsys_id),
 				struct task_group, css);
-#else
-	tg = &init_task_group;
-#endif
 	return tg;
 }
 
@@ -471,9 +467,7 @@ struct root_domain {
 	 */
 	cpumask_var_t rto_mask;
 	atomic_t rto_count;
-#ifdef CONFIG_SMP
 	struct cpupri cpupri;
-#endif
 };
 
 /*
diff --git a/kernel/srcu.c b/kernel/srcu.c
index 2980da3..c71e075 100644
--- a/kernel/srcu.c
+++ b/kernel/srcu.c
@@ -46,11 +46,9 @@ static int init_srcu_struct_fields(struct srcu_struct *sp)
 int __init_srcu_struct(struct srcu_struct *sp, const char *name,
 		       struct lock_class_key *key)
 {
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
 	/* Don't re-initialize a lock while it is held. */
 	debug_check_no_locks_freed((void *)sp, sizeof(*sp));
 	lockdep_init_map(&sp->dep_map, name, key, 0);
-#endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
 	return init_srcu_struct_fields(sp);
 }
 EXPORT_SYMBOL_GPL(__init_srcu_struct);
diff --git a/security/capability.c b/security/capability.c
index 5a0dd31..750f336 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -698,9 +698,7 @@ static int cap_socket_getpeersec_dgram(struct socket *sock,
 
 static int cap_sk_alloc_security(struct sock *sk, int family, gfp_t priority)
 {
-#ifdef CONFIG_SECURITY_NETWORK
 	sk->sk_security = NULL;
-#endif
 	return 0;
 }
 
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
index 23f49f3..f82f2a1 100644
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@ -941,10 +941,8 @@ vortex_fifo_setwtctrl(vortex_t * vortex, int fifo, int ctrl, int priority,
 			temp = (temp & 0xf7ffffff) | ((f & 1) << 0x1b);
 			temp = (temp & 0xefffffff) | ((f & 1) << 0x1c);
 #endif
-#ifdef CHIP_AU8810
 			temp = (temp & 0xfeffffff) | ((f & 1) << 0x18);
 			temp = (temp & 0xfdffffff) | ((f & 1) << 0x19);
-#endif
 		}
 	} else {
 		if (temp & FIFO_VALID) {
@@ -955,10 +953,8 @@ vortex_fifo_setwtctrl(vortex_t * vortex, int fifo, int ctrl, int priority,
 			temp  			    ((f & 1) << 0x1b) | (temp & 0xe7ffffef) | FIFO_BITS;
 #endif
-#ifdef CHIP_AU8810
 			temp  			    ((f & 1) << 0x18) | (temp & 0xfcffffef) | FIFO_BITS;
-#endif
 		} else
 			/*if (this_8[fifo]) */
 			vortex_fifo_clearwtdata(vortex, fifo, FIFO_SIZE);
-- 
1.6.6.1

[PATCH 02/13] ia64: removing redundant ifdef

[Jiri Olsa]

wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 arch/ia64/include/asm/mmzone.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/ia64/include/asm/mmzone.h b/arch/ia64/include/asm/mmzone.h
index f2ca320..e0de617 100644
--- a/arch/ia64/include/asm/mmzone.h
+++ b/arch/ia64/include/asm/mmzone.h
@@ -19,16 +19,12 @@
 
 static inline int pfn_to_nid(unsigned long pfn)
 {
-#ifdef CONFIG_NUMA
 	extern int paddr_to_nid(unsigned long);
 	int nid = paddr_to_nid(pfn << PAGE_SHIFT);
 	if (nid < 0)
 		return 0;
 	else
 		return nid;
-#else
-	return 0;
-#endif
 }
 
 #ifdef CONFIG_IA64_DIG /* DIG systems are small */
-- 
1.6.6.1

[PATCH 03/13] arm: removing redundant ifdefs

[Jiri Olsa]

wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 arch/arm/include/asm/processor.h              |    2 --
 arch/arm/mach-ixp23xx/include/mach/platform.h |    3 ---
 arch/arm/plat-omap/include/plat/clock.h       |    5 -----
 3 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h
index 6a89567..7dcae33 100644
--- a/arch/arm/include/asm/processor.h
+++ b/arch/arm/include/asm/processor.h
@@ -22,11 +22,9 @@
 #include <asm/ptrace.h>
 #include <asm/types.h>
 
-#ifdef __KERNEL__
 #define STACK_TOP	((current->personality & ADDR_LIMIT_32BIT) ? \
 			 TASK_SIZE : TASK_SIZE_26)
 #define STACK_TOP_MAX	TASK_SIZE
-#endif
 
 union debug_insn {
 	u32	arm;
diff --git a/arch/arm/mach-ixp23xx/include/mach/platform.h b/arch/arm/mach-ixp23xx/include/mach/platform.h
index db9d941..9f05ea4 100644
--- a/arch/arm/mach-ixp23xx/include/mach/platform.h
+++ b/arch/arm/mach-ixp23xx/include/mach/platform.h
@@ -43,7 +43,6 @@ extern struct sys_timer ixp23xx_timer;
 
 #define IXP23XX_UART_XTAL		14745600
 
-#ifndef __ASSEMBLY__
 /*
  * Is system memory on the XSI or CPP bus?
  */
@@ -51,7 +50,5 @@ static inline unsigned ixp23xx_cpp_boot(void)
 {
 	return (*IXP23XX_EXP_CFG0 & IXP23XX_EXP_CFG0_XSI_NOT_PRES);
 }
-#endif
-
 
 #endif
diff --git a/arch/arm/plat-omap/include/plat/clock.h b/arch/arm/plat-omap/include/plat/clock.h
index 34f7fa9..b18bf6a 100644
--- a/arch/arm/plat-omap/include/plat/clock.h
+++ b/arch/arm/plat-omap/include/plat/clock.h
@@ -133,17 +133,12 @@ struct clk {
 	__s8			usecount;
 	u8			fixed_div;
 	u8			flags;
-#ifdef CONFIG_ARCH_OMAP2PLUS
 	void __iomem		*clksel_reg;
 	u32			clksel_mask;
 	const struct clksel	*clksel;
 	struct dpll_data	*dpll_data;
 	const char		*clkdm_name;
 	struct clockdomain	*clkdm;
-#else
-	__u8			rate_offset;
-	__u8			src_offset;
-#endif
 #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
 	struct dentry		*dent;	/* For visible tree hierarchy */
 #endif
-- 
1.6.6.1

[PATCH 04/13] x86: removing redundant ifdef

[Jiri Olsa]

wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 arch/x86/kernel/early-quirks.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index ebdb85c..76b8cd9 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -97,7 +97,6 @@ static void __init nvidia_bugs(int num, int slot, int func)
 }
 
 #if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC)
-#if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC)
 static u32 __init ati_ixp4x0_rev(int num, int slot, int func)
 {
 	u32 d;
@@ -115,7 +114,6 @@ static u32 __init ati_ixp4x0_rev(int num, int slot, int func)
 	d &= 0xff;
 	return d;
 }
-#endif
 
 static void __init ati_bugs(int num, int slot, int func)
 {
-- 
1.6.6.1

[PATCH 07/13] h8300: removing redundant ifdef

[Jiri Olsa]

wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 arch/h8300/include/asm/tlb.h |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/arch/h8300/include/asm/tlb.h b/arch/h8300/include/asm/tlb.h
index 3dea80a..6339a02 100644
--- a/arch/h8300/include/asm/tlb.h
+++ b/arch/h8300/include/asm/tlb.h
@@ -7,17 +7,4 @@
 
 #define tlb_flush(tlb)	do { } while(0)
 
-/* 
-  include/asm-h8300/tlb.h 
-*/
-
-#ifndef __H8300_TLB_H__
-#define __H8300_TLB_H__
-
-#define tlb_flush(tlb)	do { } while(0)
-
-#include <asm-generic/tlb.h>
-
-#endif
-
 #endif
-- 
1.6.6.1

[PATCH 08/13] powerpc: removing redundant ifdefs

[Jiri Olsa]

wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 arch/powerpc/include/asm/vdso_datapage.h |    2 --
 arch/powerpc/kernel/traps.c              |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h
index 13c2c28..7c9cfe9 100644
--- a/arch/powerpc/include/asm/vdso_datapage.h
+++ b/arch/powerpc/include/asm/vdso_datapage.h
@@ -114,9 +114,7 @@ struct vdso_data {
 
 #endif /* CONFIG_PPC64 */
 
-#ifdef __KERNEL__
 extern struct vdso_data *vdso_data;
-#endif
 
 #endif /* __ASSEMBLY__ */
 
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 29d128e..f472ecf 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1140,14 +1140,12 @@ void __kprobes DebugException(struct pt_regs *regs, unsigned long debug_status)
 
 		if (user_mode(regs)) {
 			current->thread.dbcr0 &= ~DBCR0_IC;
-#ifdef CONFIG_PPC_ADV_DEBUG_REGS
 			if (DBCR_ACTIVE_EVENTS(current->thread.dbcr0,
 					       current->thread.dbcr1))
 				regs->msr |= MSR_DE;
 			else
 				/* Make sure the IDM bit is off */
 				current->thread.dbcr0 &= ~DBCR0_IDM;
-#endif
 		}
 
 		_exception(SIGTRAP, regs, TRAP_TRACE, regs->nip);
-- 
1.6.6.1

[PATCH 09/13] parisc: removing redundant ifdef

[Jiri Olsa]

wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 arch/parisc/kernel/unaligned.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c
index 92d977b..6ea7a0d 100644
--- a/arch/parisc/kernel/unaligned.c
+++ b/arch/parisc/kernel/unaligned.c
@@ -620,14 +620,12 @@ void handle_unaligned(struct pt_regs *regs)
 		ret = emulate_std(regs, R2(regs->iir),1);
 		break;
 
-#ifdef CONFIG_PA20
 	case OPCODE_LDD_L:
 		ret = emulate_ldd(regs, R2(regs->iir),0);
 		break;
 	case OPCODE_STD_L:
 		ret = emulate_std(regs, R2(regs->iir),0);
 		break;
-#endif
 	}
 #endif
 	switch (regs->iir & OPCODE3_MASK)
-- 
1.6.6.1

[PATCH 10/13] drivers/scsi: removing redundant ifdef

[Jiri Olsa]

wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 drivers/scsi/aic7xxx_old.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index 93984c9..c0953be 100644
--- a/drivers/scsi/aic7xxx_old.c
+++ b/drivers/scsi/aic7xxx_old.c
@@ -9655,9 +9655,7 @@ aic7xxx_detect(struct scsi_host_template *template)
           found++;
 	  continue;
 skip_pci_controller:
-#ifdef CONFIG_PCI
 	  pci_release_regions(temp_p->pdev);
-#endif
 	  kfree(temp_p);
         }  /* Found an Adaptec PCI device. */
         else /* Well, we found one, but we couldn't get any memory */
-- 
1.6.6.1

[PATCH 11/13] drivers/video: removing redundant ifdefs

[Jiri Olsa]

wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 drivers/video/atafb.c                   |    2 --
 drivers/video/matrox/matroxfb_DAC1064.c |    5 +----
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index f3aada2..5b2b5ef 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -1718,11 +1718,9 @@ static int falcon_setcolreg(unsigned int regno, unsigned int red,
 			(((red & 0xe000) >> 13) | ((red & 0x1000) >> 12) << 8) |
 			(((green & 0xe000) >> 13) | ((green & 0x1000) >> 12) << 4) |
 			((blue & 0xe000) >> 13) | ((blue & 0x1000) >> 12);
-#ifdef ATAFB_FALCON
 		((u32 *)info->pseudo_palette)[regno] = ((red & 0xf800) |
 						       ((green & 0xfc00) >> 5) |
 						       ((blue & 0xf800) >> 11));
-#endif
 	}
 	return 0;
 }
diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
index f9fa0fd..1717623 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.c
+++ b/drivers/video/matrox/matroxfb_DAC1064.c
@@ -869,12 +869,9 @@ static int MGAG100_preinit(struct matrox_fb_info *minfo)
 	minfo->capable.plnwt = minfo->devflags.accelerator = FB_ACCEL_MATROX_MGAG100
 			? minfo->devflags.sgram : 1;
 
-#ifdef CONFIG_FB_MATROX_G
 	if (minfo->devflags.g450dac) {
 		minfo->outputs[0].output = &g450out;
-	} else
-#endif
-	{
+	} else {
 		minfo->outputs[0].output = &m1064;
 	}
 	minfo->outputs[0].src = minfo->outputs[0].default_src;
-- 
1.6.6.1

[PATCH 13/13] drivers/ata: removing redundant ifdef

[Jiri Olsa]

wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 drivers/ata/ahci.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 8b502f4..5326af2 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -3179,7 +3179,6 @@ static bool ahci_broken_online(struct pci_dev *pdev)
 #ifdef CONFIG_ATA_ACPI
 static void ahci_gtf_filter_workaround(struct ata_host *host)
 {
-#ifdef CONFIG_ATA_ACPI
 	static const struct dmi_system_id sysids[] = {
 		/*
 		 * Aspire 3810T issues a bunch of SATA enable commands
@@ -3220,7 +3219,6 @@ static void ahci_gtf_filter_workaround(struct ata_host *host)
 			ata_for_each_dev(dev, link, ALL)
 				dev->gtf_filter |= filter;
 	}
-#endif
 }
 #else
 static inline void ahci_gtf_filter_workaround(struct ata_host *host)
-- 
1.6.6.1

Re: [PATCH 09/13] parisc: removing redundant ifdef

[Kyle McMartin]

On Thu, May 06, 2010 at 07:36:13PM +0200, Jiri Olsa wrote:
> wbr,
> jirka
> 
> 
> Signed-off-by: Jiri Olsa <jolsa@redhat.com>

Thanks, looks good. Applied.

--Kyle

Re: [PATCH 03/13] arm: removing redundant ifdefs

[Russell King - ARM Linux]

Ah, it's finally come through.

On Thu, May 06, 2010 at 07:36:07PM +0200, Jiri Olsa wrote:
> --- a/arch/arm/include/asm/processor.h
> +++ b/arch/arm/include/asm/processor.h
> @@ -22,11 +22,9 @@
>  #include <asm/ptrace.h>
>  #include <asm/types.h>
>  
> -#ifdef __KERNEL__
>  #define STACK_TOP	((current->personality & ADDR_LIMIT_32BIT) ? \
>  			 TASK_SIZE : TASK_SIZE_26)
>  #define STACK_TOP_MAX	TASK_SIZE
> -#endif

This one is correct.

> --- a/arch/arm/mach-ixp23xx/include/mach/platform.h
> +++ b/arch/arm/mach-ixp23xx/include/mach/platform.h
> @@ -43,7 +43,6 @@ extern struct sys_timer ixp23xx_timer;
>  
>  #define IXP23XX_UART_XTAL		14745600
>  
> -#ifndef __ASSEMBLY__
>  /*
>   * Is system memory on the XSI or CPP bus?
>   */
> @@ -51,7 +50,5 @@ static inline unsigned ixp23xx_cpp_boot(void)
>  {
>  	return (*IXP23XX_EXP_CFG0 & IXP23XX_EXP_CFG0_XSI_NOT_PRES);
>  }
> -#endif

Ok too.

> --- a/arch/arm/plat-omap/include/plat/clock.h
> +++ b/arch/arm/plat-omap/include/plat/clock.h
> @@ -133,17 +133,12 @@ struct clk {
>  	__s8			usecount;
>  	u8			fixed_div;
>  	u8			flags;
> -#ifdef CONFIG_ARCH_OMAP2PLUS
>  	void __iomem		*clksel_reg;
>  	u32			clksel_mask;
>  	const struct clksel	*clksel;
>  	struct dpll_data	*dpll_data;
>  	const char		*clkdm_name;
>  	struct clockdomain	*clkdm;
> -#else
> -	__u8			rate_offset;
> -	__u8			src_offset;
> -#endif

This is wrong.  There is a preceding #ifdef CONFIG_ARCH_OMAP2PLUS, but
there's also a preceding #endif terminating that conditional section.

Re: [PATCH 13/13] drivers/ata: removing redundant ifdef

[Jeff Garzik]

On 05/06/2010 01:36 PM, Jiri Olsa wrote:
> wbr,
> jirka
>
>
> Signed-off-by: Jiri Olsa<jolsa@redhat.com>
> ---
>   drivers/ata/ahci.c |    2 --
>   1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
> index 8b502f4..5326af2 100644
> --- a/drivers/ata/ahci.c
> +++ b/drivers/ata/ahci.c
> @@ -3179,7 +3179,6 @@ static bool ahci_broken_online(struct pci_dev *pdev)
>   #ifdef CONFIG_ATA_ACPI
>   static void ahci_gtf_filter_workaround(struct ata_host *host)
>   {
> -#ifdef CONFIG_ATA_ACPI
>   	static const struct dmi_system_id sysids[] = {
>   		/*
>   		 * Aspire 3810T issues a bunch of SATA enable commands
> @@ -3220,7 +3219,6 @@ static void ahci_gtf_filter_workaround(struct ata_host *host)
>   			ata_for_each_dev(dev, link, ALL)
>   				dev->gtf_filter |= filter;
>   	}
> -#endif
>   }

I don't see this in the linux-next version of ahci.c, so I'm dropping 
this patch.