Browse Source

Merge branch 'pci/host-mvebu' into next

* pci/host-mvebu:
  PCI: mvebu: Remove unneeded gpiod NULL check
Bjorn Helgaas 8 years ago
parent
commit
73646b7fb5
1 changed files with 1 additions and 2 deletions
  1. 1 2
      drivers/pci/host/pci-mvebu.c

+ 1 - 2
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)
 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);
 	clk_disable_unprepare(port->clk);
 }
 }