Unverified Commit 585fb31c authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Mark Brown
Browse files

ASoC: rt5640: Silence warning message about missing interrupt 



Interrupt is optional for the RT5640 codec. Nexus 7 doesn't use interrupt,
this results in a noisy warning message that looks like a error condition.
Make interrupt explicitly optional to silence the message, use modern
IRQF_NO_AUTOEN flag and correct the reg[q]uest typo in the message.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20210802185258.1881-1-digetx@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bcee7ed0

sound/soc/codecs/rt5640.c

+11 −8
Original line number Diff line number Diff line
@@ -2836,15 +2836,18 @@ static int rt5640_i2c_probe(struct i2c_client *i2c, 
	if (ret)

		return ret;



	if (rt5640->irq) {

		/* enabled by rt5640_set_jack() */

		ret = devm_request_irq(&i2c->dev, rt5640->irq, rt5640_irq,

			       IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING

			       | IRQF_ONESHOT, "rt5640", rt5640);

	if (ret == 0) {

		/* Gets re-enabled by rt5640_set_jack() */

		disable_irq(rt5640->irq);

	} else {

		dev_warn(&i2c->dev, "Failed to reguest IRQ %d: %d\n",

				       IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN |

				       IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

				       "rt5640", rt5640);

		if (ret) {

			dev_err(&i2c->dev, "Failed to request IRQ %d: %d\n",

				rt5640->irq, ret);

			return ret;

		}

	} else {

		rt5640->irq = -ENXIO;

	}