summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-09-07 21:24:04 +0300
committerBjorn Helgaas <bhelgaas@google.com>2017-09-07 21:24:04 +0300
commit73646b7fb551a92ad4d2a05bea6fb40b1ae8ae01 (patch)
treeaba6523bed029b728ea12c9e6da848d4bf280d78
parenta2efd681208375d1fa2da3dc8e064d5afa1e57b7 (diff)
parentc3539516538006a92fa395cf8b203a23a6913567 (diff)
downloadlinux-73646b7fb551a92ad4d2a05bea6fb40b1ae8ae01.tar.xz
Merge branch 'pci/host-mvebu' into next
* pci/host-mvebu: PCI: mvebu: Remove unneeded gpiod NULL check
-rw-r--r--drivers/pci/host/pci-mvebu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index f353a6eb2f01..fa227d81bec6 100644
--- 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);
}