mmc: omap_hsmmc: use platform_get_irq_optional for wake IRQ
Subsystems (2)
PATCH 1/1 mmc: omap_hsmmc: use platform_get_irq_optional for wake IRQ
Replace irq_of_parse_and_map() with platform_get_irq_optional() to get the wake IRQ. This is a more portable approach that works with both DT and non-DT platforms, and follows the modern platform API conventions for optional IRQ resources.
The wake IRQ is now fetched earlier in the probe function alongside the main IRQ, and the -EPROBE_DEFER case is handled properly before the deferred probe can be triggered.
--- drivers/mmc/host/omap_hsmmc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/mmc/host/omap_hsmmc.c +7 -4
@@ -1764,7 +1764,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)struct mmc_host *mmc;struct omap_hsmmc_host *host =NULL ;struct resource *res; -int ret, irq; +int ret, irq, wake_irq;const struct of_device_id *match;const struct omap_mmc_of_data *data;void __iomem *base;
@@ -1792,6 +1792,11 @@ static int omap_hsmmc_probe(struct platform_device *pdev)if (irq <0 )return irq; + wake_irq =platform_get_irq_optional (pdev,1 ); +if (wake_irq == -EPROBE_DEFER ) +return wake_irq; + wake_irq =max (wake_irq,0 ); + base =devm_platform_get_and_ioremap_resource (pdev,0 , &res);if (IS_ERR (base))return PTR_ERR (base);
@@ -1811,6 +1816,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev) host->use_dma =1 ; host->dma_ch =-1 ; host->irq = irq; + host->wake_irq = wake_irq; host->mapbase = res->start + pdata->reg_offset; host->base = base + pdata->reg_offset; host->power_mode =MMC_POWER_OFF ;
@@ -1820,9 +1826,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)platform_set_drvdata (pdev, host); -if (pdev->dev.of_node) - host->wake_irq =irq_of_parse_and_map (pdev->dev.of_node,1 ); - mmc->ops = &omap_hsmmc_ops; mmc->f_min =OMAP_MMC_MIN_CLOCK ;
Signature · 1 line
2.55.0
Quoted 11 lines · Rosen Penev
Replace
irq_of_parse_and_map()withplatform_get_irq_optional()to get the wake IRQ. This is a more portable approach that works with both DT and non-DT platforms, and follows the modern platform API conventions for optional IRQ resources.The wake IRQ is now fetched earlier in the probe function alongside the main IRQ, and the -EPROBE_DEFER case is handled properly before the deferred probe can be triggered.
Signed-off-by Rosen Penev <[email protected]>
Applied for next, thanks!
Kind regards
Uffe
Quoted 50 lines
--- drivers/mmc/host/omap_hsmmc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/mmc/host/omap_hsmmc.c +7
-5@@ -1764,7 +1764,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)struct mmc_host *mmc;struct omap_hsmmc_host *host =NULL ;struct resource *res; -int ret, irq; +int ret, irq, wake_irq;const struct of_device_id *match;const struct omap_mmc_of_data *data;void __iomem *base;@@ -1792,6 +1792,11 @@ static int omap_hsmmc_probe(struct platform_device *pdev)if (irq <0 )return irq; + wake_irq =platform_get_irq_optional (pdev,1 ); +if (wake_irq == -EPROBE_DEFER ) +return wake_irq; + wake_irq =max (wake_irq,0 ); + base =devm_platform_get_and_ioremap_resource (pdev,0 , &res);if (IS_ERR (base))return PTR_ERR (base);@@ -1811,6 +1816,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev) host->use_dma =1 ; host->dma_ch =-1 ; host->irq = irq; + host->wake_irq = wake_irq; host->mapbase = res->start + pdata->reg_offset; host->base = base + pdata->reg_offset; host->power_mode =MMC_POWER_OFF ;@@ -1820,9 +1826,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)platform_set_drvdata (pdev, host); -if (pdev->dev.of_node) - host->wake_irq =irq_of_parse_and_map (pdev->dev.of_node,1 ); - mmc->ops = &omap_hsmmc_ops; mmc->f_min =OMAP_MMC_MIN_CLOCK ; --2.55.0