diff mbox

Input: wacom - Fix compiler warning if !CONFIG_PM

Message ID 1407604023-7429-1-git-send-email-geert@linux-m68k.org (mailing list archive)
State New, archived
Headers show

Commit Message

Geert Uytterhoeven Aug. 9, 2014, 5:07 p.m. UTC
If CONFIG_PM is not set:

drivers/hid/wacom_sys.c:1436: warning: ‘wacom_reset_resume’ defined but
not used

Protect the unused functions by #ifdef CONFIG_PM to fix this.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/hid/wacom_sys.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Jiri Kosina Aug. 9, 2014, 8:39 p.m. UTC | #1
On Sat, 9 Aug 2014, Geert Uytterhoeven wrote:

> If CONFIG_PM is not set:
> 
> drivers/hid/wacom_sys.c:1436: warning: ‘wacom_reset_resume’ defined but
> not used
> 
> Protect the unused functions by #ifdef CONFIG_PM to fix this.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Thanks Geert.

hid-wacom is in a sort of temporary mode of operation, being moved from 
Input to HID driver.

Adding Benjamin and Dmitry to CC, as this will likely still go through 
Dmitry's queue.

> ---
>  drivers/hid/wacom_sys.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
> index 3e388ec31da8..f0db7eca9023 100644
> --- a/drivers/hid/wacom_sys.c
> +++ b/drivers/hid/wacom_sys.c
> @@ -1416,6 +1416,7 @@ static void wacom_remove(struct hid_device *hdev)
>  	kfree(wacom);
>  }
>  
> +#ifdef CONFIG_PM
>  static int wacom_resume(struct hid_device *hdev)
>  {
>  	struct wacom *wacom = hid_get_drvdata(hdev);
> @@ -1436,6 +1437,7 @@ static int wacom_reset_resume(struct hid_device *hdev)
>  {
>  	return wacom_resume(hdev);
>  }
> +#endif /* CONFIG_PM */
>  
>  static struct hid_driver wacom_driver = {
>  	.name =		"wacom",
> -- 
> 1.9.1
>
Benjamin Tissoires Aug. 11, 2014, 2:42 p.m. UTC | #2
On Aug 09 2014 or thereabouts, Jiri Kosina wrote:
> On Sat, 9 Aug 2014, Geert Uytterhoeven wrote:
> 
> > If CONFIG_PM is not set:
> > 
> > drivers/hid/wacom_sys.c:1436: warning: ‘wacom_reset_resume’ defined but
> > not used
> > 
> > Protect the unused functions by #ifdef CONFIG_PM to fix this.
> > 
> > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> 
> Thanks Geert.
> 
> hid-wacom is in a sort of temporary mode of operation, being moved from 
> Input to HID driver.
> 
> Adding Benjamin and Dmitry to CC, as this will likely still go through 
> Dmitry's queue.
> 

Thanks for fixing this Geert.

Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

Cheers,
Benjamin

--
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
Dmitry Torokhov Aug. 12, 2014, 5 p.m. UTC | #3
On Mon, Aug 11, 2014 at 10:42:38AM -0400, Benjamin Tissoires wrote:
> On Aug 09 2014 or thereabouts, Jiri Kosina wrote:
> > On Sat, 9 Aug 2014, Geert Uytterhoeven wrote:
> > 
> > > If CONFIG_PM is not set:
> > > 
> > > drivers/hid/wacom_sys.c:1436: warning: ‘wacom_reset_resume’ defined but
> > > not used
> > > 
> > > Protect the unused functions by #ifdef CONFIG_PM to fix this.
> > > 
> > > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> > 
> > Thanks Geert.
> > 
> > hid-wacom is in a sort of temporary mode of operation, being moved from 
> > Input to HID driver.
> > 
> > Adding Benjamin and Dmitry to CC, as this will likely still go through 
> > Dmitry's queue.
> > 
> 
> Thanks for fixing this Geert.
> 
> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

Applied, thank you.
diff mbox

Patch

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 3e388ec31da8..f0db7eca9023 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -1416,6 +1416,7 @@  static void wacom_remove(struct hid_device *hdev)
 	kfree(wacom);
 }
 
+#ifdef CONFIG_PM
 static int wacom_resume(struct hid_device *hdev)
 {
 	struct wacom *wacom = hid_get_drvdata(hdev);
@@ -1436,6 +1437,7 @@  static int wacom_reset_resume(struct hid_device *hdev)
 {
 	return wacom_resume(hdev);
 }
+#endif /* CONFIG_PM */
 
 static struct hid_driver wacom_driver = {
 	.name =		"wacom",