Input: matrix_keypad - remove support for clustered interrupt

There are no users of this functionality in the mainline kernel (it was
only available to boards using platform data and not device tree).
Remove it to simplify the code.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20240805014710.1961677-2-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c
index 7a56f3d3aacd27ed2ba72d73f0c3946f0a5841d1..604e90d13ed0192616e1357a6d3b282e05262cba 100644 (file)
--- a/drivers/input/keyboard/matrix_keypad.c
+++ b/drivers/input/keyboard/matrix_keypad.c
@@ -29,7 +29,6 @@ struct matrix_keypad {
        unsigned int row_shift;
 
        unsigned int row_irqs[MATRIX_MAX_ROWS];
-       unsigned int num_row_irqs;
        DECLARE_BITMAP(wakeup_enabled_irqs, MATRIX_MAX_ROWS);
 
        uint32_t last_key_state[MATRIX_MAX_COLS];
@@ -88,7 +87,7 @@ static void enable_row_irqs(struct matrix_keypad *keypad)
 {
        int i;
 
-       for (i = 0; i < keypad->num_row_irqs; i++)
+       for (i = 0; i < keypad->pdata->num_row_gpios; i++)
                enable_irq(keypad->row_irqs[i]);
 }
 
@@ -96,7 +95,7 @@ static void disable_row_irqs(struct matrix_keypad *keypad)
 {
        int i;
 
-       for (i = 0; i < keypad->num_row_irqs; i++)
+       for (i = 0; i < keypad->pdata->num_row_gpios; i++)
                disable_irq_nosync(keypad->row_irqs[i]);
 }
 
@@ -225,7 +224,8 @@ static void matrix_keypad_enable_wakeup(struct matrix_keypad *keypad)
 {
        int i;
 
-       for_each_clear_bit(i, keypad->wakeup_enabled_irqs, keypad->num_row_irqs)
+       for_each_clear_bit(i, keypad->wakeup_enabled_irqs,
+                          keypad->pdata->num_row_gpios)
                if (enable_irq_wake(keypad->row_irqs[i]) == 0)
                        __set_bit(i, keypad->wakeup_enabled_irqs);
 }
@@ -234,7 +234,8 @@ static void matrix_keypad_disable_wakeup(struct matrix_keypad *keypad)
 {
        int i;
 
-       for_each_set_bit(i, keypad->wakeup_enabled_irqs, keypad->num_row_irqs) {
+       for_each_set_bit(i, keypad->wakeup_enabled_irqs,
+                        keypad->pdata->num_row_gpios) {
                disable_irq_wake(keypad->row_irqs[i]);
                __clear_bit(i, keypad->wakeup_enabled_irqs);
        }
@@ -302,48 +303,30 @@ static int matrix_keypad_init_gpio(struct platform_device *pdev,
                gpio_direction_input(pdata->row_gpios[i]);
        }
 
-       if (pdata->clustered_irq > 0) {
+       for (i = 0; i < pdata->num_row_gpios; i++) {
+               irq = gpio_to_irq(pdata->row_gpios[i]);
+               if (irq < 0) {
+                       err = irq;
+                       dev_err(&pdev->dev,
+                               "Unable to convert GPIO line %i to irq: %d\n",
+                               pdata->row_gpios[i], err);
+                       return err;
+               }
+
                err = devm_request_any_context_irq(&pdev->dev,
-                               pdata->clustered_irq,
+                               irq,
                                matrix_keypad_interrupt,
-                               pdata->clustered_irq_flags,
+                               IRQF_TRIGGER_RISING |
+                                       IRQF_TRIGGER_FALLING,
                                "matrix-keypad", keypad);
                if (err < 0) {
                        dev_err(&pdev->dev,
-                               "Unable to acquire clustered interrupt\n");
+                               "Unable to acquire interrupt for GPIO line %i\n",
+                               pdata->row_gpios[i]);
                        return err;
                }
 
-               keypad->row_irqs[0] = pdata->clustered_irq;
-               keypad->num_row_irqs = 1;
-       } else {
-               for (i = 0; i < pdata->num_row_gpios; i++) {
-                       irq = gpio_to_irq(pdata->row_gpios[i]);
-                       if (irq < 0) {
-                               err = irq;
-                               dev_err(&pdev->dev,
-                                       "Unable to convert GPIO line %i to irq: %d\n",
-                                       pdata->row_gpios[i], err);
-                               return err;
-                       }
-
-                       err = devm_request_any_context_irq(&pdev->dev,
-                                       irq,
-                                       matrix_keypad_interrupt,
-                                       IRQF_TRIGGER_RISING |
-                                               IRQF_TRIGGER_FALLING,
-                                       "matrix-keypad", keypad);
-                       if (err < 0) {
-                               dev_err(&pdev->dev,
-                                       "Unable to acquire interrupt for GPIO line %i\n",
-                                       pdata->row_gpios[i]);
-                               return err;
-                       }
-
-                       keypad->row_irqs[i] = irq;
-               }
-
-               keypad->num_row_irqs = pdata->num_row_gpios;
+               keypad->row_irqs[i] = irq;
        }
 
        /* initialized as disabled - enabled by input->open */