diff options
-rw-r--r-- | drivers/mfd/tps65090.c | 6 | ||||
-rw-r--r-- | include/linux/mfd/tps65090.h | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c index ec60ac746d2c..174166445ab0 100644 --- a/drivers/mfd/tps65090.c +++ b/drivers/mfd/tps65090.c @@ -230,12 +230,9 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client, if (tps65090 == NULL) return -ENOMEM; - tps65090->client = client; tps65090->dev = &client->dev; i2c_set_clientdata(client, tps65090); - mutex_init(&tps65090->lock); - if (client->irq) { ret = tps65090_irq_init(tps65090, client->irq, pdata->irq_base); if (ret) { @@ -245,8 +242,7 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client, } } - tps65090->rmap = devm_regmap_init_i2c(tps65090->client, - &tps65090_regmap_config); + tps65090->rmap = devm_regmap_init_i2c(client, &tps65090_regmap_config); if (IS_ERR(tps65090->rmap)) { ret = PTR_ERR(tps65090->rmap); dev_err(&client->dev, "regmap_init failed with err: %d\n", ret); diff --git a/include/linux/mfd/tps65090.h b/include/linux/mfd/tps65090.h index ba6b80aa0992..7ae86b956710 100644 --- a/include/linux/mfd/tps65090.h +++ b/include/linux/mfd/tps65090.h @@ -26,14 +26,11 @@ #include <linux/regmap.h> struct tps65090 { - struct mutex lock; struct device *dev; - struct i2c_client *client; struct regmap *rmap; struct irq_chip irq_chip; struct mutex irq_lock; int irq_base; - unsigned int id; }; struct tps65090_platform_data { |