clocksource: Remove dev_err() usage after platform_get_irq() (9f475d08) · Commits · 戴 / test

We don't need dev_err() messages when platform_get_irq() fails now that platform_get_irq() prints an error message itself when something goes wrong. Let's remove these prints with a simple semantic patch. // <smpl> @@ expression ret; struct platform_device *E; @@ ret = ( platform_get_irq(E, ...) | platform_get_irq_byname(E, ...) ); if ( \( ret < 0 \| ret <= 0 \) ) { ( -if (ret != -EPROBE_DEFER) -{ ... -dev_err(...); -... } | ... -dev_err(...); ) ... } // </smpl> While we're here, remove braces on if statements that only have one statement (manually). Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by:

Stephen Boyd <swboyd@chromium.org> Reviewed-by:

Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by:

Daniel Lezcano <daniel.lezcano@linaro.org>

drivers/clocksource/em_sti.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -291,10 +291,8 @@ static int em_sti_probe(struct platform_device *pdev)
		platform_set_drvdata(pdev, p);

		irq = platform_get_irq(pdev, 0);
		if (irq < 0) {
		dev_err(&pdev->dev, "failed to get irq\n");
		if (irq < 0)
		return irq;
		}

		/* map memory, let base point to the STI instance */
		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

drivers/clocksource/sh_cmt.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -776,11 +776,8 @@ static int sh_cmt_register_clockevent(struct sh_cmt_channel *ch,
		int ret;

		irq = platform_get_irq(ch->cmt->pdev, ch->index);
		if (irq < 0) {
		dev_err(&ch->cmt->pdev->dev, "ch%u: failed to get irq\n",
		ch->index);
		if (irq < 0)
		return irq;
		}

		ret = request_irq(irq, sh_cmt_interrupt,
		IRQF_TIMER \| IRQF_IRQPOLL \| IRQF_NOBALANCING,

drivers/clocksource/sh_tmu.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -462,11 +462,8 @@ static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, unsigned int index,
		ch->base = tmu->mapbase + 8 + ch->index * 12;

		ch->irq = platform_get_irq(tmu->pdev, index);
		if (ch->irq < 0) {
		dev_err(&tmu->pdev->dev, "ch%u: failed to get irq\n",
		ch->index);
		if (ch->irq < 0)
		return ch->irq;
		}

		ch->cs_enabled = false;
		ch->enable_count = 0;

Admin message