Skip to contentSkip to conversation

msm: Remove extraneous ffa device check

PATCH New David Brown 1 participant 2 messages Mar 31, 2011

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

PATCH 1/2 msm: Remove extraneous ffa device check

The qsd8x50 board file contains a few references to machine_is_... macros that are otherwise unused, and contain no machine definition. The recent purge of unused machine definitions breaks the compilation of this target.

Since the machine cannot ever be used, just remove the bogus checks.

---
 arch/arm/mach-msm/board-qsd8x50.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
arch/arm/mach-msm/board-qsd8x50.c +1 -4
index 7f56861..6a96911 100644
@@ -160,10 +160,7 @@ static struct msm_mmc_platform_data qsd8x50_sdc1_data = {
 
 static void __init qsd8x50_init_mmc(void)
 {
-	if (machine_is_qsd8x50_ffa() || machine_is_qsd8x50a_ffa())
-		vreg_mmc = vreg_get(NULL, "gp6");
-	else
-		vreg_mmc = vreg_get(NULL, "gp5");
+	vreg_mmc = vreg_get(NULL, "gp5");
 
 	if (IS_ERR(vreg_mmc)) {
 		pr_err("vreg get for vreg_mmc failed (%ld)\n",
Signature · 2 lines
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/2 msm: timer: fix missing return value

Change af90f10d38 "ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime" missed a return statement, causing a compile warning:

arch/arm/mach-msm/timer.c:272: warning: 'return' with no value, in function returning non-void

Trivially return 0 for success when running on cpu 0 (to match the comment and previous behavior).

---
 arch/arm/mach-msm/timer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-msm/timer.c +1 -1
index 56f920c..38b95e9 100644
@@ -269,7 +269,7 @@ int __cpuinit local_timer_setup(struct clock_event_device *evt)
 
 	/* Use existing clock_event for cpu 0 */
 	if (!smp_processor_id())
-		return;
+		return 0;
 
 	writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);
 
Signature · 2 lines
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.