diff options
author | Jim Cromie <jim.cromie@gmail.com> | 2006-06-27 05:54:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 20:32:43 -0400 |
commit | 0e41ef3c51ea7dbb764616f60a90700647fc8518 (patch) | |
tree | fc55403cca82ed01da9d6a7fadbaf4329cf9beb2 /arch | |
parent | 1a66fdf083bf2b60c4d12feb970bc7373b59e33a (diff) |
[PATCH] chardev: GPIO for SCx200 & PC-8736x: migrate gpio_dump to common module
Since the meaning of config-bits is the same for scx200 and pc8736x _gpios, we
can share a function to deliver this to user. Since it is called via the
vtable, its also completely replaceable. For now, we keep using printk...
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/kernel/scx200.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/i386/kernel/scx200.c b/arch/i386/kernel/scx200.c index 27be55349c65..edead73ebef2 100644 --- a/arch/i386/kernel/scx200.c +++ b/arch/i386/kernel/scx200.c | |||
@@ -110,21 +110,6 @@ u32 scx200_gpio_configure(unsigned index, u32 mask, u32 bits) | |||
110 | return config; | 110 | return config; |
111 | } | 111 | } |
112 | 112 | ||
113 | void scx200_gpio_dump(unsigned index) | ||
114 | { | ||
115 | u32 config = scx200_gpio_configure(index, ~0, 0); | ||
116 | |||
117 | printk(KERN_INFO NAME ": GPIO-%02u: 0x%08lx %s %s %s %s %s %s %s\n", | ||
118 | index, (unsigned long) config, | ||
119 | (config & 1) ? "OE" : "TS", /* output enabled / tristate */ | ||
120 | (config & 2) ? "PP" : "OD", /* push pull / open drain */ | ||
121 | (config & 4) ? "PUE" : "PUD", /* pull up enabled/disabled */ | ||
122 | (config & 8) ? "LOCKED" : "", /* locked / unlocked */ | ||
123 | (config & 16) ? "LEVEL" : "EDGE", /* level/edge input */ | ||
124 | (config & 32) ? "HI" : "LO", /* trigger on rising/falling edge */ | ||
125 | (config & 64) ? "DEBOUNCE" : ""); /* debounce */ | ||
126 | } | ||
127 | |||
128 | static int __init scx200_init(void) | 113 | static int __init scx200_init(void) |
129 | { | 114 | { |
130 | printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n"); | 115 | printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n"); |
@@ -144,5 +129,4 @@ module_exit(scx200_cleanup); | |||
144 | EXPORT_SYMBOL(scx200_gpio_base); | 129 | EXPORT_SYMBOL(scx200_gpio_base); |
145 | EXPORT_SYMBOL(scx200_gpio_shadow); | 130 | EXPORT_SYMBOL(scx200_gpio_shadow); |
146 | EXPORT_SYMBOL(scx200_gpio_configure); | 131 | EXPORT_SYMBOL(scx200_gpio_configure); |
147 | EXPORT_SYMBOL(scx200_gpio_dump); | ||
148 | EXPORT_SYMBOL(scx200_cb_base); | 132 | EXPORT_SYMBOL(scx200_cb_base); |