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

Commit 52ea7991 authored by Ladislav Michl's avatar Ladislav Michl Committed by Mauro Carvalho Chehab
Browse files

[media] media: rc: gpio-ir-recv: use devm_rc_register_device 



Use of devm_rc_register_device simplifies error unwinding.

Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent fcca09ed

drivers/media/rc/gpio-ir-recv.c

+2 −6
Original line number Diff line number Diff line
@@ -153,10 +153,10 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) 
	if (rc < 0)

		return rc;



	rc = rc_register_device(rcdev);

	rc = devm_rc_register_device(dev, rcdev);

	if (rc < 0) {

		dev_err(dev, "failed to register rc device (%d)\n", rc);

		goto err_register_rc_device;

		return rc;

	}



	platform_set_drvdata(pdev, gpio_dev);
@@ -171,9 +171,6 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) 
	return 0;



err_request_irq:

	rc_unregister_device(rcdev);

	rcdev = NULL;

err_register_rc_device:

	return rc;

}
@@ -182,7 +179,6 @@ static int gpio_ir_recv_remove(struct platform_device *pdev) 
	struct gpio_rc_dev *gpio_dev = platform_get_drvdata(pdev);



	free_irq(gpio_to_irq(gpio_dev->gpio_nr), gpio_dev);

	rc_unregister_device(gpio_dev->rcdev);

	return 0;

}