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

Commit 1ffc931c authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Mauro Carvalho Chehab
Browse files

[media] rc: meson-ir: remove irq from struct meson_ir 



The irq number is used in the probe function only, therefore just use
a local variable.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 956bd18a

drivers/media/rc/meson-ir.c

+5 −6
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ 
struct meson_ir {

	void __iomem	*reg;

	struct rc_dev	*rc;

	int		irq;

	spinlock_t	lock;

};
@@ -112,7 +111,7 @@ static int meson_ir_probe(struct platform_device *pdev) 
	struct resource *res;

	const char *map_name;

	struct meson_ir *ir;

	int ret;

	int irq, ret;



	ir = devm_kzalloc(dev, sizeof(struct meson_ir), GFP_KERNEL);

	if (!ir)
@@ -125,10 +124,10 @@ static int meson_ir_probe(struct platform_device *pdev) 
		return PTR_ERR(ir->reg);

	}



	ir->irq = platform_get_irq(pdev, 0);

	if (ir->irq < 0) {

	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "no irq resource\n");

		return ir->irq;

		return irq;

	}



	ir->rc = rc_allocate_device(RC_DRIVER_IR_RAW);
@@ -158,7 +157,7 @@ static int meson_ir_probe(struct platform_device *pdev) 
		goto out_free;

	}



	ret = devm_request_irq(dev, ir->irq, meson_ir_irq, 0, "ir-meson", ir);

	ret = devm_request_irq(dev, irq, meson_ir_irq, 0, "ir-meson", ir);

	if (ret) {

		dev_err(dev, "failed to request irq\n");

		goto out_unreg;