Skip to contentSkip to conversation

Input: htcpen - add #ifdef CONFIG_PNP guard for pnp_ids

PATCH In review Axel Lin 2 participants 2 messages Nov 10, 2011

Subsystems (3)
HID Input drivers Htcpen touchscreen driver
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 Input: htcpen - add #ifdef CONFIG_PNP guard for pnp_ids

Fix below build warning if CONFIG_PNP is disabled.

CC drivers/input/touchscreen/htcpen.o
drivers/input/touchscreen/htcpen.c:50: warning: 'pnp_ids' defined but not used

Signed-off-by Axel Lin <[email protected]>
---
 drivers/input/touchscreen/htcpen.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/input/touchscreen/htcpen.c +2 -0
index 62811de..7acc928 100644
@@ -47,11 +47,13 @@ static int invert_y;
 module_param(invert_y, bool, 0644);
 MODULE_PARM_DESC(invert_y, "If set, Y axis is inverted");
 
+#ifdef CONFIG_PNP
 static struct pnp_device_id pnp_ids[] = {
 	{ .id = "PNP0cc0" },
 	{ .id = "" }
 };
 MODULE_DEVICE_TABLE(pnp, pnp_ids);
+#endif
 
 static irqreturn_t htcpen_interrupt(int irq, void *handle)
 {
Signature · 1 line
1.7.5.4
maintainer
#1 lore raw
Quoted 5 lines · Axel Lin

Fix below build warning if CONFIG_PNP is disabled.

CC drivers/input/touchscreen/htcpen.o
drivers/input/touchscreen/htcpen.c:50: warning: 'pnp_ids' defined but not used

Does not seem to help, How about below instead?

Thanks.

Signature · 22 lines
Dmitry


Input: htcpen - switch to DMI-based autoloading

From: Dmitry Torokhov <[email protected]>

Having module device table based on PNP id produces the following warning:

  CC      drivers/input/touchscreen/htcpen.o
drivers/input/touchscreen/htcpen.c:50: warning: 'pnp_ids' defined but not used

This happens because it is not a PNP driver, bit rather ISA driver and
pnp_ids table is not used anywhere. To fix this issue let's switch to
DMI-based module table instead,

Reported-by: Axel Lin <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
---

 drivers/input/touchscreen/htcpen.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
drivers/input/touchscreen/htcpen.c +1 -6
index 62811de..81e3386 100644
@@ -47,12 +47,6 @@ static int invert_y;
 module_param(invert_y, bool, 0644);
 MODULE_PARM_DESC(invert_y, "If set, Y axis is inverted");
 
-static struct pnp_device_id pnp_ids[] = {
-	{ .id = "PNP0cc0" },
-	{ .id = "" }
-};
-MODULE_DEVICE_TABLE(pnp, pnp_ids);
-
 static irqreturn_t htcpen_interrupt(int irq, void *handle)
 {
 	struct input_dev *htcpen_dev = handle;

@@ -237,6 +231,7 @@ static struct dmi_system_id __initdata htcshift_dmi_table[] = {
 	},
 	{ }
 };
+MODULE_DEVICE_TABLE(dmi, htcshift_dmi_table);
 
 static int __init htcpen_isa_init(void)
 {