diff for duplicates of <2687390.IKNGX5KlWy@avalon> diff --git a/a/1.txt b/N1/1.txt index 7ff283c..11dad0f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,7 +7,7 @@ On Wednesday 12 June 2013 12:49:11 Grant Likely wrote: > > Add DT bindings for the gpio-rcar driver and read the device > > configuration from the DT node at probe time if available. > > -> > Cc: devicetree-discuss@lists.ozlabs.org +> > Cc: devicetree-discuss at lists.ozlabs.org > > Signed-off-by: Laurent Pinchart > > <laurent.pinchart+renesas@ideasonboard.com> > > --- @@ -54,14 +54,14 @@ that's fine with you. > > + ret = of_parse_phandle_with_args(np, "gpio-ranges", > > + "#gpio-range-cells", 0, &args); -> > + p->config.number_of_pins = ret = 0 && args.args_count = 3 +> > + p->config.number_of_pins = ret == 0 && args.args_count == 3 > > + ? args.args[2] > > + : RCAR_MAX_GPIO_PER_BANK; > > + p->config.gpio_base = -1; > > + } > > +#endif > > + -> > + if (p->config.number_of_pins = 0 || +> > + if (p->config.number_of_pins == 0 || > > + p->config.number_of_pins > RCAR_MAX_GPIO_PER_BANK) { > > + dev_warn(&p->pdev->dev, > > + "Invalid number of gpio lines %u, using %u\n", diff --git a/a/content_digest b/N1/content_digest index 1ba903a..fabc97e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01369136406-23800-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\01369136406-23800-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\020130612114911.638683E0A56@localhost\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [RFC/PATCH v2 2/2] gpio-rcar: Add DT support\0" - "Date\0Thu, 13 Jun 2013 17:08:42 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[RFC/PATCH v2 2/2] gpio-rcar: Add DT support\0" + "Date\0Thu, 13 Jun 2013 19:08:42 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -16,7 +16,7 @@ "> > Add DT bindings for the gpio-rcar driver and read the device\n" "> > configuration from the DT node at probe time if available.\n" "> > \n" - "> > Cc: devicetree-discuss@lists.ozlabs.org\n" + "> > Cc: devicetree-discuss at lists.ozlabs.org\n" "> > Signed-off-by: Laurent Pinchart\n" "> > <laurent.pinchart+renesas@ideasonboard.com>\n" "> > ---\n" @@ -63,14 +63,14 @@ "\n" "> > +\t\tret = of_parse_phandle_with_args(np, \"gpio-ranges\",\n" "> > +\t\t\t\t\"#gpio-range-cells\", 0, &args);\n" - "> > +\t\tp->config.number_of_pins = ret = 0 && args.args_count = 3\n" + "> > +\t\tp->config.number_of_pins = ret == 0 && args.args_count == 3\n" "> > +\t\t\t\t\t ? args.args[2]\n" "> > +\t\t\t\t\t : RCAR_MAX_GPIO_PER_BANK;\n" "> > +\t\tp->config.gpio_base = -1;\n" "> > +\t}\n" "> > +#endif\n" "> > +\n" - "> > +\tif (p->config.number_of_pins = 0 ||\n" + "> > +\tif (p->config.number_of_pins == 0 ||\n" "> > +\t p->config.number_of_pins > RCAR_MAX_GPIO_PER_BANK) {\n" "> > +\t\tdev_warn(&p->pdev->dev,\n" "> > +\t\t\t \"Invalid number of gpio lines %u, using %u\\n\",\n" @@ -84,4 +84,4 @@ "\n" Laurent Pinchart -2425fa4eccaa13bccd5634f5db7b94b23678244b44bbe8434cee13982a57f6c7 +3c2b0fd442db69f496eed9c02ad59c27fd868677db87c46baf0c304ff4da3563
diff --git a/a/1.txt b/N2/1.txt index 7ff283c..ffe256f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -54,14 +54,14 @@ that's fine with you. > > + ret = of_parse_phandle_with_args(np, "gpio-ranges", > > + "#gpio-range-cells", 0, &args); -> > + p->config.number_of_pins = ret = 0 && args.args_count = 3 +> > + p->config.number_of_pins = ret == 0 && args.args_count == 3 > > + ? args.args[2] > > + : RCAR_MAX_GPIO_PER_BANK; > > + p->config.gpio_base = -1; > > + } > > +#endif > > + -> > + if (p->config.number_of_pins = 0 || +> > + if (p->config.number_of_pins == 0 || > > + p->config.number_of_pins > RCAR_MAX_GPIO_PER_BANK) { > > + dev_warn(&p->pdev->dev, > > + "Invalid number of gpio lines %u, using %u\n", diff --git a/a/content_digest b/N2/content_digest index 1ba903a..3090688 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,14 @@ "ref\020130612114911.638683E0A56@localhost\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [RFC/PATCH v2 2/2] gpio-rcar: Add DT support\0" - "Date\0Thu, 13 Jun 2013 17:08:42 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 13 Jun 2013 19:08:42 +0200\0" + "To\0Grant Likely <grant.likely@secretlab.ca>\0" + "Cc\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>" + linux-sh@vger.kernel.org + Magnus Damm <damm@opensource.se> + devicetree-discuss@lists.ozlabs.org + linux-arm-kernel@lists.infradead.org + " Guennadi Liakhovetski <g.liakhovetski@gmx.de>\0" "\00:1\0" "b\0" "Hi Grant,\n" @@ -63,14 +69,14 @@ "\n" "> > +\t\tret = of_parse_phandle_with_args(np, \"gpio-ranges\",\n" "> > +\t\t\t\t\"#gpio-range-cells\", 0, &args);\n" - "> > +\t\tp->config.number_of_pins = ret = 0 && args.args_count = 3\n" + "> > +\t\tp->config.number_of_pins = ret == 0 && args.args_count == 3\n" "> > +\t\t\t\t\t ? args.args[2]\n" "> > +\t\t\t\t\t : RCAR_MAX_GPIO_PER_BANK;\n" "> > +\t\tp->config.gpio_base = -1;\n" "> > +\t}\n" "> > +#endif\n" "> > +\n" - "> > +\tif (p->config.number_of_pins = 0 ||\n" + "> > +\tif (p->config.number_of_pins == 0 ||\n" "> > +\t p->config.number_of_pins > RCAR_MAX_GPIO_PER_BANK) {\n" "> > +\t\tdev_warn(&p->pdev->dev,\n" "> > +\t\t\t \"Invalid number of gpio lines %u, using %u\\n\",\n" @@ -84,4 +90,4 @@ "\n" Laurent Pinchart -2425fa4eccaa13bccd5634f5db7b94b23678244b44bbe8434cee13982a57f6c7 +c261fb730ad552654ad935618b57e926b14d1d002d7a5713e11274f682f8b6a5
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.