| Message ID | 1382346403-29576-2-git-send-email-sachin.kamat@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
[+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 > -- 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 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 >> -- 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 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.
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. -- 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-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, },
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(-)