[PATCH] ip2 warning fix

[pandora-kernel.git] / drivers / char / scx200_gpio.c

diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c
index dd1f997..99e5272 100644 (file)
--- a/drivers/char/scx200_gpio.c
+++ b/drivers/char/scx200_gpio.c
@@ -35,23 +35,21 @@ MODULE_PARM_DESC(major, "Major device number");
 
 #define MAX_PINS 32            /* 64 later, when known ok */
 
-struct nsc_gpio_ops scx200_access = {
+struct nsc_gpio_ops scx200_gpio_ops = {
        .owner          = THIS_MODULE,
        .gpio_config    = scx200_gpio_configure,
        .gpio_dump      = nsc_gpio_dump,
        .gpio_get       = scx200_gpio_get,
        .gpio_set       = scx200_gpio_set,
-       .gpio_set_high  = scx200_gpio_set_high,
-       .gpio_set_low   = scx200_gpio_set_low,
        .gpio_change    = scx200_gpio_change,
        .gpio_current   = scx200_gpio_current
 };
-EXPORT_SYMBOL(scx200_access);
+EXPORT_SYMBOL_GPL(scx200_gpio_ops);
 
 static int scx200_gpio_open(struct inode *inode, struct file *file)
 {
        unsigned m = iminor(inode);
-       file->private_data = &scx200_access;
+       file->private_data = &scx200_gpio_ops;
 
        if (m >= MAX_PINS)
                return -EINVAL;
@@ -63,7 +61,7 @@ static int scx200_gpio_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static const struct file_operations scx200_gpio_fops = {
+static const struct file_operations scx200_gpio_fileops = {
        .owner   = THIS_MODULE,
        .write   = nsc_gpio_write,
        .read    = nsc_gpio_read,
@@ -71,7 +69,7 @@ static const struct file_operations scx200_gpio_fops = {
        .release = scx200_gpio_release,
 };
 
-struct cdev scx200_gpio_cdev;  /* use 1 cdev for all pins */
+static struct cdev scx200_gpio_cdev;  /* use 1 cdev for all pins */
 
 static int __init scx200_gpio_init(void)
 {
@@ -93,7 +91,7 @@ static int __init scx200_gpio_init(void)
                goto undo_malloc;
 
        /* nsc_gpio uses dev_dbg(), so needs this */
-       scx200_access.dev = &pdev->dev;
+       scx200_gpio_ops.dev = &pdev->dev;
 
        if (major) {
                devid = MKDEV(major, 0);
@@ -107,7 +105,7 @@ static int __init scx200_gpio_init(void)
                goto undo_platform_device_add;
        }
 
-       cdev_init(&scx200_gpio_cdev, &scx200_gpio_fops);
+       cdev_init(&scx200_gpio_cdev, &scx200_gpio_fileops);
        cdev_add(&scx200_gpio_cdev, devid, MAX_PINS);
 
        return 0; /* succeed */