diff for duplicates of <20121213103412.GA24453@arm.com> diff --git a/a/1.txt b/N1/1.txt index e732cac..a192283 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,58 +2,67 @@ On Thu, Dec 13, 2012 at 10:03:18AM +0000, Thierry Reding wrote: > On Thu, Dec 13, 2012 at 09:45:43AM +0000, Andrew Murray wrote: > > On Thu, Dec 13, 2012 at 09:13:33AM +0000, Thierry Reding wrote: > > > Hi Andrew, -> > > +> > >=20 > > > I don't like iterator interfaces too much, but I can live with that. -> > > Other than that the patch looks good to me and I'll try to work it into +> > > Other than that the patch looks good to me and I'll try to work it in= +to > > > my Tegra PCIe patch series. -> > > +> > >=20 > > > Just two minor comments below. -> > > +> > >=20 > > > > diff --git a/drivers/of/address.c b/drivers/of/address.c > > > [...] -> > > > @@ -421,7 +472,7 @@ u64 __of_translate_address(struct device_node *dev, const __be32 *in_addr, -> > > > goto bail; -> > > > bus = of_match_bus(parent); -> > > > -> > > > - /* Cound address cells & copy address locally */ -> > > > + /* Count address cells & copy address locally */ -> > > > bus->count_cells(dev, &na, &ns); -> > > > if (!OF_CHECK_COUNTS(na, ns)) { -> > > > printk(KERN_ERR "prom_parse: Bad cell count for %s\n", -> > > +> > > > @@ -421,7 +472,7 @@ u64 __of_translate_address(struct device_node *= +dev, const __be32 *in_addr, +> > > > =09=09goto bail; +> > > > =09bus =3D of_match_bus(parent); +> > > > =20 +> > > > -=09/* Cound address cells & copy address locally */ +> > > > +=09/* Count address cells & copy address locally */ +> > > > =09bus->count_cells(dev, &na, &ns); +> > > > =09if (!OF_CHECK_COUNTS(na, ns)) { +> > > > =09=09printk(KERN_ERR "prom_parse: Bad cell count for %s\n", +> > >=20 > > > This is really minor, but it should still go into a separate patch. -> > > -> > > > diff --git a/include/linux/of_address.h b/include/linux/of_address.h +> > >=20 +> > > > diff --git a/include/linux/of_address.h b/include/linux/of_address.= +h > > > > index 01b925a..4582b20 100644 > > > > --- a/include/linux/of_address.h > > > > +++ b/include/linux/of_address.h -> > > > @@ -26,6 +26,8 @@ static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; } +> > > > @@ -26,6 +26,8 @@ static inline unsigned long pci_address_to_pio(ph= +ys_addr_t addr) { return -1; } > > > > #define pci_address_to_pio pci_address_to_pio > > > > #endif -> > > > +> > > > =20 > > > > +const __be32 *of_pci_process_ranges(struct device_node *node, -> > > > + struct resource *res, const __be32 *from); +> > > > +=09=09=09=09 struct resource *res, const __be32 *from); > > > > #else /* CONFIG_OF_ADDRESS */ -> > > > static inline int of_address_to_resource(struct device_node *dev, int index, -> > > > struct resource *r) -> > > > @@ -48,6 +50,11 @@ static inline const u32 *of_get_address(struct device_node *dev, int index, +> > > > static inline int of_address_to_resource(struct device_node *dev, = +int index, +> > > > =09=09=09=09=09 struct resource *r) +> > > > @@ -48,6 +50,11 @@ static inline const u32 *of_get_address(struct d= +evice_node *dev, int index, > > > > { -> > > > return NULL; +> > > > =09return NULL; > > > > } > > > > +const __be32 *of_pci_process_ranges(struct device_node *node, -> > > +> > >=20 > > > There should be a blank line to separate the above two lines. -> > > -> > +> > >=20 +> >=20 > > Thanks for the feedback. -> > -> > I will send another patch for the typo and leave this patch with you for +> >=20 +> > I will send another patch for the typo and leave this patch with you fo= +r > > working into your existing series. -> +>=20 > I suppose you have your own series that uses this patch? -Not yet, it may be some time before I submit my PCI host bridge driver. Though -I am making changes else where (e.g. this patch) which I'm hoping to submit as +Not yet, it may be some time before I submit my PCI host bridge driver. Tho= +ugh +I am making changes else where (e.g. this patch) which I'm hoping to submit= + as early as possible. I can rebase my work for these upstream dependencies. I can re-spin this patch with your suggested changes if you prefer? diff --git a/a/content_digest b/N1/content_digest index 47651c2..9eb1461 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,77 +6,84 @@ "Subject\0Re: [PATCH] pci: Provide support for parsing PCI DT ranges property\0" "Date\0Thu, 13 Dec 2012 10:34:12 +0000\0" "To\0Thierry Reding <thierry.reding@avionic-design.de>\0" - "Cc\0linux-pci@vger.kernel.org <linux-pci@vger.kernel.org>" - Grant Likely <grant.likely@secretlab.ca> - Michal Simek <monstr@monstr.eu> - Rob Herring <robherring2@gmail.com> + "Cc\0Michal Simek <monstr@monstr.eu>" + linux-pci@vger.kernel.org <linux-pci@vger.kernel.org> devicetree-discuss <devicetree-discuss@lists.ozlabs.org> + Liviu Dudau <Liviu.Dudau@arm.com> rob.herring@calxeda.com <rob.herring@calxeda.com> - linuxppc-dev <linuxppc-dev@lists.ozlabs.org> - Benjamin Herrenschmidt <benh@kernel.crashing.org> - " Liviu Dudau <Liviu.Dudau@arm.com>\0" + Rob Herring <robherring2@gmail.com> + " linuxppc-dev <linuxppc-dev@lists.ozlabs.org>\0" "\00:1\0" "b\0" "On Thu, Dec 13, 2012 at 10:03:18AM +0000, Thierry Reding wrote:\n" "> On Thu, Dec 13, 2012 at 09:45:43AM +0000, Andrew Murray wrote:\n" "> > On Thu, Dec 13, 2012 at 09:13:33AM +0000, Thierry Reding wrote:\n" "> > > Hi Andrew,\n" - "> > > \n" + "> > >=20\n" "> > > I don't like iterator interfaces too much, but I can live with that.\n" - "> > > Other than that the patch looks good to me and I'll try to work it into\n" + "> > > Other than that the patch looks good to me and I'll try to work it in=\n" + "to\n" "> > > my Tegra PCIe patch series.\n" - "> > > \n" + "> > >=20\n" "> > > Just two minor comments below.\n" - "> > > \n" + "> > >=20\n" "> > > > diff --git a/drivers/of/address.c b/drivers/of/address.c\n" "> > > [...]\n" - "> > > > @@ -421,7 +472,7 @@ u64 __of_translate_address(struct device_node *dev, const __be32 *in_addr,\n" - "> > > > \t\tgoto bail;\n" - "> > > > \tbus = of_match_bus(parent);\n" - "> > > > \n" - "> > > > -\t/* Cound address cells & copy address locally */\n" - "> > > > +\t/* Count address cells & copy address locally */\n" - "> > > > \tbus->count_cells(dev, &na, &ns);\n" - "> > > > \tif (!OF_CHECK_COUNTS(na, ns)) {\n" - "> > > > \t\tprintk(KERN_ERR \"prom_parse: Bad cell count for %s\\n\",\n" - "> > > \n" + "> > > > @@ -421,7 +472,7 @@ u64 __of_translate_address(struct device_node *=\n" + "dev, const __be32 *in_addr,\n" + "> > > > =09=09goto bail;\n" + "> > > > =09bus =3D of_match_bus(parent);\n" + "> > > > =20\n" + "> > > > -=09/* Cound address cells & copy address locally */\n" + "> > > > +=09/* Count address cells & copy address locally */\n" + "> > > > =09bus->count_cells(dev, &na, &ns);\n" + "> > > > =09if (!OF_CHECK_COUNTS(na, ns)) {\n" + "> > > > =09=09printk(KERN_ERR \"prom_parse: Bad cell count for %s\\n\",\n" + "> > >=20\n" "> > > This is really minor, but it should still go into a separate patch.\n" - "> > > \n" - "> > > > diff --git a/include/linux/of_address.h b/include/linux/of_address.h\n" + "> > >=20\n" + "> > > > diff --git a/include/linux/of_address.h b/include/linux/of_address.=\n" + "h\n" "> > > > index 01b925a..4582b20 100644\n" "> > > > --- a/include/linux/of_address.h\n" "> > > > +++ b/include/linux/of_address.h\n" - "> > > > @@ -26,6 +26,8 @@ static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; }\n" + "> > > > @@ -26,6 +26,8 @@ static inline unsigned long pci_address_to_pio(ph=\n" + "ys_addr_t addr) { return -1; }\n" "> > > > #define pci_address_to_pio pci_address_to_pio\n" "> > > > #endif\n" - "> > > > \n" + "> > > > =20\n" "> > > > +const __be32 *of_pci_process_ranges(struct device_node *node,\n" - "> > > > +\t\t\t\t struct resource *res, const __be32 *from);\n" + "> > > > +=09=09=09=09 struct resource *res, const __be32 *from);\n" "> > > > #else /* CONFIG_OF_ADDRESS */\n" - "> > > > static inline int of_address_to_resource(struct device_node *dev, int index,\n" - "> > > > \t\t\t\t\t struct resource *r)\n" - "> > > > @@ -48,6 +50,11 @@ static inline const u32 *of_get_address(struct device_node *dev, int index,\n" + "> > > > static inline int of_address_to_resource(struct device_node *dev, =\n" + "int index,\n" + "> > > > =09=09=09=09=09 struct resource *r)\n" + "> > > > @@ -48,6 +50,11 @@ static inline const u32 *of_get_address(struct d=\n" + "evice_node *dev, int index,\n" "> > > > {\n" - "> > > > \treturn NULL;\n" + "> > > > =09return NULL;\n" "> > > > }\n" "> > > > +const __be32 *of_pci_process_ranges(struct device_node *node,\n" - "> > > \n" + "> > >=20\n" "> > > There should be a blank line to separate the above two lines.\n" - "> > > \n" - "> > \n" + "> > >=20\n" + "> >=20\n" "> > Thanks for the feedback.\n" - "> > \n" - "> > I will send another patch for the typo and leave this patch with you for\n" + "> >=20\n" + "> > I will send another patch for the typo and leave this patch with you fo=\n" + "r\n" "> > working into your existing series.\n" - "> \n" + ">=20\n" "> I suppose you have your own series that uses this patch?\n" "\n" - "Not yet, it may be some time before I submit my PCI host bridge driver. Though\n" - "I am making changes else where (e.g. this patch) which I'm hoping to submit as\n" + "Not yet, it may be some time before I submit my PCI host bridge driver. Tho=\n" + "ugh\n" + "I am making changes else where (e.g. this patch) which I'm hoping to submit=\n" + " as\n" "early as possible. I can rebase my work for these upstream dependencies.\n" "\n" "I can re-spin this patch with your suggested changes if you prefer?\n" "\n" Andrew Murray -5a12d54681202ed265727c39d66e6d0a6cd8f50462aede8ffa7e02289ea49269 +977c0000d7825b70256ce33b4ff56c020e71296ffc89dca943e966c088bd610b
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.