Commit db6c4ee7 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Dmitry Torokhov
Browse files

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: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarMattijs Korpershoek <mkorpershoek@baylibre.com>
Link: https://lore.kernel.org/r/20220406115654.115093-1-angelogioacchino.delregno@collabora.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent a949087c

drivers/input/keyboard/mt6779-keypad.c

+5 −5
Original line number Diff line number Diff line
@@ -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,