iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sparc: i8042-sparcio.h: fix warning

Browse Source 
drivers/input/serio/i8042-sparcio.h:95: warning: 'sparc_i8042_driver'
defined but not used

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Beregalov 2008-08-06 02:43:24 -07:00 committed by David S. Miller
parent 0967d61ea0
commit 8c6a5cad1e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/input/serio/i8042-sparcio.h
View File

@ -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 = {
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)
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 */