mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-31 09:20:13 -04:00
Merge tag 'counter-updates-for-7.3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-next
William writes: Counter updates for 7.3 Remove superfluous dev_err() and dev_err_probe() calls from stm32-timer-cnt, ti-eqep, and ti-ecap-capture now that devm_request_irq() and devm_request_threaded_irq() automatically log error messages on failure. * tag 'counter-updates-for-7.3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter: counter: ti-eqep: Remove redundant dev_err_probe() counter: ti-ecap-capture: Remove redundant dev_err_probe() counter: stm32-timer-cnt: Remove redundant dev_err()
This commit is contained in:
@@ -759,11 +759,8 @@ static int stm32_timer_cnt_probe(struct platform_device *pdev)
|
||||
/* All events reported through the global interrupt */
|
||||
ret = devm_request_irq(&pdev->dev, ddata->irq[0], stm32_timer_cnt_isr,
|
||||
0, dev_name(dev), counter);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to request irq %d (err %d)\n",
|
||||
ddata->irq[0], ret);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < priv->nr_irqs; i++) {
|
||||
/*
|
||||
@@ -775,11 +772,8 @@ static int stm32_timer_cnt_probe(struct platform_device *pdev)
|
||||
|
||||
ret = devm_request_irq(&pdev->dev, ddata->irq[i], stm32_timer_cnt_isr,
|
||||
0, dev_name(dev), counter);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to request irq %d (err %d)\n",
|
||||
ddata->irq[i], ret);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -513,7 +513,7 @@ static int ecap_cnt_probe(struct platform_device *pdev)
|
||||
|
||||
ret = devm_request_irq(dev, ret, ecap_cnt_isr, 0, pdev->name, counter_dev);
|
||||
if (ret)
|
||||
return dev_err_probe(dev, ret, "failed to request irq\n");
|
||||
return ret;
|
||||
|
||||
platform_set_drvdata(pdev, counter_dev);
|
||||
|
||||
|
||||
@@ -526,7 +526,7 @@ static int ti_eqep_probe(struct platform_device *pdev)
|
||||
err = devm_request_threaded_irq(dev, irq, NULL, ti_eqep_irq_handler,
|
||||
IRQF_ONESHOT, dev_name(dev), counter);
|
||||
if (err < 0)
|
||||
return dev_err_probe(dev, err, "failed to request IRQ\n");
|
||||
return err;
|
||||
|
||||
counter->name = dev_name(dev);
|
||||
counter->parent = dev;
|
||||
|
||||
Reference in New Issue
Block a user