From: Dan Williams <dan.j.williams@intel.com>
Date: Fri, 30 Oct 2015 21:09:35 +0000 (-0400)
Subject: ahci: cleanup ahci_host_activate_multi_irqs
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0a142b26921c23ccdb6ef802d8047d02ad4cf0a7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

ahci: cleanup ahci_host_activate_multi_irqs

With devm there is no need to explicitly free irqs on error.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
---

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 67f97e3e471a..096064cd6c52 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -2496,25 +2496,10 @@ static int ahci_host_activate_multi_irqs(struct ata_host *host, int irq,
 					       ahci_port_thread_fn, 0,
 					       pp->irq_desc, host->ports[i]);
 		if (rc)
-			goto out_free_irqs;
-	}
-
-	for (i = 0; i < host->n_ports; i++)
+			return rc;
 		ata_port_desc(host->ports[i], "irq %d", irq + i);
-
-	rc = ata_host_register(host, sht);
-	if (rc)
-		goto out_free_all_irqs;
-
-	return 0;
-
-out_free_all_irqs:
-	i = host->n_ports;
-out_free_irqs:
-	for (i--; i >= 0; i--)
-		devm_free_irq(host->dev, irq + i, host->ports[i]);
-
-	return rc;
+	}
+	return ata_host_register(host, sht);
 }
 
 /**