diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:04 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:04 -0500 |
commit | 73646b7fb551a92ad4d2a05bea6fb40b1ae8ae01 (patch) | |
tree | aba6523bed029b728ea12c9e6da848d4bf280d78 /drivers/pci/host | |
parent | a2efd681208375d1fa2da3dc8e064d5afa1e57b7 (diff) | |
parent | c3539516538006a92fa395cf8b203a23a6913567 (diff) | |
download | op-kernel-dev-73646b7fb551a92ad4d2a05bea6fb40b1ae8ae01.zip op-kernel-dev-73646b7fb551a92ad4d2a05bea6fb40b1ae8ae01.tar.gz |
Merge branch 'pci/host-mvebu' into next
* pci/host-mvebu:
PCI: mvebu: Remove unneeded gpiod NULL check
Diffstat (limited to 'drivers/pci/host')
-rw-r--r-- | drivers/pci/host/pci-mvebu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index f353a6e..fa227d8 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); } |