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

Commit 1a2a60b1 authored by Ladislav Michl's avatar Ladislav Michl Committed by Mauro Carvalho Chehab
Browse files

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



Use of devm_request_irq simplifies error unwinding and as
free_irq was the last user of driver remove function,
remove it too.

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 375929f9

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

+4 −19
Original line number Diff line number Diff line
@@ -161,24 +161,10 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, gpio_dev);



	rc = request_irq(gpio_to_irq(pdata->gpio_nr), gpio_ir_recv_irq,

	return devm_request_irq(dev, gpio_to_irq(pdata->gpio_nr),

				gpio_ir_recv_irq,

				IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,

				"gpio-ir-recv-irq", gpio_dev);

	if (rc < 0)

		goto err_request_irq;



	return 0;



err_request_irq:

	return rc;

}



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);

	return 0;

}



#ifdef CONFIG_PM
@@ -216,7 +202,6 @@ static const struct dev_pm_ops gpio_ir_recv_pm_ops = { 


static struct platform_driver gpio_ir_recv_driver = {

	.probe  = gpio_ir_recv_probe,

	.remove = gpio_ir_recv_remove,

	.driver = {

		.name   = GPIO_IR_DRIVER_NAME,

		.of_match_table = of_match_ptr(gpio_ir_recv_of_match),