| Message ID | 1382346403-29576-1-git-send-email-sachin.kamat@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
[+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 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 > > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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, }, };
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> --- drivers/pci/host/pci-imx6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)