| Message ID | 1554096209-17870-1-git-send-email-Anson.Huang@nxp.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d8ea61c5af0ee615455130449186ac7b698155d9 |
| Headers | show |
| Series | input: keyboard: imx: use devm_platform_ioremap_resource() to simplify code | expand |
On 4/1/2019 10:58 AM, Anson Huang wrote: > Use the new helper devm_platform_ioremap_resource() which wraps the > platform_get_resource() and devm_ioremap_resource() together, to > simplify the code. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Reviewed-by: Mukesh Ojha <mojha@codeaurora.org> Cheers, -Mukesh > --- > drivers/input/keyboard/imx_keypad.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c > index 539cb67..cf08f4a 100644 > --- a/drivers/input/keyboard/imx_keypad.c > +++ b/drivers/input/keyboard/imx_keypad.c > @@ -422,7 +422,6 @@ static int imx_keypad_probe(struct platform_device *pdev) > dev_get_platdata(&pdev->dev); > struct imx_keypad *keypad; > struct input_dev *input_dev; > - struct resource *res; > int irq, error, i, row, col; > > if (!keymap_data && !pdev->dev.of_node) { > @@ -455,8 +454,7 @@ static int imx_keypad_probe(struct platform_device *pdev) > timer_setup(&keypad->check_matrix_timer, > imx_keypad_check_for_events, 0); > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - keypad->mmio_base = devm_ioremap_resource(&pdev->dev, res); > + keypad->mmio_base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(keypad->mmio_base)) > return PTR_ERR(keypad->mmio_base); >
On Mon, Apr 01, 2019 at 05:28:12AM +0000, Anson Huang wrote: > Use the new helper devm_platform_ioremap_resource() which wraps the > platform_get_resource() and devm_ioremap_resource() together, to > simplify the code. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Applied, thank you. > --- > drivers/input/keyboard/imx_keypad.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c > index 539cb67..cf08f4a 100644 > --- a/drivers/input/keyboard/imx_keypad.c > +++ b/drivers/input/keyboard/imx_keypad.c > @@ -422,7 +422,6 @@ static int imx_keypad_probe(struct platform_device *pdev) > dev_get_platdata(&pdev->dev); > struct imx_keypad *keypad; > struct input_dev *input_dev; > - struct resource *res; > int irq, error, i, row, col; > > if (!keymap_data && !pdev->dev.of_node) { > @@ -455,8 +454,7 @@ static int imx_keypad_probe(struct platform_device *pdev) > timer_setup(&keypad->check_matrix_timer, > imx_keypad_check_for_events, 0); > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - keypad->mmio_base = devm_ioremap_resource(&pdev->dev, res); > + keypad->mmio_base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(keypad->mmio_base)) > return PTR_ERR(keypad->mmio_base); > > -- > 2.7.4 >
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index 539cb67..cf08f4a 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c @@ -422,7 +422,6 @@ static int imx_keypad_probe(struct platform_device *pdev) dev_get_platdata(&pdev->dev); struct imx_keypad *keypad; struct input_dev *input_dev; - struct resource *res; int irq, error, i, row, col; if (!keymap_data && !pdev->dev.of_node) { @@ -455,8 +454,7 @@ static int imx_keypad_probe(struct platform_device *pdev) timer_setup(&keypad->check_matrix_timer, imx_keypad_check_for_events, 0); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - keypad->mmio_base = devm_ioremap_resource(&pdev->dev, res); + keypad->mmio_base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(keypad->mmio_base)) return PTR_ERR(keypad->mmio_base);
Use the new helper devm_platform_ioremap_resource() which wraps the platform_get_resource() and devm_ioremap_resource() together, to simplify the code. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> --- drivers/input/keyboard/imx_keypad.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)