diff options
| author | Dmitry Torokhov | 2014-12-16 05:32:42 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2014-12-16 05:32:42 +0100 |
| commit | f20c86cd75f1c8c728dafd0218645ff3c5e8545d (patch) | |
| tree | b9100463df79eeafbef87a0bbbaaba4740313120 /drivers/input/misc/ad714x-spi.c | |
| parent | Input: xpad - use proper endpoint type (diff) | |
| parent | Input: gpio_keys - fix warning regarding uninitialized 'button' variable (diff) | |
| download | kernel-qcow2-linux-f20c86cd75f1c8c728dafd0218645ff3c5e8545d.tar.gz kernel-qcow2-linux-f20c86cd75f1c8c728dafd0218645ff3c5e8545d.tar.xz kernel-qcow2-linux-f20c86cd75f1c8c728dafd0218645ff3c5e8545d.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 3.19.
Diffstat (limited to 'drivers/input/misc/ad714x-spi.c')
| -rw-r--r-- | drivers/input/misc/ad714x-spi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/misc/ad714x-spi.c b/drivers/input/misc/ad714x-spi.c index 3a90b710e309..a79e50b58bf5 100644 --- a/drivers/input/misc/ad714x-spi.c +++ b/drivers/input/misc/ad714x-spi.c @@ -16,17 +16,15 @@ #define AD714x_SPI_CMD_PREFIX 0xE000 /* bits 15:11 */ #define AD714x_SPI_READ BIT(10) -#ifdef CONFIG_PM_SLEEP -static int ad714x_spi_suspend(struct device *dev) +static int __maybe_unused ad714x_spi_suspend(struct device *dev) { return ad714x_disable(spi_get_drvdata(to_spi_device(dev))); } -static int ad714x_spi_resume(struct device *dev) +static int __maybe_unused ad714x_spi_resume(struct device *dev) { return ad714x_enable(spi_get_drvdata(to_spi_device(dev))); } -#endif static SIMPLE_DEV_PM_OPS(ad714x_spi_pm, ad714x_spi_suspend, ad714x_spi_resume); |