Commit 8c6a5cad authored by Alexander Beregalov's avatar Alexander Beregalov Committed by David S. Miller

sparc: i8042-sparcio.h: fix warning

drivers/input/serio/i8042-sparcio.h:95: warning: 'sparc_i8042_driver'
defined but not used
Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0967d61e
...@@ -41,6 +41,8 @@ static inline void i8042_write_command(int val) ...@@ -41,6 +41,8 @@ static inline void i8042_write_command(int val)
writeb(val, kbd_iobase + 0x64UL); writeb(val, kbd_iobase + 0x64UL);
} }
#ifdef CONFIG_PCI
#define OBP_PS2KBD_NAME1 "kb_ps2" #define OBP_PS2KBD_NAME1 "kb_ps2"
#define OBP_PS2KBD_NAME2 "keyboard" #define OBP_PS2KBD_NAME2 "keyboard"
#define OBP_PS2MS_NAME1 "kdmouse" #define OBP_PS2MS_NAME1 "kdmouse"
...@@ -101,9 +103,6 @@ static struct of_platform_driver sparc_i8042_driver = { ...@@ -101,9 +103,6 @@ static struct of_platform_driver sparc_i8042_driver = {
static int __init i8042_platform_init(void) static int __init i8042_platform_init(void)
{ {
#ifndef CONFIG_PCI
return -ENODEV;
#else
struct device_node *root = of_find_node_by_path("/"); struct device_node *root = of_find_node_by_path("/");
if (!strcmp(root->name, "SUNW,JavaStation-1")) { if (!strcmp(root->name, "SUNW,JavaStation-1")) {
...@@ -131,17 +130,25 @@ static int __init i8042_platform_init(void) ...@@ -131,17 +130,25 @@ static int __init i8042_platform_init(void)
i8042_reset = 1; i8042_reset = 1;
return 0; return 0;
#endif /* CONFIG_PCI */
} }
static inline void i8042_platform_exit(void) static inline void i8042_platform_exit(void)
{ {
#ifdef CONFIG_PCI
struct device_node *root = of_find_node_by_path("/"); struct device_node *root = of_find_node_by_path("/");
if (strcmp(root->name, "SUNW,JavaStation-1")) if (strcmp(root->name, "SUNW,JavaStation-1"))
of_unregister_driver(&sparc_i8042_driver); of_unregister_driver(&sparc_i8042_driver);
#endif
} }
#else /* !CONFIG_PCI */
static int __init i8042_platform_init(void)
{
return -ENODEV;
}
static inline void i8042_platform_exit(void)
{
}
#endif /* !CONFIG_PCI */
#endif /* _I8042_SPARCIO_H */ #endif /* _I8042_SPARCIO_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment