Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: mt6779-keypad - move iomem pointer to probe function

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>

authored by

AngeloGioacchino Del Regno and committed by
Dmitry Torokhov
db6c4ee7 a949087c

+5 -5
+5 -5
drivers/input/keyboard/mt6779-keypad.c
··· 24 24 struct regmap *regmap; 25 25 struct input_dev *input_dev; 26 26 struct clk *clk; 27 - void __iomem *base; 28 27 u32 n_rows; 29 28 u32 n_cols; 30 29 DECLARE_BITMAP(keymap_state, MTK_KPD_NUM_BITS); ··· 90 91 static int mt6779_keypad_pdrv_probe(struct platform_device *pdev) 91 92 { 92 93 struct mt6779_keypad *keypad; 94 + void __iomem *base; 93 95 int irq; 94 96 u32 debounce; 95 97 bool wakeup; ··· 100 100 if (!keypad) 101 101 return -ENOMEM; 102 102 103 - keypad->base = devm_platform_ioremap_resource(pdev, 0); 104 - if (IS_ERR(keypad->base)) 105 - return PTR_ERR(keypad->base); 103 + base = devm_platform_ioremap_resource(pdev, 0); 104 + if (IS_ERR(base)) 105 + return PTR_ERR(base); 106 106 107 - keypad->regmap = devm_regmap_init_mmio(&pdev->dev, keypad->base, 107 + keypad->regmap = devm_regmap_init_mmio(&pdev->dev, base, 108 108 &mt6779_keypad_regmap_cfg); 109 109 if (IS_ERR(keypad->regmap)) { 110 110 dev_err(&pdev->dev,