diff for duplicates of <1455549246.31169.125.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 0d4c374..5eac5aa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,8 +23,8 @@ Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Russell King <linux@arm.linux.org.uk> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- -> drivers/mfd/intel_quark_i2c_gpio.c | 26 +++++++++----------------- -> 1 file changed, 9 insertions(+), 17 deletions(-) +> ?drivers/mfd/intel_quark_i2c_gpio.c | 26 +++++++++----------------- +> ?1 file changed, 9 insertions(+), 17 deletions(-) > > diff --git a/drivers/mfd/intel_quark_i2c_gpio.c > b/drivers/mfd/intel_quark_i2c_gpio.c @@ -32,48 +32,48 @@ Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- a/drivers/mfd/intel_quark_i2c_gpio.c > +++ b/drivers/mfd/intel_quark_i2c_gpio.c > @@ -52,8 +52,6 @@ -> /* The Quark I2C controller source clock */ -> #define INTEL_QUARK_I2C_CLK_HZ 33000000 -> +> ?/* The Quark I2C controller source clock */ +> ?#define INTEL_QUARK_I2C_CLK_HZ 33000000 +> ? > -#define INTEL_QUARK_I2C_NCLK 1 > - -> struct intel_quark_mfd { -> struct pci_dev *pdev; -> struct clk *i2c_clk; +> ?struct intel_quark_mfd { +> ? struct pci_dev *pdev; +> ? struct clk *i2c_clk; > @@ -128,30 +126,24 @@ MODULE_DEVICE_TABLE(pci, intel_quark_mfd_ids); -> static int intel_quark_register_i2c_clk(struct intel_quark_mfd +> ?static int intel_quark_register_i2c_clk(struct intel_quark_mfd > *quark_mfd) -> { -> struct pci_dev *pdev = quark_mfd->pdev; +> ?{ +> ? struct pci_dev *pdev = quark_mfd->pdev; > - struct clk_lookup *i2c_clk_lookup; -> struct clk *i2c_clk; +> ? struct clk *i2c_clk; > - int ret; > - > - i2c_clk_lookup = devm_kcalloc(&pdev->dev, > INTEL_QUARK_I2C_NCLK, -> - sizeof(*i2c_clk_lookup), +> - ??????sizeof(*i2c_clk_lookup), > GFP_KERNEL); > - if (!i2c_clk_lookup) > - return -ENOMEM; > - > - i2c_clk_lookup[0].dev_id = INTEL_QUARK_I2C_CONTROLLER_CLK; -> -> i2c_clk = clk_register_fixed_rate(&pdev->dev, -> INTEL_QUARK_I2C_CONTROLLER +> ? +> ? i2c_clk = clk_register_fixed_rate(&pdev->dev, +> ? ??INTEL_QUARK_I2C_CONTROLLER > _CLK, NULL, -> CLK_IS_ROOT, +> ? ??CLK_IS_ROOT, > INTEL_QUARK_I2C_CLK_HZ); > + if (IS_ERR(i2c_clk)) > + return PTR_ERR(i2c_clk); -> +> ? > - quark_mfd->i2c_clk_lookup = i2c_clk_lookup; -> quark_mfd->i2c_clk = i2c_clk; +> ? quark_mfd->i2c_clk = i2c_clk; > + quark_mfd->i2c_clk_lookup = clkdev_create(i2c_clk, NULL, > + INTEL_QUARK_I2C_CONT > ROLLER_CLK); -> +> ? > - ret = clk_register_clkdevs(i2c_clk, i2c_clk_lookup, -> - INTEL_QUARK_I2C_NCLK); +> - ???INTEL_QUARK_I2C_NCLK); > - if (ret) > - dev_err(&pdev->dev, "Fixed clk register failed: > %d\n", ret); @@ -81,12 +81,12 @@ Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > + dev_err(&pdev->dev, "Fixed clk register failed\n"); > + return -ENOMEM; > + } -> +> ? > - return ret; > + return 0; -> } -> -> static void intel_quark_unregister_i2c_clk(struct pci_dev *pdev) +> ?} +> ? +> ?static void intel_quark_unregister_i2c_clk(struct pci_dev *pdev) -- Andy Shevchenko <andriy.shevchenko@linux.intel.com> diff --git a/a/content_digest b/N1/content_digest index d016b2b..b8276b7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,9 @@ "ref\01454982341-22715-1-git-send-email-sboyd@codeaurora.org\0" "ref\01454982341-22715-2-git-send-email-sboyd@codeaurora.org\0" - "From\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" - "Subject\0Re: [PATCH 01/14] mfd: intel_quark_i2c_gpio: Use clkdev_create()\0" + "From\0andriy.shevchenko@linux.intel.com (Andy Shevchenko)\0" + "Subject\0[PATCH 01/14] mfd: intel_quark_i2c_gpio: Use clkdev_create()\0" "Date\0Mon, 15 Feb 2016 17:14:06 +0200\0" - "To\0Stephen Boyd <sboyd@codeaurora.org>" - " Mike Turquette <mturquette@baylibre.com>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-clk@vger.kernel.org - linux-arm-kernel@lists.infradead.org - Lee Jones <lee.jones@linaro.org> - " Russell King <linux@arm.linux.org.uk>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, 2016-02-08 at 17:45 -0800, Stephen Boyd wrote:\n" @@ -37,8 +31,8 @@ "> Cc: Russell King <linux@arm.linux.org.uk>\n" "> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>\n" "> ---\n" - "> \302\240drivers/mfd/intel_quark_i2c_gpio.c | 26 +++++++++-----------------\n" - "> \302\2401 file changed, 9 insertions(+), 17 deletions(-)\n" + "> ?drivers/mfd/intel_quark_i2c_gpio.c | 26 +++++++++-----------------\n" + "> ?1 file changed, 9 insertions(+), 17 deletions(-)\n" "> \n" "> diff --git a/drivers/mfd/intel_quark_i2c_gpio.c\n" "> b/drivers/mfd/intel_quark_i2c_gpio.c\n" @@ -46,48 +40,48 @@ "> --- a/drivers/mfd/intel_quark_i2c_gpio.c\n" "> +++ b/drivers/mfd/intel_quark_i2c_gpio.c\n" "> @@ -52,8 +52,6 @@\n" - "> \302\240/* The Quark I2C controller source clock */\n" - "> \302\240#define INTEL_QUARK_I2C_CLK_HZ\t33000000\n" - "> \302\240\n" + "> ?/* The Quark I2C controller source clock */\n" + "> ?#define INTEL_QUARK_I2C_CLK_HZ\t33000000\n" + "> ?\n" "> -#define INTEL_QUARK_I2C_NCLK\t1\n" "> -\n" - "> \302\240struct intel_quark_mfd {\n" - "> \302\240\tstruct pci_dev\t\t*pdev;\n" - "> \302\240\tstruct clk\t\t*i2c_clk;\n" + "> ?struct intel_quark_mfd {\n" + "> ?\tstruct pci_dev\t\t*pdev;\n" + "> ?\tstruct clk\t\t*i2c_clk;\n" "> @@ -128,30 +126,24 @@ MODULE_DEVICE_TABLE(pci, intel_quark_mfd_ids);\n" - "> \302\240static int intel_quark_register_i2c_clk(struct intel_quark_mfd\n" + "> ?static int intel_quark_register_i2c_clk(struct intel_quark_mfd\n" "> *quark_mfd)\n" - "> \302\240{\n" - "> \302\240\tstruct pci_dev *pdev = quark_mfd->pdev;\n" + "> ?{\n" + "> ?\tstruct pci_dev *pdev = quark_mfd->pdev;\n" "> -\tstruct clk_lookup *i2c_clk_lookup;\n" - "> \302\240\tstruct clk *i2c_clk;\n" + "> ?\tstruct clk *i2c_clk;\n" "> -\tint ret;\n" "> -\n" "> -\ti2c_clk_lookup = devm_kcalloc(&pdev->dev,\n" "> INTEL_QUARK_I2C_NCLK,\n" - "> -\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240sizeof(*i2c_clk_lookup),\n" + "> -\t\t\t\t??????sizeof(*i2c_clk_lookup),\n" "> GFP_KERNEL);\n" "> -\tif (!i2c_clk_lookup)\n" "> -\t\treturn -ENOMEM;\n" "> -\n" "> -\ti2c_clk_lookup[0].dev_id = INTEL_QUARK_I2C_CONTROLLER_CLK;\n" - "> \302\240\n" - "> \302\240\ti2c_clk = clk_register_fixed_rate(&pdev->dev,\n" - "> \302\240\t\t\t\t\t\302\240\302\240INTEL_QUARK_I2C_CONTROLLER\n" + "> ?\n" + "> ?\ti2c_clk = clk_register_fixed_rate(&pdev->dev,\n" + "> ?\t\t\t\t\t??INTEL_QUARK_I2C_CONTROLLER\n" "> _CLK, NULL,\n" - "> \302\240\t\t\t\t\t\302\240\302\240CLK_IS_ROOT,\n" + "> ?\t\t\t\t\t??CLK_IS_ROOT,\n" "> INTEL_QUARK_I2C_CLK_HZ);\n" "> +\tif (IS_ERR(i2c_clk))\n" "> +\t\treturn PTR_ERR(i2c_clk);\n" - "> \302\240\n" + "> ?\n" "> -\tquark_mfd->i2c_clk_lookup = i2c_clk_lookup;\n" - "> \302\240\tquark_mfd->i2c_clk = i2c_clk;\n" + "> ?\tquark_mfd->i2c_clk = i2c_clk;\n" "> +\tquark_mfd->i2c_clk_lookup = clkdev_create(i2c_clk, NULL,\n" "> +\t\t\t\t\t\tINTEL_QUARK_I2C_CONT\n" "> ROLLER_CLK);\n" - "> \302\240\n" + "> ?\n" "> -\tret = clk_register_clkdevs(i2c_clk, i2c_clk_lookup,\n" - "> -\t\t\t\t\302\240\302\240\302\240INTEL_QUARK_I2C_NCLK);\n" + "> -\t\t\t\t???INTEL_QUARK_I2C_NCLK);\n" "> -\tif (ret)\n" "> -\t\tdev_err(&pdev->dev, \"Fixed clk register failed:\n" "> %d\\n\", ret);\n" @@ -95,15 +89,15 @@ "> +\t\tdev_err(&pdev->dev, \"Fixed clk register failed\\n\");\n" "> +\t\treturn -ENOMEM;\n" "> +\t}\n" - "> \302\240\n" + "> ?\n" "> -\treturn ret;\n" "> +\treturn 0;\n" - "> \302\240}\n" - "> \302\240\n" - "> \302\240static void intel_quark_unregister_i2c_clk(struct pci_dev *pdev)\n" + "> ?}\n" + "> ?\n" + "> ?static void intel_quark_unregister_i2c_clk(struct pci_dev *pdev)\n" "\n" "-- \n" "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" Intel Finland Oy -98af813f0edbe9d65b55b125bd525ec504e649060d33804b28a785e66f76fad0 +6ea7b151197b34b8032261aa91187ab654fe2049c02cc46a7f747ba900c416e0
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.