Skip to content

Commit

Permalink
Input: ad7879-i2c - wrap suspend and resume in CONFIG_PM_SLEEP
Browse files Browse the repository at this point in the history
CONFIG_PM is defined when CONFIG_PM_SLEEP or CONFIG_PM_RUNTIME is defined,
however suspend and resume methods are only valid in the context of
CONFIG_PM_SLEEP. If only CONFIG_PM_RUNTIME is defined we get the following
warning (courtesy of Geerts randconfig builds):

	ad7879-i2c.c: warning: 'ad7879_i2c_resume' defined but not used

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Oct 7, 2011
1 parent 26e56eb commit d4f4158
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/input/touchscreen/ad7879-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#define AD7879_DEVID 0x79 /* AD7879-1/AD7889-1 */

#ifdef CONFIG_PM
#ifdef CONFIG_PM_SLEEP
static int ad7879_i2c_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
Expand All @@ -36,9 +36,9 @@ static int ad7879_i2c_resume(struct device *dev)

return 0;
}
#endif

static SIMPLE_DEV_PM_OPS(ad7879_i2c_pm, ad7879_i2c_suspend, ad7879_i2c_resume);
#endif

/* All registers are word-sized.
* AD7879 uses a high-byte first convention.
Expand Down Expand Up @@ -119,9 +119,7 @@ static struct i2c_driver ad7879_i2c_driver = {
.driver = {
.name = "ad7879",
.owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &ad7879_i2c_pm,
#endif
},
.probe = ad7879_i2c_probe,
.remove = __devexit_p(ad7879_i2c_remove),
Expand Down

0 comments on commit d4f4158

Please sign in to comment.