Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 306574
b: refs/heads/master
c: b357140
h: refs/heads/master
v: v3
  • Loading branch information
Dmitry Torokhov committed Apr 4, 2012
1 parent ec7c2ed commit 25a9227
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 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: e6293d2f8a6cd427a1ef4ddecb16b1d5ae1929cd
refs/heads/master: b3571400395e318306165eabbfbe05a4c3e4366c
11 changes: 4 additions & 7 deletions trunk/drivers/input/touchscreen/st1232.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ static int __devexit st1232_ts_remove(struct i2c_client *client)
return 0;
}

#ifdef CONFIG_PM
#ifdef CONFIG_PM_SLEEP
static int st1232_ts_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
Expand All @@ -243,12 +243,11 @@ static int st1232_ts_resume(struct device *dev)
return 0;
}

static const struct dev_pm_ops st1232_ts_pm_ops = {
.suspend = st1232_ts_suspend,
.resume = st1232_ts_resume,
};
#endif

static SIMPLE_DEV_PM_OPS(st1232_ts_pm_ops,
st1232_ts_suspend, st1232_ts_resume);

static const struct i2c_device_id st1232_ts_id[] = {
{ ST1232_TS_NAME, 0 },
{ }
Expand All @@ -271,9 +270,7 @@ static struct i2c_driver st1232_ts_driver = {
.name = ST1232_TS_NAME,
.owner = THIS_MODULE,
.of_match_table = of_match_ptr(st1232_ts_dt_ids),
#ifdef CONFIG_PM
.pm = &st1232_ts_pm_ops,
#endif
},
};

Expand Down

0 comments on commit 25a9227

Please sign in to comment.