Merge branch 'pci/controller/mvebu'

- Use devm_add_action_or_reset() when adding port->clk devm cleanup action
  so we don't have to explicitly call clk_put() (Salah Triki)

* pci/controller/mvebu:
  PCI: mvebu: Use devm_add_action_or_reset() instead of devm_add_action()

Author: bjorn-helgaas

drivers/pci/controller/pci-mvebu.c

@@ -1353,11 +1353,9 @@ static int mvebu_pcie_parse_port(struct mvebu_pcie *pcie,
 		goto skip;
 	}
 
-	ret = devm_add_action(dev, mvebu_pcie_port_clk_put, port);
-	if (ret < 0) {
-		clk_put(port->clk);
+	ret = devm_add_action_or_reset(dev, mvebu_pcie_port_clk_put, port);
+	if (ret < 0)
 		goto err;
-	}
 
 	return 1;