diff for duplicates of <20160121095653.GA10394@IND12F0122> diff --git a/a/1.txt b/N1/1.txt index d69eda6..2ea341b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,34 +10,30 @@ Signed-off-by: Hari Prasath Gujulan Elango <hgujulan@visteon.com> drivers/staging/iio/adc/spear_adc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/adc/= -spear_adc.c +diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/adc/spear_adc.c index 712cae0..4ac0f54 100644 --- a/drivers/staging/iio/adc/spear_adc.c +++ b/drivers/staging/iio/adc/spear_adc.c -@@ -288,7 +288,7 @@ static int spear_adc_probe(struct platform_device *pdev= -) - st->adc_base_spear3xx =3D +@@ -288,7 +288,7 @@ static int spear_adc_probe(struct platform_device *pdev) + st->adc_base_spear3xx = (struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx; -=20 -- st->clk =3D clk_get(dev, NULL); -+ st->clk =3D devm_clk_get(dev, NULL); + +- st->clk = clk_get(dev, NULL); ++ st->clk = devm_clk_get(dev, NULL); if (IS_ERR(st->clk)) { dev_err(dev, "failed getting clock\n"); goto errout1; -@@ -297,7 +297,7 @@ static int spear_adc_probe(struct platform_device *pdev= -) - ret =3D clk_prepare_enable(st->clk); +@@ -297,7 +297,7 @@ static int spear_adc_probe(struct platform_device *pdev) + ret = clk_prepare_enable(st->clk); if (ret) { dev_err(dev, "failed enabling clock\n"); - goto errout2; + goto errout1; } -=20 - irq =3D platform_get_irq(pdev, 0); -@@ -356,8 +356,6 @@ static int spear_adc_probe(struct platform_device *pdev= -) -=20 + + irq = platform_get_irq(pdev, 0); +@@ -356,8 +356,6 @@ static int spear_adc_probe(struct platform_device *pdev) + errout3: clk_disable_unprepare(st->clk); -errout2: @@ -45,5 +41,5 @@ index 712cae0..4ac0f54 100644 errout1: iounmap(st->adc_base_spear6xx); return ret; ---=20 +-- 1.9.1 diff --git a/a/content_digest b/N1/content_digest index aabe0a7..4ec658b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -26,34 +26,30 @@ " drivers/staging/iio/adc/spear_adc.c | 6 ++----\n" " 1 file changed, 2 insertions(+), 4 deletions(-)\n" "\n" - "diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/adc/=\n" - "spear_adc.c\n" + "diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/adc/spear_adc.c\n" "index 712cae0..4ac0f54 100644\n" "--- a/drivers/staging/iio/adc/spear_adc.c\n" "+++ b/drivers/staging/iio/adc/spear_adc.c\n" - "@@ -288,7 +288,7 @@ static int spear_adc_probe(struct platform_device *pdev=\n" - ")\n" - " \tst->adc_base_spear3xx =3D\n" + "@@ -288,7 +288,7 @@ static int spear_adc_probe(struct platform_device *pdev)\n" + " \tst->adc_base_spear3xx =\n" " \t\t(struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx;\n" - "=20\n" - "-\tst->clk =3D clk_get(dev, NULL);\n" - "+\tst->clk =3D devm_clk_get(dev, NULL);\n" + " \n" + "-\tst->clk = clk_get(dev, NULL);\n" + "+\tst->clk = devm_clk_get(dev, NULL);\n" " \tif (IS_ERR(st->clk)) {\n" " \t\tdev_err(dev, \"failed getting clock\\n\");\n" " \t\tgoto errout1;\n" - "@@ -297,7 +297,7 @@ static int spear_adc_probe(struct platform_device *pdev=\n" - ")\n" - " \tret =3D clk_prepare_enable(st->clk);\n" + "@@ -297,7 +297,7 @@ static int spear_adc_probe(struct platform_device *pdev)\n" + " \tret = clk_prepare_enable(st->clk);\n" " \tif (ret) {\n" " \t\tdev_err(dev, \"failed enabling clock\\n\");\n" "-\t\tgoto errout2;\n" "+\t\tgoto errout1;\n" " \t}\n" - "=20\n" - " \tirq =3D platform_get_irq(pdev, 0);\n" - "@@ -356,8 +356,6 @@ static int spear_adc_probe(struct platform_device *pdev=\n" - ")\n" - "=20\n" + " \n" + " \tirq = platform_get_irq(pdev, 0);\n" + "@@ -356,8 +356,6 @@ static int spear_adc_probe(struct platform_device *pdev)\n" + " \n" " errout3:\n" " \tclk_disable_unprepare(st->clk);\n" "-errout2:\n" @@ -61,7 +57,7 @@ " errout1:\n" " \tiounmap(st->adc_base_spear6xx);\n" " \treturn ret;\n" - "--=20\n" + "-- \n" 1.9.1 -38dee6e6c3fbd88766f3e116dd0e59ae0688d6d64bfec1e299f46a31d87e5c12 +e6fc57752acf76b2393d46904cdd4a01defdbbb82395892921768589d935957a
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.