Skip to contentSkip to conversation

msm: sirc: warning fix

PATCH In review David Brown 2 participants 4 messages Nov 12, 2010 – Nov 16, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 msm: sirc: warning fix

Eliminate some unreferenced variables.

arch/arm/mach-msm/sirc.c:43: warning: 'save_type' defined but not used arch/arm/mach-msm/sirc.c:44: warning: 'save_polarity' defined but not used

---
 arch/arm/mach-msm/sirc.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
arch/arm/mach-msm/sirc.c +0 -3
index b079452..152eefd 100644
@@ -40,9 +40,6 @@ static struct sirc_cascade_regs sirc_reg_table[] = {
 	}
 };
 
-static unsigned int save_type;
-static unsigned int save_polarity;
-
 /* Mask off the given interrupt. Keep the int_enable mask in sync with
    the enable reg, so it can be restored after power collapse. */
 static void sirc_irq_mask(unsigned int irq)
Signature · 4 lines
1.7.3.2

Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#1 lore raw

PATCH 2/3 msm: smd: Warning cleanup

Put some variables inside of the same ifdef as the code that uses them.

arch/arm/mach-msm/smd_debug.c: In function 'smsm_print_sleep_info':
arch/arm/mach-msm/smd_debug.c:274: warning: unused variable 'int_info' arch/arm/mach-msm/smd_debug.c:273: warning: unused variable 'gpio'

---
 arch/arm/mach-msm/smd_debug.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-msm/smd_debug.c +2 -0
index f91c3b7..8736aff 100644
@@ -270,8 +270,10 @@ void smsm_print_sleep_info(void)
 {
 	unsigned long flags;
 	uint32_t *ptr;
+#ifndef CONFIG_ARCH_MSM_SCORPION
 	struct tramp_gpio_smem *gpio;
 	struct smsm_interrupt_info *int_info;
+#endif
 
 
 	spin_lock_irqsave(&smem_lock, flags);
Signature · 4 lines
1.7.3.2

Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#2 lore raw

PATCH 3/3 msm: Warning cleanup

In reply to David Brown

Define VMALLOC_END as an unsigned long to match expected type. Eliminates a warning:

arch/arm/mm/init.c: In function 'mem_init':
arch/arm/mm/init.c:606: warning: format '%08lx' expects type
'long unsigned int', but argument 12 has type 'unsigned int'

---
 arch/arm/mach-msm/include/mach/vmalloc.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-msm/include/mach/vmalloc.h +1 -1
index 31a32ad..d138448 100644
@@ -16,7 +16,7 @@
 #ifndef __ASM_ARCH_MSM_VMALLOC_H
 #define __ASM_ARCH_MSM_VMALLOC_H
 
-#define VMALLOC_END	  0xd0000000
+#define VMALLOC_END	  0xd0000000UL
 
 #endif
 
Signature · 4 lines
1.7.3.2

Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#3 lore raw
In reply to David Brown
Quoted 4 lines · David Brown

Eliminate some unreferenced variables.

arch/arm/mach-msm/sirc.c:43: warning: 'save_type' defined but not used arch/arm/mach-msm/sirc.c:44: warning: 'save_polarity' defined but not used

I accepted these three , but I altered the commit test to change the shortlog so it's a little more descriptive. Changes below,

msm: sirc: remove some unused variables
msm: smd: ifdef adjustment to remove unused variables
msm: make constant unsigned long to correct format warning

Daniel

Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.