* [PATCH] input: synaptics-rmi4 - rmi_driver.h tidy up
@ 2014-01-10 1:59 Christopher Heiny
2014-01-10 6:28 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Christopher Heiny @ 2014-01-10 1:59 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Linux Input, Christopher Heiny, Andrew Duggan, Vincent Huang,
Vivian Ly, Daniel Rosenberg, Jean Delvare, Joerie de Gram,
Linus Walleij, Benjamin Tissoires
This is a trivial change to remove an unused macro, and change CONFIG_PM to
CONFIG_PM_SLEEP.
Signed-off-by: Christopher Heiny <cheiny@synaptics.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] input: synaptics-rmi4 - rmi_driver.h tidy up
2014-01-10 1:59 [PATCH] input: synaptics-rmi4 - rmi_driver.h tidy up Christopher Heiny
@ 2014-01-10 6:28 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2014-01-10 6:28 UTC (permalink / raw)
To: Christopher Heiny
Cc: Linux Input, Andrew Duggan, Vincent Huang, Vivian Ly,
Daniel Rosenberg, Jean Delvare, Joerie de Gram, Linus Walleij,
Benjamin Tissoires
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 <cheiny@synaptics.com>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Applied, thank you.
>
> ---
>
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-10 6:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-10 1:59 [PATCH] input: synaptics-rmi4 - rmi_driver.h tidy up Christopher Heiny
2014-01-10 6:28 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).