diff for duplicates of <1488964055.2514.3.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 626fbf8..9324747 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,8 +4,8 @@ On Wed, 2017-03-08 at 07:43 +0100, Heiner Kallweit wrote: > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- -> ?drivers/i2c/busses/i2c-meson.c | 13 ++++++------- -> ?1 file changed, 6 insertions(+), 7 deletions(-) +> drivers/i2c/busses/i2c-meson.c | 13 ++++++------- +> 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c- > meson.c @@ -13,44 +13,44 @@ On Wed, 2017-03-08 at 07:43 +0100, Heiner Kallweit wrote: > --- a/drivers/i2c/busses/i2c-meson.c > +++ b/drivers/i2c/busses/i2c-meson.c > @@ -82,7 +82,6 @@ struct meson_i2c { -> ? struct device *dev; -> ? void __iomem *regs; -> ? struct clk *clk; +> struct device *dev; +> void __iomem *regs; +> struct clk *clk; > - int irq; -> ? -> ? struct i2c_msg *msg; -> ? int state; +> +> struct i2c_msg *msg; +> int state; > @@ -391,7 +390,7 @@ static int meson_i2c_probe(struct platform_device > *pdev) -> ? struct device_node *np = pdev->dev.of_node; -> ? struct meson_i2c *i2c; -> ? struct resource *mem; +> struct device_node *np = pdev->dev.of_node; +> struct meson_i2c *i2c; +> struct resource *mem; > - int ret = 0; > + int irq, ret = 0; -> ? -> ? i2c = devm_kzalloc(&pdev->dev, sizeof(struct meson_i2c), +> +> i2c = devm_kzalloc(&pdev->dev, sizeof(struct meson_i2c), > GFP_KERNEL); -> ? if (!i2c) +> if (!i2c) > @@ -418,14 +417,14 @@ static int meson_i2c_probe(struct > platform_device *pdev) -> ? if (IS_ERR(i2c->regs)) -> ? return PTR_ERR(i2c->regs); -> ? +> if (IS_ERR(i2c->regs)) +> return PTR_ERR(i2c->regs); +> > - i2c->irq = platform_get_irq(pdev, 0); > - if (i2c->irq < 0) { > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { -> ? dev_err(&pdev->dev, "can't find IRQ\n"); +> dev_err(&pdev->dev, "can't find IRQ\n"); > - return i2c->irq; > + return irq; -> ? } -> ? +> } +> > - ret = devm_request_irq(&pdev->dev, i2c->irq, meson_i2c_irq, -> - ???????0, dev_name(&pdev->dev), i2c); +> - 0, dev_name(&pdev->dev), i2c); > + ret = devm_request_irq(&pdev->dev, irq, meson_i2c_irq, 0, -> + ???????dev_name(&pdev->dev), i2c); -> ? if (ret < 0) { -> ? dev_err(&pdev->dev, "can't request IRQ\n"); -> ? return ret; +> + dev_name(&pdev->dev), i2c); +> if (ret < 0) { +> dev_err(&pdev->dev, "can't request IRQ\n"); +> return ret; -Reviewed-by:?Jerome Brunet <jbrunet@baylibre.com> +Reviewed-by: Jerome Brunet <jbrunet@baylibre.com> diff --git a/a/content_digest b/N1/content_digest index e953df8..766b4c5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,12 @@ "ref\0d5f0545a-fb4c-b436-20f5-7df9d10605b1@gmail.com\0" "ref\0814868c2-af8c-23d0-db19-84d597fe713d@gmail.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH 02/12] i2c: meson: remove member irq from struct meson_i2c\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH 02/12] i2c: meson: remove member irq from struct meson_i2c\0" "Date\0Wed, 08 Mar 2017 10:07:35 +0100\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Heiner Kallweit <hkallweit1@gmail.com>" + " Wolfram Sang <wsa@the-dreams.de>\0" + "Cc\0linux-amlogic@lists.infradead.org" + " linux-i2c@vger.kernel.org <linux-i2c@vger.kernel.org>\0" "\00:1\0" "b\0" "On Wed, 2017-03-08 at 07:43 +0100, Heiner Kallweit wrote:\n" @@ -12,8 +15,8 @@ "> \n" "> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>\n" "> ---\n" - "> ?drivers/i2c/busses/i2c-meson.c | 13 ++++++-------\n" - "> ?1 file changed, 6 insertions(+), 7 deletions(-)\n" + "> \302\240drivers/i2c/busses/i2c-meson.c | 13 ++++++-------\n" + "> \302\2401 file changed, 6 insertions(+), 7 deletions(-)\n" "> \n" "> diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-\n" "> meson.c\n" @@ -21,46 +24,46 @@ "> --- a/drivers/i2c/busses/i2c-meson.c\n" "> +++ b/drivers/i2c/busses/i2c-meson.c\n" "> @@ -82,7 +82,6 @@ struct meson_i2c {\n" - "> ?\tstruct device\t\t*dev;\n" - "> ?\tvoid __iomem\t\t*regs;\n" - "> ?\tstruct clk\t\t*clk;\n" + "> \302\240\tstruct device\t\t*dev;\n" + "> \302\240\tvoid __iomem\t\t*regs;\n" + "> \302\240\tstruct clk\t\t*clk;\n" "> -\tint\t\t\tirq;\n" - "> ?\n" - "> ?\tstruct i2c_msg\t\t*msg;\n" - "> ?\tint\t\t\tstate;\n" + "> \302\240\n" + "> \302\240\tstruct i2c_msg\t\t*msg;\n" + "> \302\240\tint\t\t\tstate;\n" "> @@ -391,7 +390,7 @@ static int meson_i2c_probe(struct platform_device\n" "> *pdev)\n" - "> ?\tstruct device_node *np = pdev->dev.of_node;\n" - "> ?\tstruct meson_i2c *i2c;\n" - "> ?\tstruct resource *mem;\n" + "> \302\240\tstruct device_node *np = pdev->dev.of_node;\n" + "> \302\240\tstruct meson_i2c *i2c;\n" + "> \302\240\tstruct resource *mem;\n" "> -\tint ret = 0;\n" "> +\tint irq, ret = 0;\n" - "> ?\n" - "> ?\ti2c = devm_kzalloc(&pdev->dev, sizeof(struct meson_i2c),\n" + "> \302\240\n" + "> \302\240\ti2c = devm_kzalloc(&pdev->dev, sizeof(struct meson_i2c),\n" "> GFP_KERNEL);\n" - "> ?\tif (!i2c)\n" + "> \302\240\tif (!i2c)\n" "> @@ -418,14 +417,14 @@ static int meson_i2c_probe(struct\n" "> platform_device *pdev)\n" - "> ?\tif (IS_ERR(i2c->regs))\n" - "> ?\t\treturn PTR_ERR(i2c->regs);\n" - "> ?\n" + "> \302\240\tif (IS_ERR(i2c->regs))\n" + "> \302\240\t\treturn PTR_ERR(i2c->regs);\n" + "> \302\240\n" "> -\ti2c->irq = platform_get_irq(pdev, 0);\n" "> -\tif (i2c->irq < 0) {\n" "> +\tirq = platform_get_irq(pdev, 0);\n" "> +\tif (irq < 0) {\n" - "> ?\t\tdev_err(&pdev->dev, \"can't find IRQ\\n\");\n" + "> \302\240\t\tdev_err(&pdev->dev, \"can't find IRQ\\n\");\n" "> -\t\treturn i2c->irq;\n" "> +\t\treturn irq;\n" - "> ?\t}\n" - "> ?\n" + "> \302\240\t}\n" + "> \302\240\n" "> -\tret = devm_request_irq(&pdev->dev, i2c->irq, meson_i2c_irq,\n" - "> -\t\t\t???????0, dev_name(&pdev->dev), i2c);\n" + "> -\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\2400, dev_name(&pdev->dev), i2c);\n" "> +\tret = devm_request_irq(&pdev->dev, irq, meson_i2c_irq, 0,\n" - "> +\t\t\t???????dev_name(&pdev->dev), i2c);\n" - "> ?\tif (ret < 0) {\n" - "> ?\t\tdev_err(&pdev->dev, \"can't request IRQ\\n\");\n" - "> ?\t\treturn ret;\n" + "> +\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\240dev_name(&pdev->dev), i2c);\n" + "> \302\240\tif (ret < 0) {\n" + "> \302\240\t\tdev_err(&pdev->dev, \"can't request IRQ\\n\");\n" + "> \302\240\t\treturn ret;\n" "\n" - Reviewed-by:?Jerome Brunet <jbrunet@baylibre.com> + "Reviewed-by:\302\240Jerome Brunet <jbrunet@baylibre.com>" -c1d93e0935d8ab86dece31617f1d8663826362f39fbfe49ae3b6cedfff285bd1 +cd3ebca01d23a9af92179f70f212490ed869547ce2ce717dbf2d11a478a7241a
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.