| Message ID | 1651736047-28809-1-git-send-email-shengjiu.wang@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 101b096bc2549618f18bc08ae3a0e364b3c8fff1 |
| Headers | show |
| Series | ASoC: fsl_micfil: fix the naming style for mask definition | expand |
On Thu, May 05, 2022 at 03:34:07PM +0800, Shengjiu Wang wrote: > Remove the _SHIFT for the mask definition. > > Fixes: 17f2142bae4b ("ASoC: fsl_micfil: use GENMASK to define register bit fields") > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> > --- Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Sascha > sound/soc/fsl/fsl_micfil.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/fsl/fsl_micfil.h b/sound/soc/fsl/fsl_micfil.h > index 08901827047d..053caba3caf3 100644 > --- a/sound/soc/fsl/fsl_micfil.h > +++ b/sound/soc/fsl/fsl_micfil.h > @@ -74,9 +74,9 @@ > #define MICFIL_FIFO_STAT_FIFOX_UNDER(ch) BIT((ch) + 8) > > /* MICFIL HWVAD0 Control 1 Register -- REG_MICFIL_VAD0_CTRL1*/ > -#define MICFIL_VAD0_CTRL1_CHSEL_SHIFT GENMASK(26, 24) > -#define MICFIL_VAD0_CTRL1_CICOSR_SHIFT GENMASK(19, 16) > -#define MICFIL_VAD0_CTRL1_INITT_SHIFT GENMASK(12, 8) > +#define MICFIL_VAD0_CTRL1_CHSEL GENMASK(26, 24) > +#define MICFIL_VAD0_CTRL1_CICOSR GENMASK(19, 16) > +#define MICFIL_VAD0_CTRL1_INITT GENMASK(12, 8) > #define MICFIL_VAD0_CTRL1_ST10 BIT(4) > #define MICFIL_VAD0_CTRL1_ERIE BIT(3) > #define MICFIL_VAD0_CTRL1_IE BIT(2) > @@ -106,7 +106,7 @@ > > /* MICFIL HWVAD0 Zero-Crossing Detector - REG_MICFIL_VAD0_ZCD */ > #define MICFIL_VAD0_ZCD_ZCDTH GENMASK(25, 16) > -#define MICFIL_VAD0_ZCD_ZCDADJ_SHIFT GENMASK(11, 8) > +#define MICFIL_VAD0_ZCD_ZCDADJ GENMASK(11, 8) > #define MICFIL_VAD0_ZCD_ZCDAND BIT(4) > #define MICFIL_VAD0_ZCD_ZCDAUT BIT(2) > #define MICFIL_VAD0_ZCD_ZCDEN BIT(0) > -- > 2.17.1 > >
On Thu, 5 May 2022 15:34:07 +0800, Shengjiu Wang wrote: > Remove the _SHIFT for the mask definition. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: fsl_micfil: fix the naming style for mask definition commit: 101b096bc2549618f18bc08ae3a0e364b3c8fff1 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/fsl/fsl_micfil.h b/sound/soc/fsl/fsl_micfil.h index 08901827047d..053caba3caf3 100644 --- a/sound/soc/fsl/fsl_micfil.h +++ b/sound/soc/fsl/fsl_micfil.h @@ -74,9 +74,9 @@ #define MICFIL_FIFO_STAT_FIFOX_UNDER(ch) BIT((ch) + 8) /* MICFIL HWVAD0 Control 1 Register -- REG_MICFIL_VAD0_CTRL1*/ -#define MICFIL_VAD0_CTRL1_CHSEL_SHIFT GENMASK(26, 24) -#define MICFIL_VAD0_CTRL1_CICOSR_SHIFT GENMASK(19, 16) -#define MICFIL_VAD0_CTRL1_INITT_SHIFT GENMASK(12, 8) +#define MICFIL_VAD0_CTRL1_CHSEL GENMASK(26, 24) +#define MICFIL_VAD0_CTRL1_CICOSR GENMASK(19, 16) +#define MICFIL_VAD0_CTRL1_INITT GENMASK(12, 8) #define MICFIL_VAD0_CTRL1_ST10 BIT(4) #define MICFIL_VAD0_CTRL1_ERIE BIT(3) #define MICFIL_VAD0_CTRL1_IE BIT(2) @@ -106,7 +106,7 @@ /* MICFIL HWVAD0 Zero-Crossing Detector - REG_MICFIL_VAD0_ZCD */ #define MICFIL_VAD0_ZCD_ZCDTH GENMASK(25, 16) -#define MICFIL_VAD0_ZCD_ZCDADJ_SHIFT GENMASK(11, 8) +#define MICFIL_VAD0_ZCD_ZCDADJ GENMASK(11, 8) #define MICFIL_VAD0_ZCD_ZCDAND BIT(4) #define MICFIL_VAD0_ZCD_ZCDAUT BIT(2) #define MICFIL_VAD0_ZCD_ZCDEN BIT(0)
Remove the _SHIFT for the mask definition. Fixes: 17f2142bae4b ("ASoC: fsl_micfil: use GENMASK to define register bit fields") Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> --- sound/soc/fsl/fsl_micfil.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)