diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-09-23 10:52:02 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-23 14:54:24 +0400 |
| commit | f34c660662cc2b6e133083160bf6a3c77f11886e (patch) | |
| tree | 6ff4557b1d4bffb0035585cb38a26df03159950b /sound/soc/codecs/twl6040.c | |
| parent | 3b5b516fbf7a057b6e2d115c301fec2e206eb6ea (diff) | |
| download | linux-f34c660662cc2b6e133083160bf6a3c77f11886e.tar.xz | |
ASoC: twl6040: No need to read the INTID register
Since our irq handler has been called, it is granted, that
the reason was either PLUGINT, or UNPLUGINT.
The INTID register has been checked in the MFD part of
twl6040 driver (twl6040-irq.c).
We have no reason to read from chip again here.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/twl6040.c')
| -rw-r--r-- | sound/soc/codecs/twl6040.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 68e52c9282a5..91b98186d072 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -740,15 +740,10 @@ static void twl6040_accessory_work(struct work_struct *work) static irqreturn_t twl6040_audio_handler(int irq, void *data) { struct snd_soc_codec *codec = data; - struct twl6040 *twl6040 = codec->control_data; struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec); - u8 intid; - - intid = twl6040_reg_read(twl6040, TWL6040_REG_INTID); - if ((intid & TWL6040_PLUGINT) || (intid & TWL6040_UNPLUGINT)) - queue_delayed_work(priv->workqueue, &priv->delayed_work, - msecs_to_jiffies(200)); + queue_delayed_work(priv->workqueue, &priv->delayed_work, + msecs_to_jiffies(200)); return IRQ_HANDLED; } |