[PATCH] gpio: drop vtable members .gpio_set_high .gpio_set_low gpio_set is enough

drops gpio_set_high, gpio_set_low from the nsc_gpio_ops vtable.  While we
can't drop them from scx200_gpio (or can we?), we dont need them for new users
of the exported vtable; gpio_set(1), gpio_set(0) work fine.

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>

diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c
index 11bd78c..0b235a9 100644 (file)
--- a/drivers/char/pc8736x_gpio.c
+++ b/drivers/char/pc8736x_gpio.c
@@ -218,8 +218,6 @@ static struct nsc_gpio_ops pc8736x_access = {
        .gpio_dump      = nsc_gpio_dump,
        .gpio_get       = pc8736x_gpio_get,
        .gpio_set       = pc8736x_gpio_set,
-       .gpio_set_high  = pc8736x_gpio_set_high,
-       .gpio_set_low   = pc8736x_gpio_set_low,
        .gpio_change    = pc8736x_gpio_change,
        .gpio_current   = pc8736x_gpio_current
 };

diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c
index dd1f997..f65372b 100644 (file)
--- a/drivers/char/scx200_gpio.c
+++ b/drivers/char/scx200_gpio.c
@@ -41,8 +41,6 @@ struct nsc_gpio_ops scx200_access = {
        .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
 };

diff --git a/include/linux/nsc_gpio.h b/include/linux/nsc_gpio.h
index 135742c..7da0cf3 100644 (file)
--- a/include/linux/nsc_gpio.h
+++ b/include/linux/nsc_gpio.h
@@ -25,8 +25,6 @@ struct nsc_gpio_ops {
        void    (*gpio_dump)    (struct nsc_gpio_ops *amp, unsigned iminor);
        int     (*gpio_get)     (unsigned iminor);
        void    (*gpio_set)     (unsigned iminor, int state);
-       void    (*gpio_set_high)(unsigned iminor);
-       void    (*gpio_set_low) (unsigned iminor);
        void    (*gpio_change)  (unsigned iminor);
        int     (*gpio_current) (unsigned iminor);
        struct device*  dev;    /* for dev_dbg() support, set in init  */