| Message ID | 20191209092147.22901-2-kishon@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add PCIe support to TI's J721E SoC | expand |
On Mon, Dec 09, 2019 at 02:51:35PM +0530, Kishon Vijay Abraham I wrote: > commit bd22885aa188f135fd9 ("PCI: cadence: Refactor driver to use > as a core library") while refactoring the Cadence PCIe driver to be > used as library, removed pm_runtime_get_sync() from cdns_pcie_ep_setup() > and cdns_pcie_host_setup() but missed to remove the corresponding > pm_runtime_put_sync() in the error path. Fix it here. > > Fixes: commit bd22885aa188f135fd9 ("PCI: cadence: Refactor driver to use As this is a fix, a commit subject starting with PCI: cadence: Fix ... may be more obvious. I'd suggest you use the shorter form of this, i.e. Fixes: %h (\"%s\")) Fixes: bd22885aa188 ("PCI: cadence: Refactor driver to use as a core library") > as a core library") > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > drivers/pci/controller/cadence/pcie-cadence-ep.c | 2 -- > drivers/pci/controller/cadence/pcie-cadence-host.c | 2 -- > 2 files changed, 4 deletions(-) > > diff --git a/drivers/pci/controller/cadence/pcie-cadence-ep.c b/drivers/pci/controller/cadence/pcie-cadence-ep.c > index 1c173dad67d1..560f22b4d165 100644 > --- a/drivers/pci/controller/cadence/pcie-cadence-ep.c > +++ b/drivers/pci/controller/cadence/pcie-cadence-ep.c > @@ -473,7 +473,5 @@ int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep) > pci_epc_mem_exit(epc); > > err_init: > - pm_runtime_put_sync(dev); > - > return ret; > } > diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c > index 9b1c3966414b..ccf55e143e1d 100644 > --- a/drivers/pci/controller/cadence/pcie-cadence-host.c > +++ b/drivers/pci/controller/cadence/pcie-cadence-host.c > @@ -275,7 +275,5 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) > pci_free_resource_list(&resources); > > err_init: > - pm_runtime_put_sync(dev); > - There is probably more you can do here for both -host and -ep: - Remove the possibly now unused <linux/pm_runtime.h> include - Remove the err_init label and return directly from source. Thanks, Andrew Murray > return ret; > } > -- > 2.17.1 >
Hi Andrew, On 16/12/19 7:15 pm, Andrew Murray wrote: > On Mon, Dec 09, 2019 at 02:51:35PM +0530, Kishon Vijay Abraham I wrote: >> commit bd22885aa188f135fd9 ("PCI: cadence: Refactor driver to use >> as a core library") while refactoring the Cadence PCIe driver to be >> used as library, removed pm_runtime_get_sync() from cdns_pcie_ep_setup() >> and cdns_pcie_host_setup() but missed to remove the corresponding >> pm_runtime_put_sync() in the error path. Fix it here. >> >> Fixes: commit bd22885aa188f135fd9 ("PCI: cadence: Refactor driver to use > > As this is a fix, a commit subject starting with PCI: cadence: Fix ... may > be more obvious. > > I'd suggest you use the shorter form of this, i.e. Fixes: %h (\"%s\")) > > Fixes: bd22885aa188 ("PCI: cadence: Refactor driver to use as a core library") > >> as a core library") Okay. >> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> drivers/pci/controller/cadence/pcie-cadence-ep.c | 2 -- >> drivers/pci/controller/cadence/pcie-cadence-host.c | 2 -- >> 2 files changed, 4 deletions(-) >> >> diff --git a/drivers/pci/controller/cadence/pcie-cadence-ep.c b/drivers/pci/controller/cadence/pcie-cadence-ep.c >> index 1c173dad67d1..560f22b4d165 100644 >> --- a/drivers/pci/controller/cadence/pcie-cadence-ep.c >> +++ b/drivers/pci/controller/cadence/pcie-cadence-ep.c >> @@ -473,7 +473,5 @@ int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep) >> pci_epc_mem_exit(epc); >> >> err_init: >> - pm_runtime_put_sync(dev); >> - >> return ret; >> } >> diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c >> index 9b1c3966414b..ccf55e143e1d 100644 >> --- a/drivers/pci/controller/cadence/pcie-cadence-host.c >> +++ b/drivers/pci/controller/cadence/pcie-cadence-host.c >> @@ -275,7 +275,5 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) >> pci_free_resource_list(&resources); >> >> err_init: >> - pm_runtime_put_sync(dev); >> - > > There is probably more you can do here for both -host and -ep: > > - Remove the possibly now unused <linux/pm_runtime.h> include > - Remove the err_init label and return directly from source. Okay, will fix this up. Thanks Kishon
diff --git a/drivers/pci/controller/cadence/pcie-cadence-ep.c b/drivers/pci/controller/cadence/pcie-cadence-ep.c index 1c173dad67d1..560f22b4d165 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-ep.c +++ b/drivers/pci/controller/cadence/pcie-cadence-ep.c @@ -473,7 +473,5 @@ int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep) pci_epc_mem_exit(epc); err_init: - pm_runtime_put_sync(dev); - return ret; } diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c index 9b1c3966414b..ccf55e143e1d 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-host.c +++ b/drivers/pci/controller/cadence/pcie-cadence-host.c @@ -275,7 +275,5 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) pci_free_resource_list(&resources); err_init: - pm_runtime_put_sync(dev); - return ret; }
commit bd22885aa188f135fd9 ("PCI: cadence: Refactor driver to use as a core library") while refactoring the Cadence PCIe driver to be used as library, removed pm_runtime_get_sync() from cdns_pcie_ep_setup() and cdns_pcie_host_setup() but missed to remove the corresponding pm_runtime_put_sync() in the error path. Fix it here. Fixes: commit bd22885aa188f135fd9 ("PCI: cadence: Refactor driver to use as a core library") Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- drivers/pci/controller/cadence/pcie-cadence-ep.c | 2 -- drivers/pci/controller/cadence/pcie-cadence-host.c | 2 -- 2 files changed, 4 deletions(-)