1 files changed, 64 insertions, 38 deletions

diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c
index 83f24279f54e..b16fbef816c2 100644
--- a/drivers/char/pc8736x_gpio.c
+++ b/drivers/char/pc8736x_gpio.c
@@ -17,13 +17,14 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/nsc_gpio.h>
+#include <linux/platform_device.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-#define NAME "pc8736x_gpio"
+#define DEVNAME "pc8736x_gpio"
 
 MODULE_AUTHOR("Jim Cromie <jim.cromie@gmail.com>");
-MODULE_DESCRIPTION("NatSemi SCx200 GPIO Pin Driver");
+MODULE_DESCRIPTION("NatSemi PC-8736x GPIO Pin Driver");
 MODULE_LICENSE("GPL");
 
 static int major;               /* default to dynamic major */
@@ -42,6 +43,8 @@ static unsigned pc8736x_gpio_base;
 
 #define SIO_CF1         0x21    /* chip config, bit0 is chip enable */
 
+#define PC8736X_GPIO_SIZE       16
+
 #define SIO_UNIT_SEL    0x7     /* unit select reg */
 #define SIO_UNIT_ACT    0x30    /* unit enable */
 #define SIO_GPIO_UNIT   0x7     /* unit number of GPIO */
@@ -69,6 +72,8 @@ static int port_offset[] = { 0, 4, 8, 10 };	/* non-uniform offsets ! */
 #define PORT_EVT_EN     2
 #define PORT_EVT_STST   3
 
+static struct platform_device *pdev;  /* use in dev_*() */
+
 static inline void superio_outb(int addr, int val)
 {
         outb_p(addr, superio_cmd);
@@ -148,9 +153,9 @@ static int pc8736x_gpio_get(unsigned minor)
         val >>= bit;
         val &= 1;
 
-        printk(KERN_INFO NAME ": _gpio_get(%d from %x bit %d) == val %d\n",
-               minor, pc8736x_gpio_base + port_offset[port] + PORT_IN, bit,
-               val);
+        dev_dbg(&pdev->dev, "_gpio_get(%d from %x bit %d) == val %d\n",
+                minor, pc8736x_gpio_base + port_offset[port] + PORT_IN, bit,
+                val);
 
         return val;
 }
@@ -164,22 +169,21 @@ static void pc8736x_gpio_set(unsigned minor, int val)
         bit = minor & 7;
         curval = inb_p(pc8736x_gpio_base + port_offset[port] + PORT_OUT);
 
-        printk(KERN_INFO NAME
-               ": addr:%x cur:%x bit-pos:%d cur-bit:%x + new:%d -> bit-new:%d\n",
-               pc8736x_gpio_base + port_offset[port] + PORT_OUT,
-               curval, bit, (curval & ~(1 << bit)), val, (val << bit));
+        dev_dbg(&pdev->dev, "addr:%x cur:%x bit-pos:%d cur-bit:%x + new:%d -> bit-new:%d\n",
+                pc8736x_gpio_base + port_offset[port] + PORT_OUT,
+                curval, bit, (curval & ~(1 << bit)), val, (val << bit));
 
         val = (curval & ~(1 << bit)) | (val << bit);
 
-        printk(KERN_INFO NAME ": gpio_set(minor:%d port:%d bit:%d"
-               ") %2x -> %2x\n", minor, port, bit, curval, val);
+        dev_dbg(&pdev->dev, "gpio_set(minor:%d port:%d bit:%d)"
+                " %2x -> %2x\n", minor, port, bit, curval, val);
 
         outb_p(val, pc8736x_gpio_base + port_offset[port] + PORT_OUT);
 
         curval = inb_p(pc8736x_gpio_base + port_offset[port] + PORT_OUT);
         val = inb_p(pc8736x_gpio_base + port_offset[port] + PORT_IN);
 
-        printk(KERN_INFO NAME ": wrote %x, read: %x\n", curval, val);
+        dev_dbg(&pdev->dev, "wrote %x, read: %x\n", curval, val);
 }
 
 static void pc8736x_gpio_set_high(unsigned index)
@@ -194,7 +198,7 @@ static void pc8736x_gpio_set_low(unsigned index)
 
 static int pc8736x_gpio_current(unsigned index)
 {
-        printk(KERN_WARNING NAME ": pc8736x_gpio_current unimplemented\n");
+        dev_warn(&pdev->dev, "pc8736x_gpio_current unimplemented\n");
         return 0;
 }
 
@@ -222,7 +226,7 @@ static int pc8736x_gpio_open(struct inode *inode, struct file *file)
         unsigned m = iminor(inode);
         file->private_data = &pc8736x_access;
 
-        printk(KERN_NOTICE NAME " open %d\n", m);
+        dev_dbg(&pdev->dev, "open %d\n", m);
 
         if (m > 63)
                 return -EINVAL;
@@ -230,21 +234,31 @@ static int pc8736x_gpio_open(struct inode *inode, struct file *file)
 }
 
 static struct file_operations pc8736x_gpio_fops = {
-        .owner = THIS_MODULE,
-        .open = pc8736x_gpio_open,
-        .write = nsc_gpio_write,
-        .read = nsc_gpio_read,
+        .owner  = THIS_MODULE,
+        .open   = pc8736x_gpio_open,
+        .write  = nsc_gpio_write,
+        .read   = nsc_gpio_read,
 };
 
 static int __init pc8736x_gpio_init(void)
 {
-        int r, rc;
+        int rc = 0;
+
+        pdev = platform_device_alloc(DEVNAME, 0);
+        if (!pdev)
+                return -ENOMEM;
 
-        printk(KERN_DEBUG NAME " initializing\n");
+        rc = platform_device_add(pdev);
+        if (rc) {
+                rc = -ENODEV;
+                goto undo_platform_dev_alloc;
+        }
+        dev_info(&pdev->dev, "NatSemi pc8736x GPIO Driver Initializing\n");
 
         if (!pc8736x_superio_present()) {
-                printk(KERN_ERR NAME ": no device found\n");
-                return -ENODEV;
+                rc = -ENODEV;
+                dev_err(&pdev->dev, "no device found\n");
+                goto undo_platform_dev_add;
         }
 
         /* Verify that chip and it's GPIO unit are both enabled.
@@ -252,44 +266,56 @@ static int __init pc8736x_gpio_init(void)
          */
         rc = superio_inb(SIO_CF1);
         if (!(rc & 0x01)) {
-                printk(KERN_ERR NAME ": device not enabled\n");
-                return -ENODEV;
+                rc = -ENODEV;
+                dev_err(&pdev->dev, "device not enabled\n");
+                goto undo_platform_dev_add;
         }
         device_select(SIO_GPIO_UNIT);
         if (!superio_inb(SIO_UNIT_ACT)) {
-                printk(KERN_ERR NAME ": GPIO unit not enabled\n");
-                return -ENODEV;
+                rc = -ENODEV;
+                dev_err(&pdev->dev, "GPIO unit not enabled\n");
+                goto undo_platform_dev_add;
         }
 
-        /* read GPIO unit base address */
+        /* read the GPIO unit base addr that chip responds to */
         pc8736x_gpio_base = (superio_inb(SIO_BASE_HADDR) << 8
                              | superio_inb(SIO_BASE_LADDR));
 
-        if (request_region(pc8736x_gpio_base, 16, NAME))
-                printk(KERN_INFO NAME ": GPIO ioport %x reserved\n",
-                       pc8736x_gpio_base);
+        if (!request_region(pc8736x_gpio_base, 16, DEVNAME)) {
+                rc = -ENODEV;
+                dev_err(&pdev->dev, "GPIO ioport %x busy\n",
+                        pc8736x_gpio_base);
+                goto undo_platform_dev_add;
+        }
+        dev_info(&pdev->dev, "GPIO ioport %x reserved\n", pc8736x_gpio_base);
 
-        r = register_chrdev(major, NAME, &pc8736x_gpio_fops);
-        if (r < 0) {
-                printk(KERN_ERR NAME ": unable to register character device\n");
-                return r;
+        rc = register_chrdev(major, DEVNAME, &pc8736x_gpio_fops);
+        if (rc < 0) {
+                dev_err(&pdev->dev, "register-chrdev failed: %d\n", rc);
+                goto undo_platform_dev_add;
         }
         if (!major) {
-                major = r;
-                printk(KERN_DEBUG NAME ": got dynamic major %d\n", major);
+                major = rc;
+                dev_dbg(&pdev->dev, "got dynamic major %d\n", major);
         }
 
         pc8736x_init_shadow();
         return 0;
+
+undo_platform_dev_add:
+        platform_device_put(pdev);
+undo_platform_dev_alloc:
+        kfree(pdev);
+        return rc;
 }
 
 static void __exit pc8736x_gpio_cleanup(void)
 {
-        printk(KERN_DEBUG NAME " cleanup\n");
+        dev_dbg(&pdev->dev, " cleanup\n");
 
         release_region(pc8736x_gpio_base, 16);
 
-        unregister_chrdev(major, NAME);
+        unregister_chrdev(major, DEVNAME);
 }
 
 module_init(pc8736x_gpio_init);