lkml.org 
[lkml]   [2015]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 16/26] Input: synaptics-rmi4: Use ifdef to check if CONFIG_PM_SLEEP is set
Date
The pm variables are not included in the struct rmi_driver_data at compile
time. Using the IS_ENABLED macro in rmi_driver.c will result in a compiler
error if CONFIG_PM_SLEEP is not enabled.

Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
---
drivers/input/rmi4/rmi_driver.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index b569aab..54852a0 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -924,15 +924,15 @@ static int rmi_driver_probe(struct device *dev)
goto err_destroy_functions;
}

- if (IS_ENABLED(CONFIG_PM_SLEEP)) {
- data->pm_data = pdata->pm_data;
- data->pre_suspend = pdata->pre_suspend;
- data->post_suspend = pdata->post_suspend;
- data->pre_resume = pdata->pre_resume;
- data->post_resume = pdata->post_resume;
+#ifdef CONFIG_PM_SLEEP
+ data->pm_data = pdata->pm_data;
+ data->pre_suspend = pdata->pre_suspend;
+ data->post_suspend = pdata->post_suspend;
+ data->pre_resume = pdata->pre_resume;
+ data->post_resume = pdata->post_resume;

- mutex_init(&data->suspend_mutex);
- }
+ mutex_init(&data->suspend_mutex);
+#endif

if (data->input) {
rmi_driver_set_input_name(rmi_dev, data->input);
--
2.1.4


\
 
 \ /
  Last update: 2015-11-06 01:01    [W:0.036 / U:0.796 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site