Message ID | 20220405075959.2744803-20-s.hauer@pengutronix.de (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | ASoC: fsl_micfil: Driver updates | expand |
On Tue, Apr 5, 2022 at 4:00 PM Sascha Hauer <s.hauer@pengutronix.de> wrote: > The "fsl,shared-interrupt" property is undocumented and unnecessary. > Just pass IRQF_SHARED unconditionally. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com> Best regards Wang shengjiu > --- > sound/soc/fsl/fsl_micfil.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c > index f536ea2db89db..99c256f46f38e 100644 > --- a/sound/soc/fsl/fsl_micfil.c > +++ b/sound/soc/fsl/fsl_micfil.c > @@ -553,7 +553,6 @@ static int fsl_micfil_probe(struct platform_device > *pdev) > struct resource *res; > void __iomem *regs; > int ret, i; > - unsigned long irqflag = 0; > > micfil = devm_kzalloc(&pdev->dev, sizeof(*micfil), GFP_KERNEL); > if (!micfil) > @@ -617,12 +616,9 @@ static int fsl_micfil_probe(struct platform_device > *pdev) > return micfil->irq[i]; > } > > - if (of_property_read_bool(np, "fsl,shared-interrupt")) > - irqflag = IRQF_SHARED; > - > /* Digital Microphone interface interrupt */ > ret = devm_request_irq(&pdev->dev, micfil->irq[0], > - micfil_isr, irqflag, > + micfil_isr, IRQF_SHARED, > micfil->name, micfil); > if (ret) { > dev_err(&pdev->dev, "failed to claim mic interface irq > %u\n", > @@ -632,7 +628,7 @@ static int fsl_micfil_probe(struct platform_device > *pdev) > > /* Digital Microphone interface error interrupt */ > ret = devm_request_irq(&pdev->dev, micfil->irq[1], > - micfil_err_isr, irqflag, > + micfil_err_isr, IRQF_SHARED, > micfil->name, micfil); > if (ret) { > dev_err(&pdev->dev, "failed to claim mic interface error > irq %u\n", > -- > 2.30.2 > >
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index f536ea2db89db..99c256f46f38e 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -553,7 +553,6 @@ static int fsl_micfil_probe(struct platform_device *pdev) struct resource *res; void __iomem *regs; int ret, i; - unsigned long irqflag = 0; micfil = devm_kzalloc(&pdev->dev, sizeof(*micfil), GFP_KERNEL); if (!micfil) @@ -617,12 +616,9 @@ static int fsl_micfil_probe(struct platform_device *pdev) return micfil->irq[i]; } - if (of_property_read_bool(np, "fsl,shared-interrupt")) - irqflag = IRQF_SHARED; - /* Digital Microphone interface interrupt */ ret = devm_request_irq(&pdev->dev, micfil->irq[0], - micfil_isr, irqflag, + micfil_isr, IRQF_SHARED, micfil->name, micfil); if (ret) { dev_err(&pdev->dev, "failed to claim mic interface irq %u\n", @@ -632,7 +628,7 @@ static int fsl_micfil_probe(struct platform_device *pdev) /* Digital Microphone interface error interrupt */ ret = devm_request_irq(&pdev->dev, micfil->irq[1], - micfil_err_isr, irqflag, + micfil_err_isr, IRQF_SHARED, micfil->name, micfil); if (ret) { dev_err(&pdev->dev, "failed to claim mic interface error irq %u\n",
The "fsl,shared-interrupt" property is undocumented and unnecessary. Just pass IRQF_SHARED unconditionally. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- sound/soc/fsl/fsl_micfil.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)