| Message ID | 20180521131123.2009-1-marek.vasut+renesas@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Mon, May 21, 2018 at 03:11:20PM +0200, Marek Vasut wrote: > The function name is just too confusing, rename it, no functional change. > Rename the function to rcar_pcie_alloc_and_parse_pci_resource_list() as > it's matching failpath function is pci_free_resource_list() so the names > align much better and the new name also describes what the function does > much better. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Phil Edworthy <phil.edworthy@renesas.com> > Cc: Simon Horman <horms+renesas@verge.net.au> > Cc: Wolfram Sang <wsa@the-dreams.de> > Cc: linux-renesas-soc@vger.kernel.org Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
On Mon, May 21, 2018 at 3:11 PM, Marek Vasut <marek.vasut@gmail.com> wrote: > The function name is just too confusing, rename it, no functional change. > Rename the function to rcar_pcie_alloc_and_parse_pci_resource_list() as > it's matching failpath function is pci_free_resource_list() so the names > align much better and the new name also describes what the function does > much better. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
On Mon, May 21, 2018 at 03:11:20PM +0200, Marek Vasut wrote: > The function name is just too confusing, rename it, no functional change. > Rename the function to rcar_pcie_alloc_and_parse_pci_resource_list() as > it's matching failpath function is pci_free_resource_list() so the names > align much better and the new name also describes what the function does > much better. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Phil Edworthy <phil.edworthy@renesas.com> > Cc: Simon Horman <horms+renesas@verge.net.au> > Cc: Wolfram Sang <wsa@the-dreams.de> > Cc: linux-renesas-soc@vger.kernel.org > --- > drivers/pci/host/pcie-rcar.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Can you rebase this series against my pci/rcar branch please ? I will merge it then, thanks. Lorenzo > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index e403c5206b24..dbc80e457f95 100644 > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -1051,7 +1051,7 @@ static const struct of_device_id rcar_pcie_of_match[] = { > {}, > }; > > -static int rcar_pcie_parse_request_of_pci_ranges(struct rcar_pcie *pci) > +static int rcar_pcie_alloc_and_parse_pci_resource_list(struct rcar_pcie *pci) > { > int err; > struct device *dev = pci->dev; > @@ -1108,7 +1108,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) > > INIT_LIST_HEAD(&pcie->resources); > > - err = rcar_pcie_parse_request_of_pci_ranges(pcie); > + err = rcar_pcie_alloc_and_parse_pci_resource_list(pcie); > if (err) > goto err_free_bridge; > > -- > 2.16.2 >
On 05/23/2018 06:17 PM, Lorenzo Pieralisi wrote: > On Mon, May 21, 2018 at 03:11:20PM +0200, Marek Vasut wrote: >> The function name is just too confusing, rename it, no functional change. >> Rename the function to rcar_pcie_alloc_and_parse_pci_resource_list() as >> it's matching failpath function is pci_free_resource_list() so the names >> align much better and the new name also describes what the function does >> much better. >> >> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> >> Cc: Geert Uytterhoeven <geert+renesas@glider.be> >> Cc: Phil Edworthy <phil.edworthy@renesas.com> >> Cc: Simon Horman <horms+renesas@verge.net.au> >> Cc: Wolfram Sang <wsa@the-dreams.de> >> Cc: linux-renesas-soc@vger.kernel.org >> --- >> drivers/pci/host/pcie-rcar.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > > Can you rebase this series against my pci/rcar branch please ? > > I will merge it then, thanks. Where is that tree/branch located ? It applies fine on current next 20180517, is there a problem ?
On Wed, May 23, 2018 at 07:05:06PM +0200, Marek Vasut wrote: > On 05/23/2018 06:17 PM, Lorenzo Pieralisi wrote: > > On Mon, May 21, 2018 at 03:11:20PM +0200, Marek Vasut wrote: > >> The function name is just too confusing, rename it, no functional change. > >> Rename the function to rcar_pcie_alloc_and_parse_pci_resource_list() as > >> it's matching failpath function is pci_free_resource_list() so the names > >> align much better and the new name also describes what the function does > >> much better. > >> > >> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > >> Cc: Geert Uytterhoeven <geert+renesas@glider.be> > >> Cc: Phil Edworthy <phil.edworthy@renesas.com> > >> Cc: Simon Horman <horms+renesas@verge.net.au> > >> Cc: Wolfram Sang <wsa@the-dreams.de> > >> Cc: linux-renesas-soc@vger.kernel.org > >> --- > >> drivers/pci/host/pcie-rcar.c | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > > > > Can you rebase this series against my pci/rcar branch please ? > > > > I will merge it then, thanks. > > Where is that tree/branch located ? > > It applies fine on current next 20180517, is there a problem ? https://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/log/?h=pci/rcar I don't think next 20180517 includes Lorenzo's pci/rcar branch, so there might be conflicts. I think Stephen is on vacation until next week, so there isn't a newer -next tree yet.
On 05/23/2018 11:56 PM, Bjorn Helgaas wrote: > On Wed, May 23, 2018 at 07:05:06PM +0200, Marek Vasut wrote: >> On 05/23/2018 06:17 PM, Lorenzo Pieralisi wrote: >>> On Mon, May 21, 2018 at 03:11:20PM +0200, Marek Vasut wrote: >>>> The function name is just too confusing, rename it, no functional change. >>>> Rename the function to rcar_pcie_alloc_and_parse_pci_resource_list() as >>>> it's matching failpath function is pci_free_resource_list() so the names >>>> align much better and the new name also describes what the function does >>>> much better. >>>> >>>> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> >>>> Cc: Geert Uytterhoeven <geert+renesas@glider.be> >>>> Cc: Phil Edworthy <phil.edworthy@renesas.com> >>>> Cc: Simon Horman <horms+renesas@verge.net.au> >>>> Cc: Wolfram Sang <wsa@the-dreams.de> >>>> Cc: linux-renesas-soc@vger.kernel.org >>>> --- >>>> drivers/pci/host/pcie-rcar.c | 4 ++-- >>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> Can you rebase this series against my pci/rcar branch please ? >>> >>> I will merge it then, thanks. >> >> Where is that tree/branch located ? >> >> It applies fine on current next 20180517, is there a problem ? > > https://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/log/?h=pci/rcar OK, 1/4 is dropped, the remaining patches are resubmitted. I added one more (6/6) since the phy patches in that tree added a bug into the fail path, so I fixed that too. > I don't think next 20180517 includes Lorenzo's pci/rcar branch, so > there might be conflicts. I think Stephen is on vacation until next > week, so there isn't a newer -next tree yet. OK
On Thu, May 24, 2018 at 09:24:27AM +0200, Marek Vasut wrote: > On 05/23/2018 11:56 PM, Bjorn Helgaas wrote: > > On Wed, May 23, 2018 at 07:05:06PM +0200, Marek Vasut wrote: > >> On 05/23/2018 06:17 PM, Lorenzo Pieralisi wrote: > >>> On Mon, May 21, 2018 at 03:11:20PM +0200, Marek Vasut wrote: > >>>> The function name is just too confusing, rename it, no functional change. > >>>> Rename the function to rcar_pcie_alloc_and_parse_pci_resource_list() as > >>>> it's matching failpath function is pci_free_resource_list() so the names > >>>> align much better and the new name also describes what the function does > >>>> much better. > >>>> > >>>> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > >>>> Cc: Geert Uytterhoeven <geert+renesas@glider.be> > >>>> Cc: Phil Edworthy <phil.edworthy@renesas.com> > >>>> Cc: Simon Horman <horms+renesas@verge.net.au> > >>>> Cc: Wolfram Sang <wsa@the-dreams.de> > >>>> Cc: linux-renesas-soc@vger.kernel.org > >>>> --- > >>>> drivers/pci/host/pcie-rcar.c | 4 ++-- > >>>> 1 file changed, 2 insertions(+), 2 deletions(-) > >>> > >>> Can you rebase this series against my pci/rcar branch please ? > >>> > >>> I will merge it then, thanks. > >> > >> Where is that tree/branch located ? > >> > >> It applies fine on current next 20180517, is there a problem ? > > https://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/log/?h=pci/rcar > > OK, 1/4 is dropped, the remaining patches are resubmitted. I added one > more (6/6) since the phy patches in that tree added a bug into the fail > path, so I fixed that too. Please CC me if you want me to merge your code, I monitor linux-pci but that would help me, thanks. You did not add the review tags you received to the new series (also a cover letter - however minimal - and a version number would help), please add them and post a v2 so that I can merge them, I can do that for you but it is good practice for the future. Thanks, Lorenzo > > I don't think next 20180517 includes Lorenzo's pci/rcar branch, so > > there might be conflicts. I think Stephen is on vacation until next > > week, so there isn't a newer -next tree yet. > > OK > > -- > Best regards, > Marek Vasut
On 05/24/2018 03:50 PM, Lorenzo Pieralisi wrote: > On Thu, May 24, 2018 at 09:24:27AM +0200, Marek Vasut wrote: >> On 05/23/2018 11:56 PM, Bjorn Helgaas wrote: >>> On Wed, May 23, 2018 at 07:05:06PM +0200, Marek Vasut wrote: >>>> On 05/23/2018 06:17 PM, Lorenzo Pieralisi wrote: >>>>> On Mon, May 21, 2018 at 03:11:20PM +0200, Marek Vasut wrote: >>>>>> The function name is just too confusing, rename it, no functional change. >>>>>> Rename the function to rcar_pcie_alloc_and_parse_pci_resource_list() as >>>>>> it's matching failpath function is pci_free_resource_list() so the names >>>>>> align much better and the new name also describes what the function does >>>>>> much better. >>>>>> >>>>>> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> >>>>>> Cc: Geert Uytterhoeven <geert+renesas@glider.be> >>>>>> Cc: Phil Edworthy <phil.edworthy@renesas.com> >>>>>> Cc: Simon Horman <horms+renesas@verge.net.au> >>>>>> Cc: Wolfram Sang <wsa@the-dreams.de> >>>>>> Cc: linux-renesas-soc@vger.kernel.org >>>>>> --- >>>>>> drivers/pci/host/pcie-rcar.c | 4 ++-- >>>>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>>> >>>>> Can you rebase this series against my pci/rcar branch please ? >>>>> >>>>> I will merge it then, thanks. >>>> >>>> Where is that tree/branch located ? >>>> >>>> It applies fine on current next 20180517, is there a problem ? >>> https://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/log/?h=pci/rcar >> >> OK, 1/4 is dropped, the remaining patches are resubmitted. I added one >> more (6/6) since the phy patches in that tree added a bug into the fail >> path, so I fixed that too. > > Please CC me if you want me to merge your code, I monitor linux-pci > but that would help me, thanks. Right > You did not add the review tags you received to the new series Because I had to rebase the series on top of your tree which contained patches from two months ago which I was not told about which triggered changes in this series, so of course I had to scrub the tags. > (also a > cover letter - however minimal - and a version number would help), > please add them and post a v2 so that I can merge them, I can do that > for you but it is good practice for the future. Sure, I clearly need that practice.
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index e403c5206b24..dbc80e457f95 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -1051,7 +1051,7 @@ static const struct of_device_id rcar_pcie_of_match[] = { {}, }; -static int rcar_pcie_parse_request_of_pci_ranges(struct rcar_pcie *pci) +static int rcar_pcie_alloc_and_parse_pci_resource_list(struct rcar_pcie *pci) { int err; struct device *dev = pci->dev; @@ -1108,7 +1108,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) INIT_LIST_HEAD(&pcie->resources); - err = rcar_pcie_parse_request_of_pci_ranges(pcie); + err = rcar_pcie_alloc_and_parse_pci_resource_list(pcie); if (err) goto err_free_bridge;
The function name is just too confusing, rename it, no functional change. Rename the function to rcar_pcie_alloc_and_parse_pci_resource_list() as it's matching failpath function is pci_free_resource_list() so the names align much better and the new name also describes what the function does much better. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Phil Edworthy <phil.edworthy@renesas.com> Cc: Simon Horman <horms+renesas@verge.net.au> Cc: Wolfram Sang <wsa@the-dreams.de> Cc: linux-renesas-soc@vger.kernel.org --- drivers/pci/host/pcie-rcar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)