Clean up patches from vendor tree

Signed-off-by: Angus Ainslie (Purism) <angus@akkea.ca>

sound/soc/fsl/fsl_sai.c

@@ -706,7 +706,6 @@ static int fsl_sai_startup(struct snd_pcm_substream *substream,
 
 	ret = clk_prepare_enable(sai->bus_clk);
 	if (ret) {
-		dev_err(dev, "failed to enable bus clock: %d\n", ret);
 		return ret;
 	}
 

sound/soc/fsl/fsl_sai.h

@@ -15,6 +15,9 @@
 			 SNDRV_PCM_FMTBIT_S32_LE)
 
 /* SAI Register Map Register */
+#define FSL_SAI_VERID   0x00 /* SAI Version ID Register */
+#define FSL_SAI_PARAM   0x04 /* SAI Parameter Register */
+
 #define FSL_SAI_TCSR(offset) (0x00 + offset) /* SAI Transmit Control */
 #define FSL_SAI_TCR1(offset) (0x04 + offset) /* SAI Transmit Configuration 1 */
 #define FSL_SAI_TCR2(offset) (0x08 + offset) /* SAI Transmit Configuration 2 */