staging: sst: Remove the aava bits

We don't need these special cases any more.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/intel_sst/TODO

@@ -2,11 +2,12 @@ TODO
 ----
 
 Get the memrar driver cleaned up and upstream (dependancy blocking SST)
-Get the jack header entries accepted
+Replace long/short press with two virtual buttons
 Review the printks and kill off any left over ST_ERR: messages
 Review the misc device ioctls for 32/64bit safety and sanity
 Review the misc device ioctls for size safety depending on config and decide
 	if space/unused areas should be left
+What the sound folks turn up on full review
+Using the ALSA frameworks properly
 
-Anything the sound folks turn up on full review
 

drivers/staging/intel_sst/intelmid.c

@@ -639,7 +639,7 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata)
 					jack = &intelmaddata->jack[3].jack;
 					present = 1;
 					jack_event_flag = 1;
-				}	else	{
+				} else {
 					pr_debug("sst: short press detected\n");
 					/* send headphone detect/undetect */
 					jack = &intelmaddata->jack[2].jack;
@@ -649,21 +649,8 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata)
 			}
 
 		}
-		intelmaddata->jack_prev_state  = value ;
-
-	}
-	if (is_aava() && jack) {
-		if (present) {
-			pr_debug("sst: Jack... YES\n");
-			scard_ops->set_output_dev(STEREO_HEADPHONE);
-
-		} else {
-			pr_debug("sst: Jack... NO\n");
-			scard_ops->set_output_dev(INTERNAL_SPKR);
-
-		}
+		intelmaddata->jack_prev_state = value;
 	}
-
 	if (jack_event_flag)
 		sst_mad_send_jack_report(jack, buttonpressflag, present);
 }