| Message ID | 20220318092609.130901-1-codrin.ciubotariu@microchip.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c639e85e93aa10ea0512ee416eead60da466e161 |
| Headers | show |
| Series | ASoC: atmel: mchp-pdmc: print the correct property name | expand |
On Fri, 18 Mar 2022 11:26:09 +0200, Codrin Ciubotariu wrote: > The correct property is 'microchip,mic-pos', not 'mchp,mic-pos', so > replace all occurences of 'mchp,mic-pos' with 'microchip,mic-pos'. > Fix a multi-line comment format while we are at it. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: atmel: mchp-pdmc: print the correct property name commit: c639e85e93aa10ea0512ee416eead60da466e161 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/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c index e0aec5fe8a26..1a7802fbf23c 100644 --- a/sound/soc/atmel/mchp-pdmc.c +++ b/sound/soc/atmel/mchp-pdmc.c @@ -879,13 +879,13 @@ static int mchp_pdmc_dt_init(struct mchp_pdmc *dd) dd->mic_no = of_property_count_u32_elems(np, "microchip,mic-pos"); if (dd->mic_no < 0) { - dev_err(dd->dev, "failed to get mchp,mic-pos: %d", + dev_err(dd->dev, "failed to get microchip,mic-pos: %d", dd->mic_no); return dd->mic_no; } if (!dd->mic_no || dd->mic_no % 2 || dd->mic_no / 2 > MCHP_PDMC_MAX_CHANNELS) { - dev_err(dd->dev, "invalid array length for mchp,mic-pos: %d", + dev_err(dd->dev, "invalid array length for microchip,mic-pos: %d", dd->mic_no); return -EINVAL; } @@ -894,9 +894,10 @@ static int mchp_pdmc_dt_init(struct mchp_pdmc *dd) dev_info(dd->dev, "%d PDM microphones declared\n", dd->mic_no); - /* by default, we consider the order of microphones in mchp,mic-pos to - * be the same with the channel mapping; 1st microphone channel 0, 2nd - * microphone channel 1, etc. + /* + * by default, we consider the order of microphones in + * microchip,mic-pos to be the same with the channel mapping; + * 1st microphone channel 0, 2nd microphone channel 1, etc. */ for (i = 0; i < dd->mic_no; i++) { int ds;
The correct property is 'microchip,mic-pos', not 'mchp,mic-pos', so replace all occurences of 'mchp,mic-pos' with 'microchip,mic-pos'. Fix a multi-line comment format while we are at it. Fixes: 50291652af52 ("ASoC: atmel: mchp-pdmc: add PDMC driver") Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> --- sound/soc/atmel/mchp-pdmc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)