github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 05:04:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mmc: host: Remove redundant dev_err()/dev_err_probe()

Browse Source 
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>
Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulfh@kernel.org>
This commit is contained in:
Pan Chuang 2026-07-17 18:14:49 +08:00 committed by Ulf Hansson
parent 5608386899
commit d9686ea2cd
8 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mmc/host/alcor.c
View File

@ -1103,8 +1103,7 @@ static int alcor_pci_sdmmc_drv_probe(struct platform_device *pdev)
alcor_irq, alcor_irq_thread, IRQF_SHARED,
DRV_NAME_ALCOR_PCI_SDMMC, host);
if (ret)
return dev_err_probe(&pdev->dev, ret,
"Failed to get irq for data line\n");
return ret;
mutex_init(&host->cmd_mutex);
INIT_DELAYED_WORK(&host->timeout_work, alcor_timeout_timer);

10
drivers/mmc/host/cavium-octeon.c
View File

@ -240,21 +240,15 @@ static int octeon_mmc_probe(struct platform_device *pdev)
ret = devm_request_irq(&pdev->dev, mmc_irq[i],
cvm_mmc_interrupt,
0, cvm_mmc_irq_names[i], host);
if (ret < 0) {
dev_err(&pdev->dev, "Error: devm_request_irq %d\n",
mmc_irq[i]);
if (ret < 0)
return ret;
}
}
} else {
ret = devm_request_irq(&pdev->dev, mmc_irq[0],
cvm_mmc_interrupt, 0, KBUILD_MODNAME,
host);
if (ret < 0) {
dev_err(&pdev->dev, "Error: devm_request_irq %d\n",
mmc_irq[0]);
if (ret < 0)
return ret;
}
}
host->global_pwr_gpiod = devm_gpiod_get_optional(&pdev->dev,

5
drivers/mmc/host/meson-mx-sdio.c
View File

@ -683,11 +683,8 @@ static int meson_mx_mmc_probe(struct platform_device *pdev)
meson_mx_mmc_irq,
meson_mx_mmc_irq_thread, IRQF_ONESHOT,
NULL, host);
if (ret) {
dev_err_probe(host->controller_dev, ret,
"Failed to request IRQ\n");
if (ret)
goto error_unregister_slot_pdev;
}
core_clk = devm_clk_get_enabled(host->controller_dev, "core");
if (IS_ERR(core_clk)) {

4
drivers/mmc/host/mvsdio.c
View File

@ -764,10 +764,8 @@ static int mvsd_probe(struct platform_device *pdev)
mvsd_power_down(host);
ret = devm_request_irq(&pdev->dev, irq, mvsd_irq, 0, DRIVER_NAME, host);
if (ret) {
dev_err(&pdev->dev, "cannot assign irq %d\n", irq);
if (ret)
goto out;
}
timer_setup(&host->timer, mvsd_timeout_timer, 0);
platform_set_drvdata(pdev, mmc);

4
drivers/mmc/host/omap_hsmmc.c
View File

@ -1915,10 +1915,8 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
/* Request IRQ for MMC operations */
ret = devm_request_irq(&pdev->dev, host->irq, omap_hsmmc_irq, 0,
mmc_hostname(mmc), host);
if (ret) {
dev_err(mmc_dev(host->mmc), "Unable to grab HSMMC IRQ\n");
if (ret)
goto err_irq;
}
ret = omap_hsmmc_reg_get(host);
if (ret)

5
drivers/mmc/host/owl-mmc.c
View File

@ -635,11 +635,8 @@ static int owl_mmc_probe(struct platform_device *pdev)
ret = devm_request_irq(&pdev->dev, owl_host->irq, owl_irq_handler,
0, dev_name(&pdev->dev), owl_host);
if (ret) {
dev_err(&pdev->dev, "Failed to request irq %d\n",
owl_host->irq);
if (ret)
goto err_release_channel;
}
ret = mmc_add_host(mmc);
if (ret) {

4
drivers/mmc/host/sdhci-msm.c
View File

@ -2864,10 +2864,8 @@ static int sdhci_msm_probe(struct platform_device *pdev)
ret = devm_request_threaded_irq(&pdev->dev, msm_host->pwr_irq, NULL,
sdhci_msm_pwr_irq, IRQF_ONESHOT,
dev_name(&pdev->dev), host);
if (ret) {
dev_err(&pdev->dev, "Request IRQ failed (%d)\n", ret);
if (ret)
goto clk_disable;
}
msm_host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_NEED_RSP_BUSY;

8
drivers/mmc/host/sh_mmcif.c
View File

@ -1505,18 +1505,14 @@ static int sh_mmcif_probe(struct platform_device *pdev)
name = irq[1] < 0 ? dev_name(dev) : "sh_mmc:error";
ret = devm_request_threaded_irq(dev, irq[0], sh_mmcif_intr,
sh_mmcif_irqt, 0, name, host);
if (ret) {
dev_err(dev, "request_irq error (%s)\n", name);
if (ret)
goto err_clk;
}
if (irq[1] >= 0) {
ret = devm_request_threaded_irq(dev, irq[1],
sh_mmcif_intr, sh_mmcif_irqt,
0, "sh_mmc:int", host);
if (ret) {
dev_err(dev, "request_irq error (sh_mmc:int)\n");
if (ret)
goto err_clk;
}
}
mutex_init(&host->thread_lock);