aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2012-11-19 22:14:47 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2012-11-21 10:07:52 -0500
commit3863db3e800c64e21e4effcc3de0f72cdb9b0d77 (patch)
tree22fdb7439685a9180b3f99bb3cae14f2be468cee
parente8e6f047e666a1682b59e52637a7acaa8a0b4c89 (diff)
mfd: tps65090: Remove unused member of struct tps65090
Remove unused member from tps65090 data structure as these are not used. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/tps65090.c6
-rw-r--r--include/linux/mfd/tps65090.h11
2 files changed, 1 insertions, 16 deletions
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index f95f7f6b846c..3cfc9dcbe9dc 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -269,12 +269,9 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client,
269 return -ENOMEM; 269 return -ENOMEM;
270 } 270 }
271 271
272 tps65090->client = client;
273 tps65090->dev = &client->dev; 272 tps65090->dev = &client->dev;
274 i2c_set_clientdata(client, tps65090); 273 i2c_set_clientdata(client, tps65090);
275 274
276 mutex_init(&tps65090->lock);
277
278 if (client->irq) { 275 if (client->irq) {
279 ret = tps65090_irq_init(tps65090, client->irq, pdata->irq_base); 276 ret = tps65090_irq_init(tps65090, client->irq, pdata->irq_base);
280 if (ret) { 277 if (ret) {
@@ -284,8 +281,7 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client,
284 } 281 }
285 } 282 }
286 283
287 tps65090->rmap = devm_regmap_init_i2c(tps65090->client, 284 tps65090->rmap = devm_regmap_init_i2c(client, &tps65090_regmap_config);
288 &tps65090_regmap_config);
289 if (IS_ERR(tps65090->rmap)) { 285 if (IS_ERR(tps65090->rmap)) {
290 ret = PTR_ERR(tps65090->rmap); 286 ret = PTR_ERR(tps65090->rmap);
291 dev_err(&client->dev, "regmap_init failed with err: %d\n", ret); 287 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 6bc31d854626..6c576224f637 100644
--- a/include/linux/mfd/tps65090.h
+++ b/include/linux/mfd/tps65090.h
@@ -25,26 +25,15 @@
25#include <linux/irq.h> 25#include <linux/irq.h>
26 26
27struct tps65090 { 27struct tps65090 {
28 struct mutex lock;
29 struct device *dev; 28 struct device *dev;
30 struct i2c_client *client;
31 struct regmap *rmap; 29 struct regmap *rmap;
32 struct irq_chip irq_chip; 30 struct irq_chip irq_chip;
33 struct mutex irq_lock; 31 struct mutex irq_lock;
34 int irq_base; 32 int irq_base;
35 unsigned int id;
36};
37
38struct tps65090_subdev_info {
39 int id;
40 const char *name;
41 void *platform_data;
42}; 33};
43 34
44struct tps65090_platform_data { 35struct tps65090_platform_data {
45 int irq_base; 36 int irq_base;
46 int num_subdevs;
47 struct tps65090_subdev_info *subdevs;
48}; 37};
49 38
50/* 39/*