X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fchar%2Fnsc_gpio.c;h=808d44e9a32a03bd1c2dc1e54432721e98a57e94;hb=fbe0825752dc34b505777fd59cde4a6ce832eb16;hp=d0b5d65a73fbfb829181c4b69f3514da69686e5d;hpb=f31000e573da052b6b8bcc21faff520b4e2eda7a;p=linux-2.6

diff --git a/drivers/char/nsc_gpio.c b/drivers/char/nsc_gpio.c
index d0b5d65a73..808d44e9a3 100644
--- a/drivers/char/nsc_gpio.c
+++ b/drivers/char/nsc_gpio.c
@@ -7,7 +7,6 @@
    Copyright (c) 2005      Jim Cromie <jim.cromie@gmail.com>
 */
 
-#include <linux/config.h>
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/errno.h>
@@ -26,7 +25,7 @@ void nsc_gpio_dump(struct nsc_gpio_ops *amp, unsigned index)
 	u32 config = amp->gpio_config(index, ~0, 0);
 
 	/* user requested via 'v' command, so its INFO */
-	dev_info(amp->dev, "io%02u: 0x%04x %s %s %s %s %s %s %s\n",
+	dev_info(amp->dev, "io%02u: 0x%04x %s %s %s %s %s %s %s\tio:%d/%d\n",
 		 index, config,
 		 (config & 1) ? "OE" : "TS",      /* output-enabled/tristate */
 		 (config & 2) ? "PP" : "OD",      /* push pull / open drain */
@@ -34,13 +33,15 @@ void nsc_gpio_dump(struct nsc_gpio_ops *amp, unsigned index)
 		 (config & 8) ? "LOCKED" : "",    /* locked / unlocked */
 		 (config & 16) ? "LEVEL" : "EDGE",/* level/edge input */
 		 (config & 32) ? "HI" : "LO",     /* trigger on rise/fall edge */
-		 (config & 64) ? "DEBOUNCE" : "");        /* debounce */
+		 (config & 64) ? "DEBOUNCE" : "", /* debounce */
+
+		 amp->gpio_get(index), amp->gpio_current(index));
 }
 
 ssize_t nsc_gpio_write(struct file *file, const char __user *data,
 		       size_t len, loff_t *ppos)
 {
-	unsigned m = iminor(file->f_dentry->d_inode);
+	unsigned m = iminor(file->f_path.dentry->d_inode);
 	struct nsc_gpio_ops *amp = file->private_data;
 	struct device *dev = amp->dev;
 	size_t i;
@@ -66,13 +67,11 @@ ssize_t nsc_gpio_write(struct file *file, const char __user *data,
 			amp->gpio_config(m, ~1, 0);
 			break;
 		case 'T':
-			dev_dbg(dev, "GPIO%d output is push pull\n",
-			       m);
+			dev_dbg(dev, "GPIO%d output is push pull\n", m);
 			amp->gpio_config(m, ~2, 2);
 			break;
 		case 't':
-			dev_dbg(dev, "GPIO%d output is open drain\n",
-			       m);
+			dev_dbg(dev, "GPIO%d output is open drain\n", m);
 			amp->gpio_config(m, ~2, 0);
 			break;
 		case 'P':
@@ -105,7 +104,7 @@ ssize_t nsc_gpio_write(struct file *file, const char __user *data,
 ssize_t nsc_gpio_read(struct file *file, char __user * buf,
 		      size_t len, loff_t * ppos)
 {
-	unsigned m = iminor(file->f_dentry->d_inode);
+	unsigned m = iminor(file->f_path.dentry->d_inode);
 	int value;
 	struct nsc_gpio_ops *amp = file->private_data;