Commit 674f96e8 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[PATCH] i386 scx200.c: misc cleanups

The patch below contains the following cleanups:
- make some needlessly global code static
- #if 0 the following unused global functions:
  - scx200_gpio_dump
- remove the following unneeded EXPORT_SYMBOL's:
  - scx200_gpio_lock
  - scx200_gpio_dump
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarHenrik Brix Andersen <brix@gentoo.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dce252ce
...@@ -44,7 +44,6 @@ static struct pci_driver scx200_pci_driver = { ...@@ -44,7 +44,6 @@ static struct pci_driver scx200_pci_driver = {
.probe = scx200_probe, .probe = scx200_probe,
}; };
DEFINE_SPINLOCK(scx200_gpio_lock);
static DEFINE_SPINLOCK(scx200_gpio_config_lock); static DEFINE_SPINLOCK(scx200_gpio_config_lock);
static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
...@@ -105,6 +104,7 @@ u32 scx200_gpio_configure(int index, u32 mask, u32 bits) ...@@ -105,6 +104,7 @@ u32 scx200_gpio_configure(int index, u32 mask, u32 bits)
return config; return config;
} }
#if 0
void scx200_gpio_dump(unsigned index) void scx200_gpio_dump(unsigned index)
{ {
u32 config = scx200_gpio_configure(index, ~0, 0); u32 config = scx200_gpio_configure(index, ~0, 0);
...@@ -136,15 +136,16 @@ void scx200_gpio_dump(unsigned index) ...@@ -136,15 +136,16 @@ void scx200_gpio_dump(unsigned index)
printk(" DEBOUNCE"); /* debounce */ printk(" DEBOUNCE"); /* debounce */
printk("\n"); printk("\n");
} }
#endif /* 0 */
int __init scx200_init(void) static int __init scx200_init(void)
{ {
printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n"); printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n");
return pci_module_init(&scx200_pci_driver); return pci_module_init(&scx200_pci_driver);
} }
void __exit scx200_cleanup(void) static void __exit scx200_cleanup(void)
{ {
pci_unregister_driver(&scx200_pci_driver); pci_unregister_driver(&scx200_pci_driver);
release_region(scx200_gpio_base, SCx200_GPIO_SIZE); release_region(scx200_gpio_base, SCx200_GPIO_SIZE);
...@@ -155,9 +156,7 @@ module_exit(scx200_cleanup); ...@@ -155,9 +156,7 @@ module_exit(scx200_cleanup);
EXPORT_SYMBOL(scx200_gpio_base); EXPORT_SYMBOL(scx200_gpio_base);
EXPORT_SYMBOL(scx200_gpio_shadow); EXPORT_SYMBOL(scx200_gpio_shadow);
EXPORT_SYMBOL(scx200_gpio_lock);
EXPORT_SYMBOL(scx200_gpio_configure); EXPORT_SYMBOL(scx200_gpio_configure);
EXPORT_SYMBOL(scx200_gpio_dump);
EXPORT_SYMBOL(scx200_cb_base); EXPORT_SYMBOL(scx200_cb_base);
/* /*
......
#include <linux/spinlock.h> #include <linux/spinlock.h>
u32 scx200_gpio_configure(int index, u32 set, u32 clear); u32 scx200_gpio_configure(int index, u32 set, u32 clear);
void scx200_gpio_dump(unsigned index);
extern unsigned scx200_gpio_base; extern unsigned scx200_gpio_base;
extern spinlock_t scx200_gpio_lock;
extern long scx200_gpio_shadow[2]; extern long scx200_gpio_shadow[2];
#define scx200_gpio_present() (scx200_gpio_base!=0) #define scx200_gpio_present() (scx200_gpio_base!=0)
......
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