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

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

[media] media: rc: gpio-ir-recv: use gpiolib API 



Gpiolib API is preferred way to access gpios.

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 5c95878f

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

+21 −38
Original line number Diff line number Diff line
@@ -26,29 +26,19 @@ 


struct gpio_rc_dev {

	struct rc_dev *rcdev;

	int gpio_nr;

	bool active_low;

	struct gpio_desc *gpiod;

	int irq;

};



static irqreturn_t gpio_ir_recv_irq(int irq, void *dev_id)

{

	int val;

	struct gpio_rc_dev *gpio_dev = dev_id;

	int gval;

	int rc = 0;



	gval = gpio_get_value(gpio_dev->gpio_nr);

	val = gpiod_get_value(gpio_dev->gpiod);

	if (val >= 0)

		ir_raw_event_store_edge(gpio_dev->rcdev, val == 1);



	if (gval < 0)

		goto err_get_value;



	if (gpio_dev->active_low)

		gval = !gval;



	rc = ir_raw_event_store_edge(gpio_dev->rcdev, gval == 1);

	if (rc < 0)

		goto err_get_value;



err_get_value:

	return IRQ_HANDLED;

}
@@ -57,7 +47,6 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	struct gpio_rc_dev *gpio_dev;

	enum of_gpio_flags flags;

	struct rc_dev *rcdev;

	int rc;
@@ -68,15 +57,17 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) 
	if (!gpio_dev)

		return -ENOMEM;



	rc = of_get_gpio_flags(np, 0, &flags);

	if (rc < 0) {

	gpio_dev->gpiod = devm_gpiod_get(dev, NULL, GPIOD_IN);

	if (IS_ERR(gpio_dev->gpiod)) {

		rc = PTR_ERR(gpio_dev->gpiod);

		/* Just try again if this happens */

		if (rc != -EPROBE_DEFER)

			dev_err(dev, "Failed to get gpio flags (%d)\n", rc);

			dev_err(dev, "error getting gpio (%d)\n", rc);

		return rc;

	}



	gpio_dev->gpio_nr = rc;

	gpio_dev->active_low = (flags & OF_GPIO_ACTIVE_LOW);

	gpio_dev->irq = gpiod_to_irq(gpio_dev->gpiod);

	if (gpio_dev->irq < 0)

		return gpio_dev->irq;



	rcdev = devm_rc_allocate_device(dev, RC_DRIVER_IR_RAW);

	if (!rcdev)
@@ -101,11 +92,6 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) 


	gpio_dev->rcdev = rcdev;



	rc = devm_gpio_request_one(dev, gpio_dev->gpio_nr, GPIOF_DIR_IN,

				   "gpio-ir-recv");

	if (rc < 0)

		return rc;



	rc = devm_rc_register_device(dev, rcdev);

	if (rc < 0) {

		dev_err(dev, "failed to register rc device (%d)\n", rc);
@@ -114,8 +100,7 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, gpio_dev);



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

				gpio_ir_recv_irq,

	return devm_request_irq(dev, gpio_dev->irq, gpio_ir_recv_irq,

				IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,

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

}
@@ -123,26 +108,24 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) 
#ifdef CONFIG_PM

static int gpio_ir_recv_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct gpio_rc_dev *gpio_dev = platform_get_drvdata(pdev);

	struct gpio_rc_dev *gpio_dev = dev_get_drvdata(dev);



	if (device_may_wakeup(dev))

		enable_irq_wake(gpio_to_irq(gpio_dev->gpio_nr));

		enable_irq_wake(gpio_dev->irq);

	else

		disable_irq(gpio_to_irq(gpio_dev->gpio_nr));

		disable_irq(gpio_dev->irq);



	return 0;

}



static int gpio_ir_recv_resume(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct gpio_rc_dev *gpio_dev = platform_get_drvdata(pdev);

	struct gpio_rc_dev *gpio_dev = dev_get_drvdata(dev);



	if (device_may_wakeup(dev))

		disable_irq_wake(gpio_to_irq(gpio_dev->gpio_nr));

		disable_irq_wake(gpio_dev->irq);

	else

		enable_irq(gpio_to_irq(gpio_dev->gpio_nr));

		enable_irq(gpio_dev->irq);



	return 0;

}