Input: adp5589-keys - remove setup/teardown hooks for gpios

This is currently just dead code. It's from around a time when
platform-data was used, and a board could hook it's own special callback
for setup/teardown, and a private object (via 'context').

This change removes it, as there are no more users in mainline for this.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20201112074308.71351-4-alexandru.ardelean@analog.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
index 0e2ad96..4008cd3 100644 (file)
--- a/drivers/input/keyboard/adp5589-keys.c
+++ b/drivers/input/keyboard/adp5589-keys.c
@@ -539,35 +539,14 @@ static int adp5589_gpio_add(struct adp5589_kpad *kpad)
                                            ADP5589_GPIO_DIRECTION_A) + i);
        }
 
-       if (gpio_data->setup) {
-               error = gpio_data->setup(kpad->client,
-                                        kpad->gc.base, kpad->gc.ngpio,
-                                        gpio_data->context);
-               if (error)
-                       dev_warn(dev, "setup failed, %d\n", error);
-       }
-
        return 0;
 }
 
 static void adp5589_gpio_remove(struct adp5589_kpad *kpad)
 {
-       struct device *dev = &kpad->client->dev;
-       const struct adp5589_kpad_platform_data *pdata = dev_get_platdata(dev);
-       const struct adp5589_gpio_platform_data *gpio_data = pdata->gpio_data;
-       int error;
-
        if (!kpad->export_gpio)
                return;
 
-       if (gpio_data->teardown) {
-               error = gpio_data->teardown(kpad->client,
-                                           kpad->gc.base, kpad->gc.ngpio,
-                                           gpio_data->context);
-               if (error)
-                       dev_warn(dev, "teardown failed %d\n", error);
-       }
-
        gpiochip_remove(&kpad->gc);
 }
 #else

diff --git a/include/linux/input/adp5589.h b/include/linux/input/adp5589.h
index c0523af..0e4742c 100644 (file)
--- a/include/linux/input/adp5589.h
+++ b/include/linux/input/adp5589.h
@@ -175,13 +175,6 @@ struct i2c_client; /* forward declaration */
 
 struct adp5589_gpio_platform_data {
        int     gpio_start;     /* GPIO Chip base # */
-       int     (*setup)(struct i2c_client *client,
-                               int gpio, unsigned ngpio,
-                               void *context);
-       int     (*teardown)(struct i2c_client *client,
-                               int gpio, unsigned ngpio,
-                               void *context);
-       void    *context;
 };
 
 #endif