| Message ID | 1388659296-21569-1-git-send-email-gregory.clement@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
Dear Gregory CLEMENT, On Thu, 2 Jan 2014 11:41:36 +0100, Gregory CLEMENT wrote: > In the commit b42285f66f871a989, Sebastian moved clock enable before > register access, but during the merge of the commit > 9f352f0e6c0fa2dc608812df "PCI: mvebu: Dynamically detect if the PEX > link is up to enable hot plug", the moved part was added back. > > This patch fixes this by removing the redundant code. > > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > --- > drivers/pci/host/pci-mvebu.c | 8 -------- > 1 file changed, 8 deletions(-) This has already been fixed by https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/drivers/pci/host/pci-mvebu.c?id=84f47190d6be1cb99cd4a680e1018080d93800a8. Thanks! Thomas
On 02/01/2014 11:46, Thomas Petazzoni wrote: > Dear Gregory CLEMENT, > > On Thu, 2 Jan 2014 11:41:36 +0100, Gregory CLEMENT wrote: >> In the commit b42285f66f871a989, Sebastian moved clock enable before >> register access, but during the merge of the commit >> 9f352f0e6c0fa2dc608812df "PCI: mvebu: Dynamically detect if the PEX >> link is up to enable hot plug", the moved part was added back. >> >> This patch fixes this by removing the redundant code. >> >> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> >> --- >> drivers/pci/host/pci-mvebu.c | 8 -------- >> 1 file changed, 8 deletions(-) > > This has already been fixed by > https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/drivers/pci/host/pci-mvebu.c?id=84f47190d6be1cb99cd4a680e1018080d93800a8. > I didn't find it because I only looked for in my emails and I wrongly assumed that the LAKML were in CC. > Thanks! > > Thomas >
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index 2aa7b77c7c88..0b4b99fa1fb5 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c @@ -954,14 +954,6 @@ static int mvebu_pcie_probe(struct platform_device *pdev) mvebu_pcie_set_local_dev_nr(port, 1); - port->clk = of_clk_get_by_name(child, NULL); - if (IS_ERR(port->clk)) { - dev_err(&pdev->dev, "PCIe%d.%d: cannot get clock\n", - port->port, port->lane); - iounmap(port->base); - continue; - } - port->dn = child; spin_lock_init(&port->conf_lock); mvebu_sw_pci_bridge_init(port);
In the commit b42285f66f871a989, Sebastian moved clock enable before register access, but during the merge of the commit 9f352f0e6c0fa2dc608812df "PCI: mvebu: Dynamically detect if the PEX link is up to enable hot plug", the moved part was added back. This patch fixes this by removing the redundant code. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> --- drivers/pci/host/pci-mvebu.c | 8 -------- 1 file changed, 8 deletions(-)