Skip to contentSkip to conversation

input: synaptics-rmi4 - rmi_driver.h tidy up

PATCH Applied Christopher Heiny 2 participants 2 messages Jan 10, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 input: synaptics-rmi4 - rmi_driver.h tidy up

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

Cc Dmitry Torokhov <[email protected]>
Cc Benjamin Tissoires <[email protected]>

---

 drivers/input/rmi4/rmi_driver.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/input/rmi4/rmi_driver.h +1 -3
index 4d82b90..ad3ee33 100644
@@ -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;
 
maintainer Applied
#1 lore raw
Quoted 6 lines · Christopher Heiny

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

Cc Dmitry Torokhov <[email protected]>
Cc Benjamin Tissoires <[email protected]>

Applied, thank you.

Quoted 28 lines

---

 drivers/input/rmi4/rmi_driver.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/input/rmi4/rmi_driver.h +1 -3
index 4d82b90..ad3ee33 100644
@@ -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;
 
Signature · 1 line
Dmitry