diff for duplicates of <1447343686-2038-5-git-send-email-geert+renesas@glider.be>
diff --git a/a/1.txt b/N1/1.txt
index 85d678c..d782341 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -317,7 +317,7 @@ index 0000000000000000..e4382ba4e1e31aca
+ }
+
+ parent_name = __clk_get_name(parent);
-+ if (core->type = CLK_TYPE_FF) {
++ if (core->type == CLK_TYPE_FF) {
+ clk = clk_register_fixed_factor(NULL, core->name,
+ parent_name, 0,
+ core->mult, core->div);
@@ -382,7 +382,7 @@ index 0000000000000000..e4382ba4e1e31aca
+ init.ops = &cpg_mstp_clock_ops;
+ init.flags = CLK_IS_BASIC | CLK_SET_RATE_PARENT;
+ for (i = 0; i < info->num_crit_mod_clks; i++)
-+ if (id = info->crit_mod_clks[i]) {
++ if (id == info->crit_mod_clks[i]) {
+#ifdef CLK_ENABLE_HAND_OFF
+ dev_dbg(dev, "MSTP %s setting CLK_ENABLE_HAND_OFF\n",
+ mod->name);
@@ -437,7 +437,7 @@ index 0000000000000000..e4382ba4e1e31aca
+ switch (clkspec->args[0]) {
+ case CPG_CORE:
+ for (i = 0; i < pd->num_core_pm_clks; i++)
-+ if (clkspec->args[1] = pd->core_pm_clks[i])
++ if (clkspec->args[1] == pd->core_pm_clks[i])
+ return true;
+ return false;
+
@@ -452,7 +452,8 @@ index 0000000000000000..e4382ba4e1e31aca
+static int cpg_mssr_attach_dev(struct generic_pm_domain *genpd,
+ struct device *dev)
+{
-+ struct cpg_mssr_clk_domain *pd + container_of(genpd, struct cpg_mssr_clk_domain, genpd);
++ struct cpg_mssr_clk_domain *pd =
++ container_of(genpd, struct cpg_mssr_clk_domain, genpd);
+ struct device_node *np = dev->of_node;
+ struct of_phandle_args clkspec;
+ struct clk *clk;
diff --git a/a/content_digest b/N1/content_digest
index 4daea92..7cff9dc 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v6 4/5] clk: shmobile: Add new CPG/MSSR driver core\0"
]
[
- "Date\0Thu, 12 Nov 2015 15:54:45 +0000\0"
+ "Date\0Thu, 12 Nov 2015 16:54:45 +0100\0"
]
[
"To\0Michael Turquette <mturquette\@baylibre.com>",
@@ -349,7 +349,7 @@
"+\t\t}\n",
"+\n",
"+\t\tparent_name = __clk_get_name(parent);\n",
- "+\t\tif (core->type = CLK_TYPE_FF) {\n",
+ "+\t\tif (core->type == CLK_TYPE_FF) {\n",
"+\t\t\tclk = clk_register_fixed_factor(NULL, core->name,\n",
"+\t\t\t\t\t\t\tparent_name, 0,\n",
"+\t\t\t\t\t\t\tcore->mult, core->div);\n",
@@ -414,7 +414,7 @@
"+\tinit.ops = &cpg_mstp_clock_ops;\n",
"+\tinit.flags = CLK_IS_BASIC | CLK_SET_RATE_PARENT;\n",
"+\tfor (i = 0; i < info->num_crit_mod_clks; i++)\n",
- "+\t\tif (id = info->crit_mod_clks[i]) {\n",
+ "+\t\tif (id == info->crit_mod_clks[i]) {\n",
"+#ifdef CLK_ENABLE_HAND_OFF\n",
"+\t\t\tdev_dbg(dev, \"MSTP %s setting CLK_ENABLE_HAND_OFF\\n\",\n",
"+\t\t\t\tmod->name);\n",
@@ -469,7 +469,7 @@
"+\tswitch (clkspec->args[0]) {\n",
"+\tcase CPG_CORE:\n",
"+\t\tfor (i = 0; i < pd->num_core_pm_clks; i++)\n",
- "+\t\t\tif (clkspec->args[1] = pd->core_pm_clks[i])\n",
+ "+\t\t\tif (clkspec->args[1] == pd->core_pm_clks[i])\n",
"+\t\t\t\treturn true;\n",
"+\t\treturn false;\n",
"+\n",
@@ -484,7 +484,8 @@
"+static int cpg_mssr_attach_dev(struct generic_pm_domain *genpd,\n",
"+\t\t\t struct device *dev)\n",
"+{\n",
- "+\tstruct cpg_mssr_clk_domain *pd +\t\tcontainer_of(genpd, struct cpg_mssr_clk_domain, genpd);\n",
+ "+\tstruct cpg_mssr_clk_domain *pd =\n",
+ "+\t\tcontainer_of(genpd, struct cpg_mssr_clk_domain, genpd);\n",
"+\tstruct device_node *np = dev->of_node;\n",
"+\tstruct of_phandle_args clkspec;\n",
"+\tstruct clk *clk;\n",
@@ -800,4 +801,4 @@
"1.9.1"
]
-a3fc67ad0e513b640edbaeaad5b4b07ffef842bc851c8b6323ba4b9d1ac37c23
+daf1e9c5f106c139b75c2bf0477cc388cd3006df82abd8c795b7ac3e96b8f03e
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.