mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-28 00:35:00 -04:00
mailbox: Remove redundant dev_err()/dev_err_probe()
Since commit 55b48e23f5 ("genirq/devres: Add error handling in
devm_request_*_irq()"), devm_request_irq() and devm_request_threaded_irq()
automatically log detailed error messages on failure. Remove the
now-redundant driver-specific dev_err() and dev_err_probe() calls.
Signed-off-by: Pan Chuang <panchuang@vivo.com>
Acked-by: Chen-Yu Tsai <wens@kernel.org>
Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com>
This commit is contained in:
@@ -318,7 +318,6 @@ static int mhu_db_probe(struct amba_device *adev, const struct amba_id *id)
|
||||
mhu_db_mbox_rx_handler,
|
||||
IRQF_ONESHOT, "mhu_db_link", mhu);
|
||||
if (err) {
|
||||
dev_err(dev, "Can't claim IRQ %d\n", irq);
|
||||
mbox_controller_unregister(&mhu->mbox);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -985,10 +985,7 @@ static int mhuv2_tx_init(struct amba_device *adev, struct mhuv2 *mhu,
|
||||
ret = devm_request_threaded_irq(dev, adev->irq[0], NULL,
|
||||
mhuv2_sender_interrupt,
|
||||
IRQF_ONESHOT, "mhuv2-tx", mhu);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to request tx IRQ, fallback to polling mode: %d\n",
|
||||
ret);
|
||||
} else {
|
||||
if (!ret) {
|
||||
mhu->mbox.txdone_irq = true;
|
||||
mhu->mbox.txdone_poll = false;
|
||||
mhu->irq = adev->irq[0];
|
||||
@@ -1038,10 +1035,8 @@ static int mhuv2_rx_init(struct amba_device *adev, struct mhuv2 *mhu,
|
||||
ret = devm_request_threaded_irq(dev, mhu->irq, NULL,
|
||||
mhuv2_receiver_interrupt, IRQF_ONESHOT,
|
||||
"mhuv2-rx", mhu);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to request rx IRQ\n");
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Mask all the channel windows */
|
||||
for (i = 0; i < mhu->windows; i++)
|
||||
|
||||
@@ -982,8 +982,7 @@ static int mhuv3_setup_pbx(struct mhuv3 *mhu)
|
||||
mhuv3_pbx_comb_interrupt,
|
||||
IRQF_ONESHOT, "mhuv3-pbx", mhu);
|
||||
if (ret)
|
||||
return dev_err_probe(dev, ret,
|
||||
"Failed to request PBX IRQ\n");
|
||||
return ret;
|
||||
|
||||
mhu->mbox.txdone_irq = true;
|
||||
mhu->mbox.txdone_poll = false;
|
||||
@@ -1020,7 +1019,7 @@ static int mhuv3_setup_mbx(struct mhuv3 *mhu)
|
||||
mhuv3_mbx_comb_interrupt, IRQF_ONESHOT,
|
||||
"mhuv3-mbx", mhu);
|
||||
if (ret)
|
||||
return dev_err_probe(dev, ret, "Failed to request MBX IRQ\n");
|
||||
return ret;
|
||||
|
||||
for (i = 0; i < NUM_EXT; i++)
|
||||
if (mhu->ext[i])
|
||||
|
||||
@@ -108,10 +108,8 @@ static int a37xx_mbox_startup(struct mbox_chan *chan)
|
||||
|
||||
ret = devm_request_irq(mbox->dev, mbox->irq, a37xx_mbox_irq_handler, 0,
|
||||
DRIVER_NAME, chan);
|
||||
if (ret < 0) {
|
||||
dev_err(mbox->dev, "Cannot request irq\n");
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* enable IRQ generation */
|
||||
reg = readl(mbox->base + RWTM_HOST_INT_MASK);
|
||||
|
||||
@@ -1403,11 +1403,8 @@ static int pdc_interrupts_init(struct pdc_state *pdcs)
|
||||
|
||||
err = devm_request_irq(dev, pdcs->pdc_irq, pdc_irq_handler, 0,
|
||||
dev_name(dev), dev);
|
||||
if (err) {
|
||||
dev_err(dev, "IRQ %u request failed with err %d\n",
|
||||
pdcs->pdc_irq, err);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
return PDC_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
@@ -147,11 +147,8 @@ static int bcm2835_mbox_probe(struct platform_device *pdev)
|
||||
ret = devm_request_irq(dev, irq_of_parse_and_map(dev->of_node, 0),
|
||||
bcm2835_mbox_irq, IRQF_NO_SUSPEND, dev_name(dev),
|
||||
mbox);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to register a mailbox IRQ handler: %d\n",
|
||||
ret);
|
||||
if (ret)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
mbox->regs = devm_platform_ioremap_resource(pdev, 0);
|
||||
if (IS_ERR(mbox->regs)) {
|
||||
|
||||
@@ -601,7 +601,7 @@ static int bcm74110_mbox_probe(struct platform_device *pdev)
|
||||
ret = devm_request_irq(dev, mbox->rx_irq, bcm74110_mbox_isr,
|
||||
IRQF_NO_SUSPEND, pdev->name, mbox);
|
||||
if (ret)
|
||||
return dev_err_probe(dev, ret, "Failed to request irq\n");
|
||||
return ret;
|
||||
|
||||
mbox->controller.ops = &bcm74110_mbox_chan_ops;
|
||||
mbox->controller.dev = dev;
|
||||
|
||||
@@ -189,7 +189,7 @@ static int cv1800_mbox_probe(struct platform_device *pdev)
|
||||
cv1800_mbox_isr, IRQF_ONESHOT,
|
||||
dev_name(&pdev->dev), mb);
|
||||
if (err < 0)
|
||||
return dev_err_probe(dev, err, "Failed to register irq\n");
|
||||
return err;
|
||||
|
||||
for (idx = 0; idx < MAILBOX_MAX_CHAN; idx++) {
|
||||
mb->priv[idx].idx = idx;
|
||||
|
||||
@@ -297,11 +297,8 @@ static int hi6220_mbox_probe(struct platform_device *pdev)
|
||||
|
||||
err = devm_request_irq(dev, mbox->irq, hi6220_mbox_interrupt, 0,
|
||||
dev_name(dev), mbox);
|
||||
if (err) {
|
||||
dev_err(dev, "Failed to register a mailbox IRQ handler: %d\n",
|
||||
err);
|
||||
if (err)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
mbox->controller.dev = dev;
|
||||
mbox->controller.chans = &mbox->chan[0];
|
||||
|
||||
@@ -219,8 +219,6 @@ static int mpfs_mbox_startup(struct mbox_chan *chan)
|
||||
return -EINVAL;
|
||||
|
||||
ret = devm_request_irq(mbox->dev, mbox->irq, mpfs_mbox_inbox_isr, 0, "mpfs-mailbox", chan);
|
||||
if (ret)
|
||||
dev_err(mbox->dev, "failed to register mailbox interrupt:%d\n", ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -468,10 +468,8 @@ static int sti_mbox_probe(struct platform_device *pdev)
|
||||
sti_mbox_irq_handler,
|
||||
sti_mbox_thread_handler,
|
||||
IRQF_ONESHOT, mdev->name, mdev);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "Can't claim IRQ %d\n", irq);
|
||||
if (ret)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
dev_info(&pdev->dev, "%s: Registered Tx/Rx Mailbox\n", mdev->name);
|
||||
|
||||
|
||||
@@ -175,7 +175,7 @@ static int qcom_cpucp_mbox_probe(struct platform_device *pdev)
|
||||
ret = devm_request_irq(dev, irq, qcom_cpucp_mbox_irq_fn,
|
||||
IRQF_TRIGGER_HIGH | IRQF_NO_SUSPEND, "apss_cpucp_mbox", cpucp);
|
||||
if (ret < 0)
|
||||
return dev_err_probe(dev, ret, "Failed to register irq: %d\n", irq);
|
||||
return ret;
|
||||
|
||||
writeq(APSS_CPUCP_RX_MBOX_CMD_MASK, cpucp->rx_base + APSS_CPUCP_RX_MBOX_MAP);
|
||||
|
||||
|
||||
@@ -323,10 +323,8 @@ static int qcom_ipcc_probe(struct platform_device *pdev)
|
||||
ret = devm_request_irq(&pdev->dev, ipcc->irq, qcom_ipcc_irq_fn,
|
||||
IRQF_TRIGGER_HIGH | IRQF_NO_SUSPEND |
|
||||
IRQF_NO_THREAD, name, ipcc);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "Failed to register the irq: %d\n", ret);
|
||||
if (ret < 0)
|
||||
goto err_req_irq;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, ipcc);
|
||||
|
||||
|
||||
@@ -377,10 +377,8 @@ static int sprd_mbox_probe(struct platform_device *pdev)
|
||||
|
||||
ret = devm_request_irq(dev, inbox_irq, sprd_mbox_inbox_isr,
|
||||
IRQF_NO_SUSPEND, dev_name(dev), priv);
|
||||
if (ret) {
|
||||
dev_err(dev, "failed to request inbox IRQ: %d\n", ret);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
outbox_irq = platform_get_irq_byname(pdev, "outbox");
|
||||
if (outbox_irq < 0)
|
||||
@@ -388,20 +386,16 @@ static int sprd_mbox_probe(struct platform_device *pdev)
|
||||
|
||||
ret = devm_request_irq(dev, outbox_irq, sprd_mbox_outbox_isr,
|
||||
IRQF_NO_SUSPEND, dev_name(dev), priv);
|
||||
if (ret) {
|
||||
dev_err(dev, "failed to request outbox IRQ: %d\n", ret);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Supplementary outbox IRQ is optional */
|
||||
supp_irq = platform_get_irq_byname(pdev, "supp-outbox");
|
||||
if (supp_irq > 0) {
|
||||
ret = devm_request_irq(dev, supp_irq, sprd_mbox_supp_isr,
|
||||
IRQF_NO_SUSPEND, dev_name(dev), priv);
|
||||
if (ret) {
|
||||
dev_err(dev, "failed to request outbox IRQ: %d\n", ret);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (!priv->info->supp_id) {
|
||||
dev_err(dev, "no supplementary outbox specified\n");
|
||||
|
||||
@@ -263,10 +263,8 @@ static int stm32_ipcc_probe(struct platform_device *pdev)
|
||||
ret = devm_request_threaded_irq(dev, ipcc->irqs[i], NULL,
|
||||
irq_thread[i], IRQF_ONESHOT,
|
||||
dev_name(dev), ipcc);
|
||||
if (ret) {
|
||||
dev_err(dev, "failed to request irq %lu (%d)\n", i, ret);
|
||||
if (ret)
|
||||
goto err_clk;
|
||||
}
|
||||
}
|
||||
|
||||
/* mask and enable rx/tx irq */
|
||||
|
||||
@@ -257,10 +257,8 @@ static int sun6i_msgbox_probe(struct platform_device *pdev)
|
||||
|
||||
ret = devm_request_irq(dev, irq_of_parse_and_map(dev->of_node, 0),
|
||||
sun6i_msgbox_irq, 0, dev_name(dev), mbox);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to register IRQ handler: %d\n", ret);
|
||||
if (ret)
|
||||
goto err_disable_unprepare;
|
||||
}
|
||||
|
||||
mbox->controller.dev = dev;
|
||||
mbox->controller.ops = &sun6i_msgbox_chan_ops;
|
||||
|
||||
@@ -708,11 +708,8 @@ static int tegra_hsp_request_shared_irq(struct tegra_hsp *hsp)
|
||||
|
||||
err = devm_request_irq(hsp->dev, irq, tegra_hsp_shared_irq, 0,
|
||||
dev_name(hsp->dev), hsp);
|
||||
if (err < 0) {
|
||||
dev_err(hsp->dev, "failed to request interrupt: %d\n",
|
||||
err);
|
||||
if (err < 0)
|
||||
continue;
|
||||
}
|
||||
|
||||
hsp->shared_irq = i;
|
||||
|
||||
@@ -856,12 +853,8 @@ static int tegra_hsp_probe(struct platform_device *pdev)
|
||||
err = devm_request_irq(&pdev->dev, hsp->doorbell_irq,
|
||||
tegra_hsp_doorbell_irq, IRQF_NO_SUSPEND,
|
||||
dev_name(&pdev->dev), hsp);
|
||||
if (err < 0) {
|
||||
dev_err(&pdev->dev,
|
||||
"failed to request doorbell IRQ#%u: %d\n",
|
||||
hsp->doorbell_irq, err);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
if (hsp->shared_irqs) {
|
||||
|
||||
Reference in New Issue
Block a user