diff options
author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2014-09-19 07:48:18 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-24 04:37:17 -0400 |
commit | ced1933db67087554abf22bcb285eb6873380b10 (patch) | |
tree | 976bdcea44a6c0246ad399e161d6b071cc44804b | |
parent | 7a7f0ba03d521ac2d36c9015278bc35657b3dcc9 (diff) |
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>
-rw-r--r-- | sound/soc/codecs/max98090.c | 3 | ||||
-rw-r--r-- | sound/soc/codecs/max98090.h | 1 |
2 files changed, 1 insertions, 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, | |||
2463 | max98090->devtype = driver_data; | 2463 | max98090->devtype = driver_data; |
2464 | i2c_set_clientdata(i2c, max98090); | 2464 | i2c_set_clientdata(i2c, max98090); |
2465 | max98090->pdata = i2c->dev.platform_data; | 2465 | max98090->pdata = i2c->dev.platform_data; |
2466 | max98090->irq = i2c->irq; | ||
2467 | 2466 | ||
2468 | max98090->regmap = devm_regmap_init_i2c(i2c, &max98090_regmap); | 2467 | max98090->regmap = devm_regmap_init_i2c(i2c, &max98090_regmap); |
2469 | if (IS_ERR(max98090->regmap)) { | 2468 | if (IS_ERR(max98090->regmap)) { |
@@ -2472,7 +2471,7 @@ static int max98090_i2c_probe(struct i2c_client *i2c, | |||
2472 | goto err_enable; | 2471 | goto err_enable; |
2473 | } | 2472 | } |
2474 | 2473 | ||
2475 | ret = devm_request_threaded_irq(&i2c->dev, max98090->irq, NULL, | 2474 | ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL, |
2476 | max98090_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT, | 2475 | max98090_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT, |
2477 | "max98090_interrupt", max98090); | 2476 | "max98090_interrupt", max98090); |
2478 | if (ret < 0) { | 2477 | 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 { | |||
1529 | unsigned int bclk; | 1529 | unsigned int bclk; |
1530 | unsigned int lrclk; | 1530 | unsigned int lrclk; |
1531 | struct max98090_cdata dai[1]; | 1531 | struct max98090_cdata dai[1]; |
1532 | int irq; | ||
1533 | int jack_state; | 1532 | int jack_state; |
1534 | struct delayed_work jack_work; | 1533 | struct delayed_work jack_work; |
1535 | struct delayed_work pll_det_enable_work; | 1534 | struct delayed_work pll_det_enable_work; |