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

Commit dc2eadec authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

clocksource: sh_cmt: Use request_irq() instead of setup_irq() 



The driver claims it needs to register an interrupt handler too early
for request_irq(). This might have been true in the past, but the only
meaningful difference between request_irq() and setup_irq() today is an
additional kzalloc() call in request_irq(). As the driver calls
kmalloc() itself we know that the slab allocator is available, we can
thus switch to request_irq().

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent c9eaa447

drivers/clocksource/sh_cmt.c

+3 −7
Original line number Diff line number Diff line
@@ -728,12 +728,6 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev) 
		goto err1;

	}



	/* request irq using setup_irq() (too early for request_irq()) */

	p->irqaction.name = dev_name(&p->pdev->dev);

	p->irqaction.handler = sh_cmt_interrupt;

	p->irqaction.dev_id = p;

	p->irqaction.flags = IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING;



	/* get hold of clock */

	p->clk = clk_get(&p->pdev->dev, "cmt_fck");

	if (IS_ERR(p->clk)) {
@@ -786,7 +780,9 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev) 
	}

	p->cs_enabled = false;



	ret = setup_irq(irq, &p->irqaction);

	ret = request_irq(irq, sh_cmt_interrupt,

			  IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING,

			  dev_name(&p->pdev->dev), p);

	if (ret) {

		dev_err(&p->pdev->dev, "failed to request irq %d\n", irq);

		goto err4;