* [PATCH 2/3] PCI: mvebu: Remove redeundant of_match_ptr
2013-10-21 9:06 [PATCH 1/3] PCI: imx6: Remove redeundant of_match_ptr Sachin Kamat
@ 2013-10-21 9:06 ` Sachin Kamat
2013-10-29 22:12 ` Bjorn Helgaas
2013-10-21 9:06 ` [PATCH 3/3] PCI: exynos: Remove redundant of_match_ptr Sachin Kamat
` (2 subsequent siblings)
3 siblings, 1 reply; 12+ messages in thread
From: Sachin Kamat @ 2013-10-21 9:06 UTC (permalink / raw)
To: linux-pci; +Cc: bhelgaas, sachin.kamat, Thomas Petazzoni
mvebu_pcie_of_match_table is always compiled in. Hence of_match_ptr is
not required.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
drivers/pci/host/pci-mvebu.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 20c470c..7adae6e 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -1016,8 +1016,7 @@ static struct platform_driver mvebu_pcie_driver = {
.driver = {
.owner = THIS_MODULE,
.name = "mvebu-pcie",
- .of_match_table =
- of_match_ptr(mvebu_pcie_of_match_table),
+ .of_match_table = mvebu_pcie_of_match_table,
/* driver unloading/unbinding currently not supported */
.suppress_bind_attrs = true,
},
--
1.7.9.5
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 2/3] PCI: mvebu: Remove redeundant of_match_ptr
2013-10-21 9:06 ` [PATCH 2/3] PCI: mvebu: " Sachin Kamat
@ 2013-10-29 22:12 ` Bjorn Helgaas
2013-10-30 16:06 ` Bjorn Helgaas
0 siblings, 1 reply; 12+ messages in thread
From: Bjorn Helgaas @ 2013-10-29 22:12 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-pci@vger.kernel.org, Thomas Petazzoni, Jason Cooper
[+cc Jason]
On Mon, Oct 21, 2013 at 3:06 AM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> mvebu_pcie_of_match_table is always compiled in. Hence of_match_ptr is
> not required.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Jason, I assume you'll merge this if you want it.
> ---
> drivers/pci/host/pci-mvebu.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> index 20c470c..7adae6e 100644
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@ -1016,8 +1016,7 @@ static struct platform_driver mvebu_pcie_driver = {
> .driver = {
> .owner = THIS_MODULE,
> .name = "mvebu-pcie",
> - .of_match_table =
> - of_match_ptr(mvebu_pcie_of_match_table),
> + .of_match_table = mvebu_pcie_of_match_table,
> /* driver unloading/unbinding currently not supported */
> .suppress_bind_attrs = true,
> },
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 2/3] PCI: mvebu: Remove redeundant of_match_ptr
2013-10-29 22:12 ` Bjorn Helgaas
@ 2013-10-30 16:06 ` Bjorn Helgaas
2013-10-31 3:25 ` Sachin Kamat
2013-11-03 19:59 ` Jason Cooper
0 siblings, 2 replies; 12+ messages in thread
From: Bjorn Helgaas @ 2013-10-30 16:06 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-pci@vger.kernel.org, Thomas Petazzoni, Jason Cooper
On Tue, Oct 29, 2013 at 4:12 PM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> [+cc Jason]
>
> On Mon, Oct 21, 2013 at 3:06 AM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
>> mvebu_pcie_of_match_table is always compiled in. Hence of_match_ptr is
>> not required.
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>
> Jason, I assume you'll merge this if you want it.
BTW, Jason, if you think of it, fix the typo in the subject
(s/redeundant/redundant/). It was correct for the exynos patch, but
wrong for the mvebu and imx6 patches.
>> ---
>> drivers/pci/host/pci-mvebu.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
>> index 20c470c..7adae6e 100644
>> --- a/drivers/pci/host/pci-mvebu.c
>> +++ b/drivers/pci/host/pci-mvebu.c
>> @@ -1016,8 +1016,7 @@ static struct platform_driver mvebu_pcie_driver = {
>> .driver = {
>> .owner = THIS_MODULE,
>> .name = "mvebu-pcie",
>> - .of_match_table =
>> - of_match_ptr(mvebu_pcie_of_match_table),
>> + .of_match_table = mvebu_pcie_of_match_table,
>> /* driver unloading/unbinding currently not supported */
>> .suppress_bind_attrs = true,
>> },
>> --
>> 1.7.9.5
>>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 2/3] PCI: mvebu: Remove redeundant of_match_ptr
2013-10-30 16:06 ` Bjorn Helgaas
@ 2013-10-31 3:25 ` Sachin Kamat
2013-11-03 19:59 ` Jason Cooper
1 sibling, 0 replies; 12+ messages in thread
From: Sachin Kamat @ 2013-10-31 3:25 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-pci@vger.kernel.org, Thomas Petazzoni, Jason Cooper
On 30 October 2013 21:36, Bjorn Helgaas <bhelgaas@google.com> wrote:
> On Tue, Oct 29, 2013 at 4:12 PM, Bjorn Helgaas <bhelgaas@google.com> wrote:
>> [+cc Jason]
>>
>> On Mon, Oct 21, 2013 at 3:06 AM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
>>> mvebu_pcie_of_match_table is always compiled in. Hence of_match_ptr is
>>> not required.
>>>
>>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>>> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>>
>> Jason, I assume you'll merge this if you want it.
>
> BTW, Jason, if you think of it, fix the typo in the subject
> (s/redeundant/redundant/). It was correct for the exynos patch, but
> wrong for the mvebu and imx6 patches.
Sorry for the typo. Somehow I happened to overlook it.
--
With warm regards,
Sachin
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/3] PCI: mvebu: Remove redeundant of_match_ptr
2013-10-30 16:06 ` Bjorn Helgaas
2013-10-31 3:25 ` Sachin Kamat
@ 2013-11-03 19:59 ` Jason Cooper
1 sibling, 0 replies; 12+ messages in thread
From: Jason Cooper @ 2013-11-03 19:59 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Sachin Kamat, linux-pci@vger.kernel.org, Thomas Petazzoni,
Andrew Lunn, Gregory CLEMENT, Sebastian Hesselbarth
Bjorn,
Sorry for the delayed response. Apparently, work doesn't stop when you
go out of town for a week. :-)
On Wed, Oct 30, 2013 at 10:06:58AM -0600, Bjorn Helgaas wrote:
> On Tue, Oct 29, 2013 at 4:12 PM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> > [+cc Jason]
> >
> > On Mon, Oct 21, 2013 at 3:06 AM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> >> mvebu_pcie_of_match_table is always compiled in. Hence of_match_ptr is
> >> not required.
> >>
> >> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> >> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> >
> > Jason, I assume you'll merge this if you want it.
Hmm, we seem to be at a good transition point. The arm-soc tree tries
not to take any more patches after -rc6, so we've been frozen since
then.
I have a few pci patches in my mvebu-next/drivers branch that didn't
make it in in time. Jason Gunthorpe has a hotplug patch that needs
testing and a few other fixes floating around.
Perhaps we should just go ahead and transition back to the mvebu
maintainers Ack'ing patches and then going through your tree (as it's
supposed to be)?
If we run into another complicated dependency mess, we'll hash it out
then. atm, I don't see anything on the horizon.
Sound good? If so, I'll drop the following from mvebu-next/drivers:
ca02ce7f863f PCI: mvebu - The bridge secondary status register should be 0
b09d7cdf75dc PCI: mvebu - Support a bridge with no IO port window
dbbe1efd61e3 PCI: mvebu: return NULL instead of ERR_PTR(ret)
You can take them for v3.13 if you'd like, or hold them for v3.14 (which
was the current plan due to the -rc6 cutoff).
I've intentionally kept mvebu-next/* branches out of linux-next, so
cherry picking the above shouldn't cause any conflicts.
thx,
Jason.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/3] PCI: exynos: Remove redundant of_match_ptr
2013-10-21 9:06 [PATCH 1/3] PCI: imx6: Remove redeundant of_match_ptr Sachin Kamat
2013-10-21 9:06 ` [PATCH 2/3] PCI: mvebu: " Sachin Kamat
@ 2013-10-21 9:06 ` Sachin Kamat
2013-10-21 10:26 ` Jingoo Han
2013-10-29 22:15 ` Bjorn Helgaas
2013-10-29 22:11 ` [PATCH 1/3] PCI: imx6: Remove redeundant of_match_ptr Bjorn Helgaas
2013-10-30 16:04 ` Bjorn Helgaas
3 siblings, 2 replies; 12+ messages in thread
From: Sachin Kamat @ 2013-10-21 9:06 UTC (permalink / raw)
To: linux-pci; +Cc: bhelgaas, sachin.kamat, Jingoo Han
This driver is DT only. Hence of_match_ptr is not required.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Jingoo Han <jg1.han@samsung.com>
---
drivers/pci/host/pci-exynos.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c
index ee692c2..c4798fb 100644
--- a/drivers/pci/host/pci-exynos.c
+++ b/drivers/pci/host/pci-exynos.c
@@ -647,7 +647,7 @@ static struct platform_driver exynos_pcie_driver = {
.driver = {
.name = "exynos-pcie",
.owner = THIS_MODULE,
- .of_match_table = of_match_ptr(exynos_pcie_of_match),
+ .of_match_table = exynos_pcie_of_match,
},
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 3/3] PCI: exynos: Remove redundant of_match_ptr
2013-10-21 9:06 ` [PATCH 3/3] PCI: exynos: Remove redundant of_match_ptr Sachin Kamat
@ 2013-10-21 10:26 ` Jingoo Han
2013-10-29 22:15 ` Bjorn Helgaas
1 sibling, 0 replies; 12+ messages in thread
From: Jingoo Han @ 2013-10-21 10:26 UTC (permalink / raw)
To: 'Sachin Kamat'
Cc: 'Bjorn Helgaas', linux-pci, 'Jingoo Han'
> This driver is DT only. Hence of_match_ptr is not required.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Jingoo Han <jg1.han@samsung.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
It looks good.
Thank you for sending the patch. :)
Best regards,
Jingoo Han
> ---
> drivers/pci/host/pci-exynos.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c
> index ee692c2..c4798fb 100644
> --- a/drivers/pci/host/pci-exynos.c
> +++ b/drivers/pci/host/pci-exynos.c
> @@ -647,7 +647,7 @@ static struct platform_driver exynos_pcie_driver = {
> .driver = {
> .name = "exynos-pcie",
> .owner = THIS_MODULE,
> - .of_match_table = of_match_ptr(exynos_pcie_of_match),
> + .of_match_table = exynos_pcie_of_match,
> },
> };
>
> --
> 1.7.9.5
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 3/3] PCI: exynos: Remove redundant of_match_ptr
2013-10-21 9:06 ` [PATCH 3/3] PCI: exynos: Remove redundant of_match_ptr Sachin Kamat
2013-10-21 10:26 ` Jingoo Han
@ 2013-10-29 22:15 ` Bjorn Helgaas
1 sibling, 0 replies; 12+ messages in thread
From: Bjorn Helgaas @ 2013-10-29 22:15 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-pci@vger.kernel.org, Jingoo Han
On Mon, Oct 21, 2013 at 3:06 AM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> This driver is DT only. Hence of_match_ptr is not required.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Jingoo Han <jg1.han@samsung.com>
Applied with Jingoo's ack to my pci/host-exynos branch for v3.13, thanks!
> ---
> drivers/pci/host/pci-exynos.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c
> index ee692c2..c4798fb 100644
> --- a/drivers/pci/host/pci-exynos.c
> +++ b/drivers/pci/host/pci-exynos.c
> @@ -647,7 +647,7 @@ static struct platform_driver exynos_pcie_driver = {
> .driver = {
> .name = "exynos-pcie",
> .owner = THIS_MODULE,
> - .of_match_table = of_match_ptr(exynos_pcie_of_match),
> + .of_match_table = exynos_pcie_of_match,
> },
> };
>
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/3] PCI: imx6: Remove redeundant of_match_ptr
2013-10-21 9:06 [PATCH 1/3] PCI: imx6: Remove redeundant of_match_ptr Sachin Kamat
2013-10-21 9:06 ` [PATCH 2/3] PCI: mvebu: " Sachin Kamat
2013-10-21 9:06 ` [PATCH 3/3] PCI: exynos: Remove redundant of_match_ptr Sachin Kamat
@ 2013-10-29 22:11 ` Bjorn Helgaas
2013-10-30 3:28 ` Shawn Guo
2013-10-30 16:04 ` Bjorn Helgaas
3 siblings, 1 reply; 12+ messages in thread
From: Bjorn Helgaas @ 2013-10-29 22:11 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-pci@vger.kernel.org, Sean Cross, Shawn Guo
[+cc Shawn]
On Mon, Oct 21, 2013 at 3:06 AM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> imx6_pcie_of_match is always compiled in. Hence of_match_ptr is
> not required.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Sean Cross <xobs@kosagi.com>
I'll apply this for v3.13 if Shawn acks it, per
http://lkml.kernel.org/r/CAErSpo5tN==4nSv2u3SUBe_L4VsWn4P7TN+LtrC172Qj1vhtog@mail.gmail.com
> ---
> drivers/pci/host/pci-imx6.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
> index 5afa922..64aaa8e 100644
> --- a/drivers/pci/host/pci-imx6.c
> +++ b/drivers/pci/host/pci-imx6.c
> @@ -558,7 +558,7 @@ static struct platform_driver imx6_pcie_driver = {
> .driver = {
> .name = "imx6q-pcie",
> .owner = THIS_MODULE,
> - .of_match_table = of_match_ptr(imx6_pcie_of_match),
> + .of_match_table = imx6_pcie_of_match,
> },
> };
>
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 1/3] PCI: imx6: Remove redeundant of_match_ptr
2013-10-29 22:11 ` [PATCH 1/3] PCI: imx6: Remove redeundant of_match_ptr Bjorn Helgaas
@ 2013-10-30 3:28 ` Shawn Guo
0 siblings, 0 replies; 12+ messages in thread
From: Shawn Guo @ 2013-10-30 3:28 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: Sachin Kamat, linux-pci@vger.kernel.org, Sean Cross
On Tue, Oct 29, 2013 at 04:11:25PM -0600, Bjorn Helgaas wrote:
> [+cc Shawn]
>
> On Mon, Oct 21, 2013 at 3:06 AM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> > imx6_pcie_of_match is always compiled in. Hence of_match_ptr is
> > not required.
> >
> > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> > Cc: Sean Cross <xobs@kosagi.com>
>
> I'll apply this for v3.13 if Shawn acks it, per
> http://lkml.kernel.org/r/CAErSpo5tN==4nSv2u3SUBe_L4VsWn4P7TN+LtrC172Qj1vhtog@mail.gmail.com
Yea, since PCI_IMX6 depends on SOC_IMX6Q which only supports OF build,
it makes sense to drop the of_match_ptr() wrapper, so
Acked-by: Shawn Guo <shawn.guo@linaro.org>
>
> > ---
> > drivers/pci/host/pci-imx6.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
> > index 5afa922..64aaa8e 100644
> > --- a/drivers/pci/host/pci-imx6.c
> > +++ b/drivers/pci/host/pci-imx6.c
> > @@ -558,7 +558,7 @@ static struct platform_driver imx6_pcie_driver = {
> > .driver = {
> > .name = "imx6q-pcie",
> > .owner = THIS_MODULE,
> > - .of_match_table = of_match_ptr(imx6_pcie_of_match),
> > + .of_match_table = imx6_pcie_of_match,
> > },
> > };
> >
> > --
> > 1.7.9.5
> >
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/3] PCI: imx6: Remove redeundant of_match_ptr
2013-10-21 9:06 [PATCH 1/3] PCI: imx6: Remove redeundant of_match_ptr Sachin Kamat
` (2 preceding siblings ...)
2013-10-29 22:11 ` [PATCH 1/3] PCI: imx6: Remove redeundant of_match_ptr Bjorn Helgaas
@ 2013-10-30 16:04 ` Bjorn Helgaas
3 siblings, 0 replies; 12+ messages in thread
From: Bjorn Helgaas @ 2013-10-30 16:04 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-pci@vger.kernel.org, Sean Cross
On Mon, Oct 21, 2013 at 3:06 AM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> imx6_pcie_of_match is always compiled in. Hence of_match_ptr is
> not required.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Sean Cross <xobs@kosagi.com>
Applied with Shawn's ack to my pci/host-imx6 branch for v3.13, thanks.
> ---
> drivers/pci/host/pci-imx6.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
> index 5afa922..64aaa8e 100644
> --- a/drivers/pci/host/pci-imx6.c
> +++ b/drivers/pci/host/pci-imx6.c
> @@ -558,7 +558,7 @@ static struct platform_driver imx6_pcie_driver = {
> .driver = {
> .name = "imx6q-pcie",
> .owner = THIS_MODULE,
> - .of_match_table = of_match_ptr(imx6_pcie_of_match),
> + .of_match_table = imx6_pcie_of_match,
> },
> };
>
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 12+ messages in thread