Revert "soundwire: stream: Add specific prep/deprep commands to port_…

…prep callback"

This reverts commit 43f1a7f.

While it does not make much sense, this commit (which is a NOP
for most devices) causes audio issues after suspend-resume.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

drivers/soundwire/stream.c

@@ -469,7 +469,7 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,
 	}
 
 	/* Inform slave about the impending port prepare */
-	sdw_do_port_prep(s_rt, prep_ch, prep ? SDW_OPS_PORT_PRE_PREP : SDW_OPS_PORT_PRE_DEPREP);
+	sdw_do_port_prep(s_rt, prep_ch, SDW_OPS_PORT_PRE_PREP);
 
 	/* Prepare Slave port implementing CP_SM */
 	if (!dpn_prop->simple_ch_prep_sm) {
@@ -501,7 +501,7 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,
 	}
 
 	/* Inform slaves about ports prepared */
-	sdw_do_port_prep(s_rt, prep_ch, prep ? SDW_OPS_PORT_POST_PREP : SDW_OPS_PORT_POST_DEPREP);
+	sdw_do_port_prep(s_rt, prep_ch, SDW_OPS_PORT_POST_PREP);
 
 	/* Disable interrupt after Port de-prepare */
 	if (!prep && intr)

include/linux/soundwire/sdw.h

@@ -569,15 +569,13 @@ struct sdw_prepare_ch {
  * enum sdw_port_prep_ops: Prepare operations for Data Port
  *
  * @SDW_OPS_PORT_PRE_PREP: Pre prepare operation for the Port
- * @SDW_OPS_PORT_PRE_DEPREP: Pre deprepare operation for the Port
+ * @SDW_OPS_PORT_PREP: Prepare operation for the Port
  * @SDW_OPS_PORT_POST_PREP: Post prepare operation for the Port
- * @SDW_OPS_PORT_POST_DEPREP: Post deprepare operation for the Port
  */
 enum sdw_port_prep_ops {
 	SDW_OPS_PORT_PRE_PREP = 0,
-	SDW_OPS_PORT_PRE_DEPREP,
-	SDW_OPS_PORT_POST_PREP,
-	SDW_OPS_PORT_POST_DEPREP,
+	SDW_OPS_PORT_PREP = 1,
+	SDW_OPS_PORT_POST_PREP = 2,
 };
 
 /**