summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sound/soc/fsl/fsl_xcvr.c1
-rw-r--r--sound/soc/fsl/fsl_xcvr.h12
2 files changed, 7 insertions, 6 deletions
diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c
index d920e6a52da8..66cedb47a753 100644
--- a/sound/soc/fsl/fsl_xcvr.c
+++ b/sound/soc/fsl/fsl_xcvr.c
@@ -345,6 +345,7 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd,
"err updating isr %d\n", ret);
return ret;
}
+ /* fall through */
case FSL_XCVR_AMODE_SPDIF:
ret = regmap_update_bits(xcvr->regmap,
diff --git a/sound/soc/fsl/fsl_xcvr.h b/sound/soc/fsl/fsl_xcvr.h
index 6751db093fe9..64732d0193c0 100644
--- a/sound/soc/fsl/fsl_xcvr.h
+++ b/sound/soc/fsl/fsl_xcvr.h
@@ -97,16 +97,16 @@
#define FSL_XCVR_EXT_CTRL_TX_FWM_SHFT 0
#define FSL_XCVR_EXT_CTRL_TX_FWM_MASK GENMASK(6, 0)
-#define FSL_XCVR_EXT_CTRL_TX_FWM(i) (i << FSL_XCVR_EXT_CTRL_TX_FWM_SHFT) \
- & FSL_XCVR_EXT_CTRL_TX_FWM_MASK
+#define FSL_XCVR_EXT_CTRL_TX_FWM(i) (((i) << FSL_XCVR_EXT_CTRL_TX_FWM_SHFT) \
+ & FSL_XCVR_EXT_CTRL_TX_FWM_MASK)
#define FSL_XCVR_EXT_CTRL_RX_FWM_SHFT 8
#define FSL_XCVR_EXT_CTRL_RX_FWM_MASK GENMASK(14, 8)
-#define FSL_XCVR_EXT_CTRL_RX_FWM(i) (i << FSL_XCVR_EXT_CTRL_RX_FWM_SHFT) \
- & FSL_XCVR_EXT_CTRL_RX_FWM_MASK
+#define FSL_XCVR_EXT_CTRL_RX_FWM(i) (((i) << FSL_XCVR_EXT_CTRL_RX_FWM_SHFT) \
+ & FSL_XCVR_EXT_CTRL_RX_FWM_MASK)
#define FSL_XCVR_EXT_CTRL_PAGE_SHFT 16
#define FSL_XCVR_EXT_CTRL_PAGE_MASK GENMASK(19, 16)
-#define FSL_XCVR_EXT_CTRL_PAGE(i) (i << FSL_XCVR_EXT_CTRL_PAGE_SHFT) \
- & FSL_XCVR_EXT_CTRL_PAGE_MASK
+#define FSL_XCVR_EXT_CTRL_PAGE(i) (((i) << FSL_XCVR_EXT_CTRL_PAGE_SHFT) \
+ & FSL_XCVR_EXT_CTRL_PAGE_MASK)
#define FSL_XCVR_IRQ_NEW_CS BIT(0)
#define FSL_XCVR_IRQ_NEW_UD BIT(1)