From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Date: Fri, 19 Sep 2014 11:48:18 +0000 (+0300)
Subject: ASoC: max98090: Remove structure member irq from private data
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ced1933db67087554abf22bcb285eb6873380b10;p=deliverable%2Flinux.git

ASoC: max98090: Remove structure member irq from private data

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>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

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;