[PATCH] input: synaptics-rmi4 - rmi_driver.h tidy up

Subsystems: input (keyboard, mouse, joystick, touchscreen) drivers, the rest

STALE4629d

2 messages, 2 authors, 2014-01-10 · open the first message on its own page

[PATCH] input: synaptics-rmi4 - rmi_driver.h tidy up

From: Christopher Heiny <hidden>
Date: 2014-01-10 01:59:41

This is a trivial change to remove an unused macro, and change CONFIG_PM to
CONFIG_PM_SLEEP.

Signed-off-by: Christopher Heiny <redacted>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Benjamin Tissoires <redacted>

---

 drivers/input/rmi4/rmi_driver.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/input/rmi4/rmi_driver.h b/drivers/input/rmi4/rmi_driver.h
index 4d82b90..ad3ee33 100644
--- a/drivers/input/rmi4/rmi_driver.h
+++ b/drivers/input/rmi4/rmi_driver.h
@@ -24,8 +24,6 @@
 	.attrs = _attrs,  \
 }
 
-#define attrify(nm) (&dev_attr_##nm.attr)
-
 #define PDT_PROPERTIES_LOCATION 0x00EF
 #define BSR_LOCATION 0x00FE
 
@@ -62,7 +60,7 @@ struct rmi_driver_data {
 	u8 bsr;
 
 	bool enabled;
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 	bool suspended;
 	struct mutex suspend_mutex;
 

Re: [PATCH] input: synaptics-rmi4 - rmi_driver.h tidy up

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2014-01-10 06:28:07

On Thu, Jan 09, 2014 at 05:59:38PM -0800, Christopher Heiny wrote:
This is a trivial change to remove an unused macro, and change CONFIG_PM to
CONFIG_PM_SLEEP.

Signed-off-by: Christopher Heiny <redacted>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Benjamin Tissoires <redacted>
Applied, thank you.
quoted hunk
---

 drivers/input/rmi4/rmi_driver.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/input/rmi4/rmi_driver.h b/drivers/input/rmi4/rmi_driver.h
index 4d82b90..ad3ee33 100644
--- a/drivers/input/rmi4/rmi_driver.h
+++ b/drivers/input/rmi4/rmi_driver.h
@@ -24,8 +24,6 @@
 	.attrs = _attrs,  \
 }
 
-#define attrify(nm) (&dev_attr_##nm.attr)
-
 #define PDT_PROPERTIES_LOCATION 0x00EF
 #define BSR_LOCATION 0x00FE
 
@@ -62,7 +60,7 @@ struct rmi_driver_data {
 	u8 bsr;
 
 	bool enabled;
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 	bool suspended;
 	struct mutex suspend_mutex;
 
-- 
Dmitry
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help