From: Andrew Lunn <andrew@lunn.ch>
To: Andrew Lunn <andrew@lunn.ch>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
bhelgaas@google.com, Jason Cooper <jason@lakedaemon.net>,
linux-pci@vger.kernel.org
Subject: Re: [PATCH] PCI: MVEBU: Remove duplicate clock get
Date: Tue, 17 Dec 2013 21:45:10 +0100 [thread overview]
Message-ID: <20131217204510.GA2281@lunn.ch> (raw)
In-Reply-To: <1386178241-10453-1-git-send-email-andrew@lunn.ch>
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
>
next prev parent reply other threads:[~2013-12-17 20:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-04 17:30 [PATCH] PCI: MVEBU: Remove duplicate clock get Andrew Lunn
2013-12-04 20:27 ` Jason Cooper
2013-12-04 23:36 ` Jingoo Han
2013-12-09 23:29 ` Bjorn Helgaas
2013-12-17 20:45 ` Andrew Lunn [this message]
2013-12-17 20:49 ` Jason Cooper
2013-12-17 22:14 ` Bjorn Helgaas
2013-12-18 1:03 ` Jingoo Han
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131217204510.GA2281@lunn.ch \
--to=andrew@lunn.ch \
--cc=bhelgaas@google.com \
--cc=jason@lakedaemon.net \
--cc=linux-pci@vger.kernel.org \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.