Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357601
b: refs/heads/master
c: 5fd86d3
h: refs/heads/master
i:
  357599: 155f087
v: v3
  • Loading branch information
Laxman Dewangan authored and Samuel Ortiz committed Feb 13, 2013
1 parent 0399df5 commit 60c73a7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 24 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4f979ed5e2656570f433101bfc5bc116a919316b
refs/heads/master: 5fd86d34c1fad19a570e7f787d5e4ea94c6f38f7
23 changes: 0 additions & 23 deletions trunk/drivers/mfd/tps65090.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,28 +230,6 @@ static int tps65090_i2c_remove(struct i2c_client *client)
return 0;
}

#ifdef CONFIG_PM_SLEEP
static int tps65090_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
if (client->irq)
disable_irq(client->irq);
return 0;
}

static int tps65090_resume(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
if (client->irq)
enable_irq(client->irq);
return 0;
}
#endif

static const struct dev_pm_ops tps65090_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(tps65090_suspend, tps65090_resume)
};

static const struct i2c_device_id tps65090_id_table[] = {
{ "tps65090", 0 },
{ },
Expand All @@ -263,7 +241,6 @@ static struct i2c_driver tps65090_driver = {
.name = "tps65090",
.owner = THIS_MODULE,
.of_match_table = of_match_ptr(tps65090_of_match),
.pm = &tps65090_pm_ops,
},
.probe = tps65090_i2c_probe,
.remove = tps65090_i2c_remove,
Expand Down

0 comments on commit 60c73a7

Please sign in to comment.