Merge tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / ata / sata_dwc_460ex.c

diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index f0ef844..338c2e5 100644 (file)
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -1259,24 +1259,20 @@ static int sata_dwc_probe(struct platform_device *ofdev)
        irq = irq_of_parse_and_map(np, 0);
        if (irq == NO_IRQ) {
                dev_err(&ofdev->dev, "no SATA DMA irq\n");
-               err = -ENODEV;
-               goto error_out;
+               return -ENODEV;
        }
 
 #ifdef CONFIG_SATA_DWC_OLD_DMA
        if (!of_find_property(np, "dmas", NULL)) {
                err = sata_dwc_dma_init_old(ofdev, hsdev);
                if (err)
-                       goto error_out;
+                       return err;
        }
 #endif
 
        hsdev->phy = devm_phy_optional_get(hsdev->dev, "sata-phy");
-       if (IS_ERR(hsdev->phy)) {
-               err = PTR_ERR(hsdev->phy);
-               hsdev->phy = NULL;
-               goto error_out;
-       }
+       if (IS_ERR(hsdev->phy))
+               return PTR_ERR(hsdev->phy);
 
        err = phy_init(hsdev->phy);
        if (err)