diff for duplicates of <1461241760.6620.315.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index db9cb7a..e80da18 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,15 +26,15 @@ runtime PM change. > --- > Since v2: -> - s/clk/clock -> - describe why use pm_runtime_put_noidle() +> ?- s/clk/clock +> ?- describe why use pm_runtime_put_noidle() > > Since v1: -> - fix commit msg: "not rely on rpm" rather than "rely on rpm" -> - call i2c_dw_plat_prepare_clk after pm_rumtime_disable() +> ?- fix commit msg: "not rely on rpm" rather than "rely on rpm" +> ?- call i2c_dw_plat_prepare_clk after pm_rumtime_disable() > -> drivers/i2c/busses/i2c-designware-platdrv.c | 16 ++++++++++------ -> 1 file changed, 10 insertions(+), 6 deletions(-) +> ?drivers/i2c/busses/i2c-designware-platdrv.c | 16 ++++++++++------ +> ?1 file changed, 10 insertions(+), 6 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c > b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -43,9 +43,9 @@ runtime PM change. > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > @@ -253,8 +253,11 @@ static int dw_i2c_plat_probe(struct > platform_device *pdev) -> } -> -> r = i2c_dw_probe(dev); +> ? } +> ? +> ? r = i2c_dw_probe(dev); > - if (r && !dev->pm_runtime_disabled) > - pm_runtime_disable(&pdev->dev); > + if (r) { @@ -53,31 +53,31 @@ runtime PM change. > + pm_runtime_disable(&pdev->dev); > + i2c_dw_plat_prepare_clk(dev, false); > + } -> -> return r; -> } +> ? +> ? return r; +> ?} > @@ -264,15 +267,16 @@ static int dw_i2c_plat_remove(struct > platform_device *pdev) -> struct dw_i2c_dev *dev = platform_get_drvdata(pdev); -> -> pm_runtime_get_sync(&pdev->dev); +> ? struct dw_i2c_dev *dev = platform_get_drvdata(pdev); +> ? +> ? pm_runtime_get_sync(&pdev->dev); > + pm_runtime_dont_use_autosuspend(&pdev->dev); > + if (!dev->pm_runtime_disabled) > + pm_runtime_disable(&pdev->dev); > + pm_runtime_put_noidle(&pdev->dev); -> -> i2c_del_adapter(&dev->adapter); -> -> i2c_dw_disable(dev); -> +> ? +> ? i2c_del_adapter(&dev->adapter); +> ? +> ? i2c_dw_disable(dev); +> ? > - pm_runtime_dont_use_autosuspend(&pdev->dev); > - pm_runtime_put_sync(&pdev->dev); > - if (!dev->pm_runtime_disabled) > - pm_runtime_disable(&pdev->dev); > + i2c_dw_plat_prepare_clk(dev, false); -> -> return 0; -> } +> ? +> ? return 0; +> ?} -- Andy Shevchenko <andriy.shevchenko@linux.intel.com> diff --git a/a/content_digest b/N1/content_digest index f0d577e..d9045e4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,8 @@ "ref\01461237767-7928-1-git-send-email-jszhang@marvell.com\0" - "From\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" - "Subject\0Re: [PATCH v3] i2c: designware-platdrv: fix unbalanced clk enable and prepare\0" + "From\0andriy.shevchenko@linux.intel.com (Andy Shevchenko)\0" + "Subject\0[PATCH v3] i2c: designware-platdrv: fix unbalanced clk enable and prepare\0" "Date\0Thu, 21 Apr 2016 15:29:20 +0300\0" - "To\0Jisheng Zhang <jszhang@marvell.com>" - jarkko.nikula@linux.intel.com - mika.westerberg@linux.intel.com - " wsa@the-dreams.de\0" - "Cc\0linux-i2c@vger.kernel.org" - linux-kernel@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, 2016-04-21 at 19:22 +0800, Jisheng Zhang wrote:\n" @@ -39,15 +33,15 @@ "\n" "> ---\n" "> Since v2:\n" - "> \302\240- s/clk/clock\n" - "> \302\240- describe why use pm_runtime_put_noidle()\n" + "> ?- s/clk/clock\n" + "> ?- describe why use pm_runtime_put_noidle()\n" "> \n" "> Since v1:\n" - "> \302\240- fix commit msg: \"not rely on rpm\" rather than \"rely on rpm\"\n" - "> \302\240- call i2c_dw_plat_prepare_clk after pm_rumtime_disable()\n" + "> ?- fix commit msg: \"not rely on rpm\" rather than \"rely on rpm\"\n" + "> ?- call i2c_dw_plat_prepare_clk after pm_rumtime_disable()\n" "> \n" - "> \302\240drivers/i2c/busses/i2c-designware-platdrv.c | 16 ++++++++++------\n" - "> \302\2401 file changed, 10 insertions(+), 6 deletions(-)\n" + "> ?drivers/i2c/busses/i2c-designware-platdrv.c | 16 ++++++++++------\n" + "> ?1 file changed, 10 insertions(+), 6 deletions(-)\n" "> \n" "> diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c\n" "> b/drivers/i2c/busses/i2c-designware-platdrv.c\n" @@ -56,9 +50,9 @@ "> +++ b/drivers/i2c/busses/i2c-designware-platdrv.c\n" "> @@ -253,8 +253,11 @@ static int dw_i2c_plat_probe(struct\n" "> platform_device *pdev)\n" - "> \302\240\t}\n" - "> \302\240\n" - "> \302\240\tr = i2c_dw_probe(dev);\n" + "> ?\t}\n" + "> ?\n" + "> ?\tr = i2c_dw_probe(dev);\n" "> -\tif (r && !dev->pm_runtime_disabled)\n" "> -\t\tpm_runtime_disable(&pdev->dev);\n" "> +\tif (r) {\n" @@ -66,34 +60,34 @@ "> +\t\t\tpm_runtime_disable(&pdev->dev);\n" "> +\t\ti2c_dw_plat_prepare_clk(dev, false);\n" "> +\t}\n" - "> \302\240\n" - "> \302\240\treturn r;\n" - "> \302\240}\n" + "> ?\n" + "> ?\treturn r;\n" + "> ?}\n" "> @@ -264,15 +267,16 @@ static int dw_i2c_plat_remove(struct\n" "> platform_device *pdev)\n" - "> \302\240\tstruct dw_i2c_dev *dev = platform_get_drvdata(pdev);\n" - "> \302\240\n" - "> \302\240\tpm_runtime_get_sync(&pdev->dev);\n" + "> ?\tstruct dw_i2c_dev *dev = platform_get_drvdata(pdev);\n" + "> ?\n" + "> ?\tpm_runtime_get_sync(&pdev->dev);\n" "> +\tpm_runtime_dont_use_autosuspend(&pdev->dev);\n" "> +\tif (!dev->pm_runtime_disabled)\n" "> +\t\tpm_runtime_disable(&pdev->dev);\n" "> +\tpm_runtime_put_noidle(&pdev->dev);\n" - "> \302\240\n" - "> \302\240\ti2c_del_adapter(&dev->adapter);\n" - "> \302\240\n" - "> \302\240\ti2c_dw_disable(dev);\n" - "> \302\240\n" + "> ?\n" + "> ?\ti2c_del_adapter(&dev->adapter);\n" + "> ?\n" + "> ?\ti2c_dw_disable(dev);\n" + "> ?\n" "> -\tpm_runtime_dont_use_autosuspend(&pdev->dev);\n" "> -\tpm_runtime_put_sync(&pdev->dev);\n" "> -\tif (!dev->pm_runtime_disabled)\n" "> -\t\tpm_runtime_disable(&pdev->dev);\n" "> +\ti2c_dw_plat_prepare_clk(dev, false);\n" - "> \302\240\n" - "> \302\240\treturn 0;\n" - "> \302\240}\n" + "> ?\n" + "> ?\treturn 0;\n" + "> ?}\n" "\n" "-- \n" "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" Intel Finland Oy -28356c4157dede8187eccd98d4550131136b7f039bb86f5233d1eb940f8b5001 +fa616997b2c4aeee8834b0f8cf5302b808e4001a3b9228ad621089689201a08f
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.