Merge branch 'pci/host-mvebu' into next

* pci/host-mvebu: PCI: mvebu: Remove unneeded gpiod NULL check

Merge branch 'pci/host-mvebu' into next
* pci/host-mvebu: PCI: mvebu: Remove unneeded gpiod NULL check
73646b7f · Bjorn Helgaas · a2efd681 · c3539516 · 73646b7f
Commit 73646b7f authored Sep 07, 2017 by Bjorn Helgaas
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

drivers/pci/host/pci-mvebu.c drivers/pci/host/pci-mvebu.c +1 -2

No files found.
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -1186,8 +1186,7 @@ static int mvebu_pcie_powerup(struct mvebu_pcie_port *port)
 */
 static void mvebu_pcie_powerdown(struct mvebu_pcie_port *port)
 {
-	if (port->reset_gpio)
-		gpiod_set_value_cansleep(port->reset_gpio, 1);
+	gpiod_set_value_cansleep(port->reset_gpio, 1);

 	clk_disable_unprepare(port->clk);
 }