From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Mark Brown <broonie@kernel.org>,
Jarkko Nikula <jarkko.nikula@linux.intel.com>,
Liam Girdwood <lgirdwood@gmail.com>
Subject: [PATCH 2/5] ASoC: max98090: Remove structure member irq from private data
Date: Fri, 19 Sep 2014 14:48:18 +0300 [thread overview]
Message-ID: <1411127301-366-2-git-send-email-jarkko.nikula@linux.intel.com> (raw)
In-Reply-To: <1411127301-366-1-git-send-email-jarkko.nikula@linux.intel.com>
struct max98090_priv member irq is now used only locally in
max98090_i2c_probe() and can be removed.
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
sound/soc/codecs/max98090.c | 3 +--
sound/soc/codecs/max98090.h | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index fe77df6a76c2..3e27de1f473b 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2463,7 +2463,6 @@ static int max98090_i2c_probe(struct i2c_client *i2c,
max98090->devtype = driver_data;
i2c_set_clientdata(i2c, max98090);
max98090->pdata = i2c->dev.platform_data;
- max98090->irq = i2c->irq;
max98090->regmap = devm_regmap_init_i2c(i2c, &max98090_regmap);
if (IS_ERR(max98090->regmap)) {
@@ -2472,7 +2471,7 @@ static int max98090_i2c_probe(struct i2c_client *i2c,
goto err_enable;
}
- ret = devm_request_threaded_irq(&i2c->dev, max98090->irq, NULL,
+ ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL,
max98090_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"max98090_interrupt", max98090);
if (ret < 0) {
diff --git a/sound/soc/codecs/max98090.h b/sound/soc/codecs/max98090.h
index 14427a566f41..a16319512182 100644
--- a/sound/soc/codecs/max98090.h
+++ b/sound/soc/codecs/max98090.h
@@ -1529,7 +1529,6 @@ struct max98090_priv {
unsigned int bclk;
unsigned int lrclk;
struct max98090_cdata dai[1];
- int irq;
int jack_state;
struct delayed_work jack_work;
struct delayed_work pll_det_enable_work;
--
2.1.0
next prev parent reply other threads:[~2014-09-19 11:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-19 11:48 [PATCH 1/5] ASoC: max98090: Move interrupt request from codec probe to i2c probe Jarkko Nikula
2014-09-19 11:48 ` Jarkko Nikula [this message]
2014-09-19 11:48 ` [PATCH 3/5] ASoC: max98090: Remove structure member extmic_mux from private data Jarkko Nikula
2014-09-19 11:48 ` [PATCH 4/5] ASoC: max98090: Remove unused version define Jarkko Nikula
2014-09-19 11:48 ` [PATCH 5/5] ASoC: max98090: Remove unused byte access macros Jarkko Nikula
2014-09-24 8:37 ` [PATCH 1/5] ASoC: max98090: Move interrupt request from codec probe to i2c probe Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411127301-366-2-git-send-email-jarkko.nikula@linux.intel.com \
--to=jarkko.nikula@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.