summaryrefslogtreecommitdiffstats
path: root/drivers/char/scx200_gpio.c
diff options
context:
space:
mode:
authorJim Cromie <jim.cromie@gmail.com>2006-06-27 11:54:16 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-28 02:32:42 +0200
commit9550a339e1ab1709dd53d92a1b76eecae2df9f3c (patch)
treea5bea006ebb482c6f4468816486254c401803282 /drivers/char/scx200_gpio.c
parent[PATCH] chardev: GPIO for SCx200 & PC-8736x: put gpio_dump on a diet (diff)
downloadlinux-9550a339e1ab1709dd53d92a1b76eecae2df9f3c.tar.xz
linux-9550a339e1ab1709dd53d92a1b76eecae2df9f3c.zip
[PATCH] chardev: GPIO for SCx200 & PC-8736x: add 'v' command to device-file
Add a new driver command: 'v' which calls gpio_dump() on the pin. The output goes to the log, like all other INFO messages in the original driver. Giving the user control over the feedback they 'need' is construed to be a user-friendly feature, and allows us (later) to dial down many INFO messages to DEBUG log-level. 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 'drivers/char/scx200_gpio.c')
-rw-r--r--drivers/char/scx200_gpio.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c
index e6e52c48697b..a1a56c5c8a84 100644
--- a/drivers/char/scx200_gpio.c
+++ b/drivers/char/scx200_gpio.c
@@ -41,6 +41,7 @@ static ssize_t scx200_gpio_write(struct file *file, const char __user *data,
{
unsigned m = iminor(file->f_dentry->d_inode);
size_t i;
+ int err = 0;
for (i = 0; i < len; ++i) {
char c;
@@ -77,8 +78,23 @@ static ssize_t scx200_gpio_write(struct file *file, const char __user *data,
printk(KERN_INFO NAME ": GPIO%d pull up disabled\n", m);
scx200_gpio_configure(m, ~4, 0);
break;
+
+ case 'v':
+ /* View Current pin settings */
+ scx200_gpio_dump(m);
+ break;
+ case '\n':
+ /* end of settings string, do nothing */
+ break;
+ default:
+ printk(KERN_ERR NAME
+ ": GPIO-%2d bad setting: chr<0x%2x>\n", m,
+ (int)c);
+ err++;
}
}
+ if (err)
+ return -EINVAL; /* full string handled, report error */
return len;
}