PCI: keystone: Fix race condition when initializing PHYs

[platform/kernel/linux-starfive.git] / drivers / misc / tps6594-esm.c

diff --git a/drivers/misc/tps6594-esm.c b/drivers/misc/tps6594-esm.c
index 05e2c15..b4d67a1 100644 (file)
--- a/drivers/misc/tps6594-esm.c
+++ b/drivers/misc/tps6594-esm.c
@@ -56,8 +56,7 @@ static int tps6594_esm_probe(struct platform_device *pdev)
        for (i = 0; i < pdev->num_resources; i++) {
                irq = platform_get_irq_byname(pdev, pdev->resource[i].name);
                if (irq < 0)
-                       return dev_err_probe(dev, irq, "Failed to get %s irq\n",
-                                            pdev->resource[i].name);
+                       return irq;
 
                ret = devm_request_threaded_irq(dev, irq, NULL,
                                                tps6594_esm_isr, IRQF_ONESHOT,
@@ -82,7 +81,7 @@ static int tps6594_esm_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int tps6594_esm_remove(struct platform_device *pdev)
+static void tps6594_esm_remove(struct platform_device *pdev)
 {
        struct tps6594 *tps = dev_get_drvdata(pdev->dev.parent);
        struct device *dev = &pdev->dev;
@@ -103,8 +102,6 @@ static int tps6594_esm_remove(struct platform_device *pdev)
 out:
        pm_runtime_put_sync(dev);
        pm_runtime_disable(dev);
-
-       return ret;
 }
 
 static int tps6594_esm_suspend(struct device *dev)
@@ -138,7 +135,7 @@ static struct platform_driver tps6594_esm_driver = {
                .pm = pm_sleep_ptr(&tps6594_esm_pm_ops),
        },
        .probe = tps6594_esm_probe,
-       .remove = tps6594_esm_remove,
+       .remove_new = tps6594_esm_remove,
 };
 
 module_platform_driver(tps6594_esm_driver);