[2.6 patch] i386 scx200.c: small cleanups
From: Adrian Bunk
Date: Sat Dec 11 2004 - 17:05:08 EST
The patch below contains the following changes:
- make two needlessly global functions static
- remove the EXPORT_SYMBOL'ed but completely unused spinlock
scx200_gpio_lock and function scx200_gpio_dump
diffstat output:
arch/i386/kernel/scx200.c | 9 ++++-----
include/linux/scx200_gpio.h | 2 --
2 files changed, 4 insertions(+), 7 deletions(-)
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
--- linux-2.6.10-rc2-mm4-full/include/linux/scx200_gpio.h.old 2004-12-11 20:44:17.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/include/linux/scx200_gpio.h 2004-12-11 20:44:31.000000000 +0100
@@ -1,10 +1,8 @@
#include <linux/spinlock.h>
u32 scx200_gpio_configure(int index, u32 set, u32 clear);
-void scx200_gpio_dump(unsigned index);
extern unsigned scx200_gpio_base;
-extern spinlock_t scx200_gpio_lock;
extern long scx200_gpio_shadow[2];
#define scx200_gpio_present() (scx200_gpio_base!=0)
--- linux-2.6.10-rc2-mm4-full/arch/i386/kernel/scx200.c.old 2004-12-11 20:44:39.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/arch/i386/kernel/scx200.c 2004-12-11 20:46:39.000000000 +0100
@@ -37,7 +37,6 @@
.probe = scx200_probe,
};
-spinlock_t scx200_gpio_lock = SPIN_LOCK_UNLOCKED;
static spinlock_t scx200_gpio_config_lock = SPIN_LOCK_UNLOCKED;
static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
@@ -81,6 +80,7 @@
return config;
}
+#if 0
void scx200_gpio_dump(unsigned index)
{
u32 config = scx200_gpio_configure(index, ~0, 0);
@@ -112,15 +112,16 @@
printk(" DEBOUNCE"); /* debounce */
printk("\n");
}
+#endif /* 0 */
-int __init scx200_init(void)
+static int __init scx200_init(void)
{
printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n");
return pci_module_init(&scx200_pci_driver);
}
-void __exit scx200_cleanup(void)
+static void __exit scx200_cleanup(void)
{
pci_unregister_driver(&scx200_pci_driver);
release_region(scx200_gpio_base, SCx200_GPIO_SIZE);
@@ -131,9 +132,7 @@
EXPORT_SYMBOL(scx200_gpio_base);
EXPORT_SYMBOL(scx200_gpio_shadow);
-EXPORT_SYMBOL(scx200_gpio_lock);
EXPORT_SYMBOL(scx200_gpio_configure);
-EXPORT_SYMBOL(scx200_gpio_dump);
/*
Local variables:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/