diff options
author | Borislav Petkov <bp@suse.de> | 2016-10-29 07:17:40 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2016-11-03 14:12:09 -0400 |
commit | 1793e1c5217c2dc447d79720399a1d4e60c47761 (patch) | |
tree | 21f9277e5cfe1d41104794827673bfea5d1bc51e | |
parent | 5459ada2b3cd69e6bf1b0c034feb810975d0072b (diff) |
HID: intel-ish-hid: Fix !CONFIG_PM build warning
Fix
drivers/hid/intel-ish-hid/ipc/pci-ish.c:247:12: warning: ‘ish_suspend’ defined but not used [-Wunused-function]
static int ish_suspend(struct device *device)
^
drivers/hid/intel-ish-hid/ipc/pci-ish.c:282:12: warning: ‘ish_resume’ defined but not used [-Wunused-function]
static int ish_resume(struct device *device)
^
by sticking them in the CONFIG_PM range too.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: Wei Yongjun <weiyongjun1@huawei.com>
Cc: linux-input@vger.kernel.org
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/intel-ish-hid/ipc/pci-ish.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c index 42f0beeb09fd..7e3622a724aa 100644 --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c | |||
@@ -202,6 +202,7 @@ static void ish_remove(struct pci_dev *pdev) | |||
202 | kfree(ishtp_dev); | 202 | kfree(ishtp_dev); |
203 | } | 203 | } |
204 | 204 | ||
205 | #ifdef CONFIG_PM | ||
205 | static struct device *ish_resume_device; | 206 | static struct device *ish_resume_device; |
206 | 207 | ||
207 | /** | 208 | /** |
@@ -293,7 +294,6 @@ static int ish_resume(struct device *device) | |||
293 | return 0; | 294 | return 0; |
294 | } | 295 | } |
295 | 296 | ||
296 | #ifdef CONFIG_PM | ||
297 | static const struct dev_pm_ops ish_pm_ops = { | 297 | static const struct dev_pm_ops ish_pm_ops = { |
298 | .suspend = ish_suspend, | 298 | .suspend = ish_suspend, |
299 | .resume = ish_resume, | 299 | .resume = ish_resume, |
@@ -301,7 +301,7 @@ static const struct dev_pm_ops ish_pm_ops = { | |||
301 | #define ISHTP_ISH_PM_OPS (&ish_pm_ops) | 301 | #define ISHTP_ISH_PM_OPS (&ish_pm_ops) |
302 | #else | 302 | #else |
303 | #define ISHTP_ISH_PM_OPS NULL | 303 | #define ISHTP_ISH_PM_OPS NULL |
304 | #endif | 304 | #endif /* CONFIG_PM */ |
305 | 305 | ||
306 | static struct pci_driver ish_driver = { | 306 | static struct pci_driver ish_driver = { |
307 | .name = KBUILD_MODNAME, | 307 | .name = KBUILD_MODNAME, |