Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef0aca7f authored by Julia Lawall's avatar Julia Lawall Committed by Dmitry Torokhov
Browse files

Input: keyboard, serio - simplify use of devm_ioremap_resource 

Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.

Move the call to platform_get_resource adjacent to the call to
devm_ioremap_resource to make the connection between them more clear.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/

)

// <smpl>
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@

- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
  ... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
  ... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
  e = devm_ioremap_resource(e1, res);
// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent eacd0c47

drivers/input/keyboard/imx_keypad.c

+1 −6
Original line number Diff line number Diff line
@@ -442,12 +442,6 @@ static int imx_keypad_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res == NULL) {

		dev_err(&pdev->dev, "no I/O memory defined in platform data\n");

		return -EINVAL;

	}



	input_dev = devm_input_allocate_device(&pdev->dev);

	if (!input_dev) {

		dev_err(&pdev->dev, "failed to allocate the input device\n");
@@ -468,6 +462,7 @@ static int imx_keypad_probe(struct platform_device *pdev) 
	setup_timer(&keypad->check_matrix_timer,

		    imx_keypad_check_for_events, (unsigned long) keypad);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	keypad->mmio_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(keypad->mmio_base))

		return PTR_ERR(keypad->mmio_base);

drivers/input/keyboard/nspire-keypad.c

+1 −6
Original line number Diff line number Diff line
@@ -171,12 +171,6 @@ static int nspire_keypad_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "missing platform resources\n");

		return -EINVAL;

	}



	keypad = devm_kzalloc(&pdev->dev, sizeof(struct nspire_keypad),

			      GFP_KERNEL);

	if (!keypad) {
@@ -208,6 +202,7 @@ static int nspire_keypad_probe(struct platform_device *pdev) 
		return PTR_ERR(keypad->clk);

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	keypad->reg_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(keypad->reg_base))

		return PTR_ERR(keypad->reg_base);

drivers/input/keyboard/spear-keyboard.c

+1 −6
Original line number Diff line number Diff line
@@ -191,12 +191,6 @@ static int spear_kbd_probe(struct platform_device *pdev) 
	int irq;

	int error;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "no keyboard resource defined\n");

		return -EBUSY;

	}



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(&pdev->dev, "not able to get irq for the device\n");
@@ -228,6 +222,7 @@ static int spear_kbd_probe(struct platform_device *pdev) 
		kbd->suspended_rate = pdata->suspended_rate;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	kbd->io_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(kbd->io_base))

		return PTR_ERR(kbd->io_base);

drivers/input/serio/arc_ps2.c

+1 −6
Original line number Diff line number Diff line
@@ -189,12 +189,6 @@ static int arc_ps2_probe(struct platform_device *pdev) 
	int irq;

	int error, id, i;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "no IO memory defined\n");

		return -EINVAL;

	}



	irq = platform_get_irq_byname(pdev, "arc_ps2_irq");

	if (irq < 0) {

		dev_err(&pdev->dev, "no IRQ defined\n");
@@ -208,6 +202,7 @@ static int arc_ps2_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	arc_ps2->addr = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(arc_ps2->addr))

		return PTR_ERR(arc_ps2->addr);

drivers/input/serio/olpc_apsp.c

+0 −3
Original line number Diff line number Diff line
@@ -183,9 +183,6 @@ static int olpc_apsp_probe(struct platform_device *pdev) 


	np = pdev->dev.of_node;

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -ENOENT;



	priv->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(priv->base)) {

		dev_err(&pdev->dev, "Failed to map WTM registers\n");