Input: st-keyscan - Use devm_platform_get_and_ioremap_resource()

Message ID 202301281611305841413@zte.com.cn
State New
Headers
Series Input: st-keyscan - Use devm_platform_get_and_ioremap_resource() |

Commit Message

ye.xingchen@zte.com.cn Jan. 28, 2023, 8:11 a.m. UTC
  From: ye xingchen <ye.xingchen@zte.com.cn>

Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.

Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>
---
 drivers/input/keyboard/st-keyscan.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
  

Comments

Dmitry Torokhov Jan. 30, 2023, 4:48 a.m. UTC | #1
On Sat, Jan 28, 2023 at 04:11:30PM +0800, ye.xingchen@zte.com.cn wrote:
> From: ye xingchen <ye.xingchen@zte.com.cn>
> 
> Convert platform_get_resource(), devm_ioremap_resource() to a single
> call to devm_platform_get_and_ioremap_resource(), as this is exactly
> what this function does.
> 
> Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>

Applied, thank you.
  
Andy Shevchenko Jan. 30, 2023, 12:19 p.m. UTC | #2
On Sat, Jan 28, 2023 at 04:11:30PM +0800, ye.xingchen@zte.com.cn wrote:
> From: ye xingchen <ye.xingchen@zte.com.cn>
> 
> Convert platform_get_resource(), devm_ioremap_resource() to a single
> call to devm_platform_get_and_ioremap_resource(), as this is exactly
> what this function does.

...

> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	keypad_data->base = devm_ioremap_resource(&pdev->dev, res);
> +	keypad_data->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);

Why?

What we need here is simple devm_platform_ioremap_resource().
  

Patch

diff --git a/drivers/input/keyboard/st-keyscan.c b/drivers/input/keyboard/st-keyscan.c
index 13735a5e8391..b6e83324f97a 100644
--- a/drivers/input/keyboard/st-keyscan.c
+++ b/drivers/input/keyboard/st-keyscan.c
@@ -125,7 +125,6 @@  static int keyscan_probe(struct platform_device *pdev)
 {
 	struct st_keyscan *keypad_data;
 	struct input_dev *input_dev;
-	struct resource *res;
 	int error;

 	if (!pdev->dev.of_node) {
@@ -169,8 +168,7 @@  static int keyscan_probe(struct platform_device *pdev)

 	input_set_drvdata(input_dev, keypad_data);

-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	keypad_data->base = devm_ioremap_resource(&pdev->dev, res);
+	keypad_data->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
 	if (IS_ERR(keypad_data->base))
 		return PTR_ERR(keypad_data->base);