Message ID | 1389319178-27751-1-git-send-email-cheiny@synaptics.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
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; >
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;
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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html