]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Input: mt6779-keypad - move iomem pointer to probe function
authorAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Sat, 9 Apr 2022 01:32:58 +0000 (18:32 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 9 Apr 2022 01:33:55 +0000 (18:33 -0700)
The mmio base address is used for the only purpose of initializing
regmap for this driver, hence it's not necessary to have it in the
main driver structure, as it is used only in the probe() callback.
Move it local to function mt6779_keypad_pdrv_probe().

This commit brings no functional changes.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Link: https://lore.kernel.org/r/20220406115654.115093-1-angelogioacchino.delregno@collabora.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/mt6779-keypad.c

index 0dbbddc7f298048ab90710cd4ce369b4a395a4be..2e7c9187c10f2ab3b506481a6e4971b5bf1e7c54 100644 (file)
@@ -24,7 +24,6 @@ struct mt6779_keypad {
        struct regmap *regmap;
        struct input_dev *input_dev;
        struct clk *clk;
-       void __iomem *base;
        u32 n_rows;
        u32 n_cols;
        DECLARE_BITMAP(keymap_state, MTK_KPD_NUM_BITS);
@@ -91,6 +90,7 @@ static void mt6779_keypad_clk_disable(void *data)
 static int mt6779_keypad_pdrv_probe(struct platform_device *pdev)
 {
        struct mt6779_keypad *keypad;
+       void __iomem *base;
        int irq;
        u32 debounce;
        bool wakeup;
@@ -100,11 +100,11 @@ static int mt6779_keypad_pdrv_probe(struct platform_device *pdev)
        if (!keypad)
                return -ENOMEM;
 
-       keypad->base = devm_platform_ioremap_resource(pdev, 0);
-       if (IS_ERR(keypad->base))
-               return PTR_ERR(keypad->base);
+       base = devm_platform_ioremap_resource(pdev, 0);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
 
-       keypad->regmap = devm_regmap_init_mmio(&pdev->dev, keypad->base,
+       keypad->regmap = devm_regmap_init_mmio(&pdev->dev, base,
                                               &mt6779_keypad_regmap_cfg);
        if (IS_ERR(keypad->regmap)) {
                dev_err(&pdev->dev,