Merge change 3941 into android-msm-2.6.29a

QuIC Gerrit Code Review · QuIC Gerrit Code Review · commit b4ea33da5e00 · 2009-07-23T13:52:28.000-07:00
* changes:
  [ARM] msm: audio: 8k: Remove incorrect error messages.
diff --git a/arch/arm/mach-msm/qdsp6/msm8k_ard_adie.c b/arch/arm/mach-msm/qdsp6/msm8k_ard_adie.c
@@ -531,8 +531,6 @@ enum adie_state_ret_enum_type adie_state_digital_active(u32 dev_type,
 				   case when Rx spkr is disabled when LB speaker
 				   is already enabled. */
 				adie_spkr_stereo_ref1_cnt++;
-			} else {
-				pr_err("bad mode: not stereo or mono\n");
 			}
 		} else {
 			pr_err("bad path type\n");
@@ -658,8 +656,6 @@ enum adie_state_ret_enum_type adie_state_digital_analog_active(u32 dev_type,
 
 				/* increment ref count for LB and RX devices */
 				adie_spkr_stereo_ref2_cnt++;
-			} else {
-				pr_err("error: not stereo or mono\n");
 			}
 		} else {
 			D("ARD ADIE Loopback Device\n");
@@ -696,8 +692,6 @@ enum adie_state_ret_enum_type adie_state_digital_analog_active(u32 dev_type,
 						pmic_speaker_cmd(SPKR_MUTE_ON);
 					}
 				}
-			} else {
-				pr_err("error: not stereo or mono\n");
 			}
 		} else {
 			D("ARD ADIE Loopback Device\n");

Original file line number	Diff line number	Diff line change
`@@ -531,8 +531,6 @@ enum adie_state_ret_enum_type adie_state_digital_active(u32 dev_type,`
`531`	`531`	`case when Rx spkr is disabled when LB speaker`
`532`	`532`	`is already enabled. */`
`533`	`533`	`adie_spkr_stereo_ref1_cnt++;`
`534`		`- } else {`
`535`		`- pr_err("bad mode: not stereo or mono\n");`
`536`	`534`	`}`
`537`	`535`	`} else {`
`538`	`536`	`pr_err("bad path type\n");`
`@@ -658,8 +656,6 @@ enum adie_state_ret_enum_type adie_state_digital_analog_active(u32 dev_type,`
`658`	`656`
`659`	`657`	`/* increment ref count for LB and RX devices */`
`660`	`658`	`adie_spkr_stereo_ref2_cnt++;`
`661`		`- } else {`
`662`		`- pr_err("error: not stereo or mono\n");`
`663`	`659`	`}`
`664`	`660`	`} else {`
`665`	`661`	`D("ARD ADIE Loopback Device\n");`
`@@ -696,8 +692,6 @@ enum adie_state_ret_enum_type adie_state_digital_analog_active(u32 dev_type,`
`696`	`692`	`pmic_speaker_cmd(SPKR_MUTE_ON);`
`697`	`693`	`}`
`698`	`694`	`}`
`699`		`- } else {`
`700`		`- pr_err("error: not stereo or mono\n");`
`701`	`695`	`}`
`702`	`696`	`} else {`
`703`	`697`	`D("ARD ADIE Loopback Device\n");`