[PATCH] PCI: MVEBU: Remove duplicate clock get

[PATCH] PCI: MVEBU: Remove duplicate clock get

[Andrew Lunn]

Probably due to a merge conflict resolution gone bad, the pci clock is
got twice. Remove the second redundent of_clk_get_by_name().

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 drivers/pci/host/pci-mvebu.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index c269e430c760..96352be58cc9 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -949,14 +949,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);
-- 
1.8.5

Re: [PATCH] PCI: MVEBU: Remove duplicate clock get

[Jason Cooper]

On Wed, Dec 04, 2013 at 06:30:41PM +0100, Andrew Lunn wrote:
> Probably due to a merge conflict resolution gone bad, the pci clock is
> got twice. Remove the second redundent of_clk_get_by_name().
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
>  drivers/pci/host/pci-mvebu.c | 8 --------
>  1 file changed, 8 deletions(-)

Acked-by: Jason Cooper <jason@lakedaemon.net>

thx,

Jason.

Re: [PATCH] PCI: MVEBU: Remove duplicate clock get

[Jingoo Han]

On Thursday, December 05, 2013 5:28 AM, Jason Cooper wrote:
>On Wed, Dec 04, 2013 at 06:30:41PM +0100, Andrew Lunn wrote:
>> Probably due to a merge conflict resolution gone bad, the pci clock is
>> got twice. Remove the second redundent of_clk_get_by_name().
>>
>> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
>> ---
>>  drivers/pci/host/pci-mvebu.c | 8 --------
>>  1 file changed, 8 deletions(-)
>
> Acked-by: Jason Cooper <jason@lakedaemon.net>

(+cc Jason Gunthorpe)

Yes, right. :-)
Original patch did not include the redundent of_clk_get_by_name().

Reviewed-by: Jingoo Han <jg1.han@samsung.com>

Best regards,
Jingoo Han

Re: [PATCH] PCI: MVEBU: Remove duplicate clock get

[Bjorn Helgaas]

On Wed, Dec 04, 2013 at 06:30:41PM +0100, Andrew Lunn wrote:
> Probably due to a merge conflict resolution gone bad, the pci clock is
> got twice. Remove the second redundent of_clk_get_by_name().
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>

Applied to my pci/host-mvebu branch for v3.14, thanks!

Bjorn

> ---
>  drivers/pci/host/pci-mvebu.c | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> index c269e430c760..96352be58cc9 100644
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@ -949,14 +949,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);
> -- 
> 1.8.5
> 

Re: [PATCH] PCI: MVEBU: Remove duplicate clock get

[Andrew Lunn]

On Wed, Dec 04, 2013 at 06:30:41PM +0100, Andrew Lunn wrote:
> Probably due to a merge conflict resolution gone bad, the pci clock is
> got twice. Remove the second redundent of_clk_get_by_name().
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
>  drivers/pci/host/pci-mvebu.c | 8 --------
>  1 file changed, 8 deletions(-)

Hi Folks

This patch has been Acked by Jingoo Han.

So my question is, which maintainer is going to accept it for
mainline? Is there anything i need to do?

Thanks
	Andrew


> 
> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> index c269e430c760..96352be58cc9 100644
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@ -949,14 +949,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);
> -- 
> 1.8.5
> 

Re: [PATCH] PCI: MVEBU: Remove duplicate clock get

[Jason Cooper]

Andrew,

On Tue, Dec 17, 2013 at 09:45:10PM +0100, Andrew Lunn wrote:
> On Wed, Dec 04, 2013 at 06:30:41PM +0100, Andrew Lunn wrote:
> > Probably due to a merge conflict resolution gone bad, the pci clock is
> > got twice. Remove the second redundent of_clk_get_by_name().
> > 
> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > ---
> >  drivers/pci/host/pci-mvebu.c | 8 --------
> >  1 file changed, 8 deletions(-)
> 
> Hi Folks
> 
> This patch has been Acked by Jingoo Han.
> 
> So my question is, which maintainer is going to accept it for
> mainline? Is there anything i need to do?

I'll create a branch for Bjorn to pull.  Or, if Bjorn wants to take it
directly,

Acked-by: Jason Cooper <jason@lakedaemon.net>

thx,

Jason.

Re: [PATCH] PCI: MVEBU: Remove duplicate clock get

[Bjorn Helgaas]

On Tue, Dec 17, 2013 at 1:49 PM, Jason Cooper <jason@lakedaemon.net> wrote:
> Andrew,
>
> On Tue, Dec 17, 2013 at 09:45:10PM +0100, Andrew Lunn wrote:
>> On Wed, Dec 04, 2013 at 06:30:41PM +0100, Andrew Lunn wrote:
>> > Probably due to a merge conflict resolution gone bad, the pci clock is
>> > got twice. Remove the second redundent of_clk_get_by_name().
>> >
>> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
>> > ---
>> >  drivers/pci/host/pci-mvebu.c | 8 --------
>> >  1 file changed, 8 deletions(-)
>>
>> Hi Folks
>>
>> This patch has been Acked by Jingoo Han.
>>
>> So my question is, which maintainer is going to accept it for
>> mainline? Is there anything i need to do?

I already applied it: http://lkml.kernel.org/r/20131209232904.GD4699@google.com

You don't need to do anything more.

> I'll create a branch for Bjorn to pull.  Or, if Bjorn wants to take it
> directly,
>
> Acked-by: Jason Cooper <jason@lakedaemon.net>
>
> thx,
>
> Jason.

Re: [PATCH] PCI: MVEBU: Remove duplicate clock get

[Jingoo Han]

On Wednesday, December 18, 2013 5:45 AM, Andrew Lunn wrote:
> On Wed, Dec 04, 2013 at 06:30:41PM +0100, Andrew Lunn wrote:
> > Probably due to a merge conflict resolution gone bad, the pci clock is
> > got twice. Remove the second redundent of_clk_get_by_name().
> >
> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > ---
> >  drivers/pci/host/pci-mvebu.c | 8 --------
> >  1 file changed, 8 deletions(-)
> 
> Hi Folks
> 
> This patch has been Acked by Jingoo Han.

I just 'Reviewed', not 'Acked'. :-)

> 
> So my question is, which maintainer is going to accept it for
> mainline? Is there anything i need to do?

As Bjorn said, this patch was already applied to 'pci/host-mvebu'
branch for v3.14.

Also, MVEBU PCIe will be maintained by Thomas Petazzoni, and
Jason Cooper as below.

PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
M:     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
M:     Jason Cooper <jason@lakedaemon.net>
L:     linux-pci@vger.kernel.org
L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:     Maintained
F:     drivers/pci/host/*mvebu*

Thank you.

Best regards,
Jingoo Han