[PATCH 1/2] ASoC: fsl_micfil: Remove unneeded ifdef's
There is no need to use ifdef's around the power managament related functions, as they are already using the __maybe_unused notation.
Signed-off-by: Fabio Estevam festevam@gmail.com --- sound/soc/fsl/fsl_micfil.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index e73bd6570a08..1c51bd720e6b 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -753,7 +753,6 @@ static int fsl_micfil_probe(struct platform_device *pdev) return ret; }
-#ifdef CONFIG_PM static int __maybe_unused fsl_micfil_runtime_suspend(struct device *dev) { struct fsl_micfil *micfil = dev_get_drvdata(dev); @@ -780,9 +779,7 @@ static int __maybe_unused fsl_micfil_runtime_resume(struct device *dev)
return 0; } -#endif /* CONFIG_PM*/
-#ifdef CONFIG_PM_SLEEP static int __maybe_unused fsl_micfil_suspend(struct device *dev) { pm_runtime_force_suspend(dev); @@ -796,7 +793,6 @@ static int __maybe_unused fsl_micfil_resume(struct device *dev)
return 0; } -#endif /* CONFIG_PM_SLEEP */
static const struct dev_pm_ops fsl_micfil_pm_ops = { SET_RUNTIME_PM_OPS(fsl_micfil_runtime_suspend,
The IRQ numbers may change depending on the SoC, so do not pass the IRQ numbers in the comments.
Signed-off-by: Fabio Estevam festevam@gmail.com --- sound/soc/fsl/fsl_micfil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index 1c51bd720e6b..c62cc8b41ff0 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -709,7 +709,7 @@ static int fsl_micfil_probe(struct platform_device *pdev) if (of_property_read_bool(np, "fsl,shared-interrupt")) irqflag = IRQF_SHARED;
- /* Digital Microphone interface interrupt - IRQ 109 */ + /* Digital Microphone interface interrupt */ ret = devm_request_irq(&pdev->dev, micfil->irq[0], micfil_isr, irqflag, micfil->name, micfil); @@ -719,7 +719,7 @@ static int fsl_micfil_probe(struct platform_device *pdev) return ret; }
- /* Digital Microphone interface error interrupt - IRQ 110 */ + /* Digital Microphone interface error interrupt */ ret = devm_request_irq(&pdev->dev, micfil->irq[1], micfil_err_isr, irqflag, micfil->name, micfil);
On Mon, 18 May 2020 15:54:47 -0300, Fabio Estevam wrote:
There is no need to use ifdef's around the power managament related functions, as they are already using the __maybe_unused notation.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.8
Thanks!
[1/2] ASoC: fsl_micfil: Remove unneeded ifdef's commit: 1a90a659865299c04ba97b299ab02238dc392d5f [2/2] ASoC: fsl_micfil: Do not pass irq numbers in comments commit: a62ed9606aaebef00ca32da01e552bc0162c29b5
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
participants (2)
-
Fabio Estevam -
Mark Brown