Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6-omap-h63xx.git] / drivers / char / scx200_gpio.c

diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c
index f9994ed01816b92dcb5c6493d364430b8893f412..425c58719db6a6af14c5dc12a68e2e53642087bc 100644 (file)
--- a/drivers/char/scx200_gpio.c
+++ b/drivers/char/scx200_gpio.c
@@ -35,12 +35,10 @@ static int major = 0;               /* default to dynamic major */
 module_param(major, int, 0);
 MODULE_PARM_DESC(major, "Major device number");
 
-extern void scx200_gpio_dump(unsigned index);
-
 struct nsc_gpio_ops scx200_access = {
        .owner          = THIS_MODULE,
        .gpio_config    = scx200_gpio_configure,
-       .gpio_dump      = scx200_gpio_dump,
+       .gpio_dump      = nsc_gpio_dump,
        .gpio_get       = scx200_gpio_get,
        .gpio_set       = scx200_gpio_set,
        .gpio_set_high  = scx200_gpio_set_high,
@@ -49,85 +47,11 @@ struct nsc_gpio_ops scx200_access = {
        .gpio_current   = scx200_gpio_current
 };
 
-static ssize_t scx200_gpio_write(struct file *file, const char __user *data,
-                                size_t len, loff_t *ppos)
-{
-       unsigned m = iminor(file->f_dentry->d_inode);
-       size_t i;
-       int err = 0;
-
-       for (i = 0; i < len; ++i) {
-               char c;
-               if (get_user(c, data + i))
-                       return -EFAULT;
-               switch (c) {
-               case '0':
-                       scx200_gpio_set(m, 0);
-                       break;
-               case '1':
-                       scx200_gpio_set(m, 1);
-                       break;
-               case 'O':
-                       printk(KERN_INFO NAME ": GPIO%d output enabled\n", m);
-                       scx200_gpio_configure(m, ~1, 1);
-                       break;
-               case 'o':
-                       printk(KERN_INFO NAME ": GPIO%d output disabled\n", m);
-                       scx200_gpio_configure(m, ~1, 0);
-                       break;
-               case 'T':
-                       printk(KERN_INFO NAME ": GPIO%d output is push pull\n", m);
-                       scx200_gpio_configure(m, ~2, 2);
-                       break;
-               case 't':
-                       printk(KERN_INFO NAME ": GPIO%d output is open drain\n", m);
-                       scx200_gpio_configure(m, ~2, 0);
-                       break;
-               case 'P':
-                       printk(KERN_INFO NAME ": GPIO%d pull up enabled\n", m);
-                       scx200_gpio_configure(m, ~4, 4);
-                       break;
-               case 'p':
-                       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;
-}
-
-static ssize_t scx200_gpio_read(struct file *file, char __user *buf,
-                               size_t len, loff_t *ppos)
-{
-       unsigned m = iminor(file->f_dentry->d_inode);
-       int value;
-
-       value = scx200_gpio_get(m);
-       if (put_user(value ? '1' : '0', buf))
-               return -EFAULT;
-
-       return 1;
-}
-
 static int scx200_gpio_open(struct inode *inode, struct file *file)
 {
        unsigned m = iminor(inode);
+       file->private_data = &scx200_access;
+
        if (m > 63)
                return -EINVAL;
        return nonseekable_open(inode, file);
@@ -139,10 +63,10 @@ static int scx200_gpio_release(struct inode *inode, struct file *file)
 }
 
 
-static struct file_operations scx200_gpio_fops = {
+static const struct file_operations scx200_gpio_fops = {
        .owner   = THIS_MODULE,
-       .write   = scx200_gpio_write,
-       .read    = scx200_gpio_read,
+       .write   = nsc_gpio_write,
+       .read    = nsc_gpio_read,
        .open    = scx200_gpio_open,
        .release = scx200_gpio_release,
 };
@@ -169,6 +93,9 @@ static int __init scx200_gpio_init(void)
        if (rc)
                goto undo_malloc;
 
+       /* nsc_gpio uses dev_dbg(), so needs this */
+       scx200_access.dev = &pdev->dev;
+
        if (major)
                rc = register_chrdev_region(dev, num_pins, "scx200_gpio");
        else {
@@ -199,9 +126,10 @@ static int __init scx200_gpio_init(void)
 undo_chrdev_region:
        unregister_chrdev_region(dev, num_pins);
 undo_platform_device_add:
-       platform_device_put(pdev);
+       platform_device_del(pdev);
 undo_malloc:
-       kfree(pdev);
+       platform_device_put(pdev);
+
        return rc;
 }
 
@@ -209,7 +137,6 @@ static void __exit scx200_gpio_cleanup(void)
 {
        kfree(scx200_devices);
        unregister_chrdev_region(MKDEV(major, 0), num_pins);
-       platform_device_put(pdev);
        platform_device_unregister(pdev);
        /* kfree(pdev); */
 }