diff for duplicates of <4D52F73A.4010707@bluewatersys.com> diff --git a/a/1.txt b/N1/1.txt index ba4b7c8..b1aae90 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -112,7 +112,7 @@ Couple more comments below. > + int ret = 0; > + > + mutex_lock(&clk->prepare_lock); -> + if (clk->prepare_count = 0 && clk->ops->prepare) +> + if (clk->prepare_count == 0 && clk->ops->prepare) > + ret = clk->ops->prepare(clk); > + > + if (!ret) @@ -127,9 +127,9 @@ Couple more comments below. > +{ > + mutex_lock(&clk->prepare_lock); > + -> + WARN_ON(clk->prepare_count = 0); +> + WARN_ON(clk->prepare_count == 0); > + -> + if (--clk->prepare_count = 0 && clk->ops->unprepare) +> + if (--clk->prepare_count == 0 && clk->ops->unprepare) > + clk->ops->unprepare(clk); > + > + mutex_unlock(&clk->prepare_lock); @@ -143,9 +143,9 @@ Couple more comments below. > + > + spin_lock_irqsave(&clk->enable_lock, flags); - WARN_ON(clk->prepare_count = 0); ? + WARN_ON(clk->prepare_count == 0); ? -> + if (clk->enable_count = 0 && clk->ops->enable) +> + if (clk->enable_count == 0 && clk->ops->enable) > + ret = clk->ops->enable(clk); Does it make sense to have a clock with no enable function which still @@ -172,9 +172,9 @@ can just supply empty functions. > + > + spin_lock_irqsave(&clk->enable_lock, flags); > + -> + WARN_ON(clk->enable_count = 0); +> + WARN_ON(clk->enable_count == 0); > + -> + if (!--clk->enable_count = 0 && clk->ops->disable) +> + if (!--clk->enable_count == 0 && clk->ops->disable) > + clk->ops->disable(clk); > + > + spin_unlock_irqrestore(&clk->enable_lock, flags); @@ -482,7 +482,7 @@ Typo "possbly". > * @clk: clock source > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ @@ -491,7 +491,7 @@ Typo "possbly". Bluewater Systems Ltd - ARM Technology Solution Centre Ryan Mallon 5 Amuri Park, 404 Barbadoes St -ryan@bluewatersys.com PO Box 13 889, Christchurch 8013 +ryan at bluewatersys.com PO Box 13 889, Christchurch 8013 http://www.bluewatersys.com New Zealand Phone: +64 3 3779127 Freecall: Australia 1800 148 751 Fax: +64 3 3779135 USA 1800 261 2934 diff --git a/a/content_digest b/N1/content_digest index 989d78c..9acca44 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01297233693.242364.862698430999.1.gpush@pororo\0" - "From\0Ryan Mallon <ryan@bluewatersys.com>\0" - "Subject\0Re: [RFC,PATCH 1/3] Add a common struct clk\0" - "Date\0Wed, 09 Feb 2011 20:21:14 +0000\0" + "From\0ryan@bluewatersys.com (Ryan Mallon)\0" + "Subject\0[RFC,PATCH 1/3] Add a common struct clk\0" + "Date\0Thu, 10 Feb 2011 09:21:14 +1300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -119,7 +119,7 @@ "> +\tint ret = 0;\n" "> +\n" "> +\tmutex_lock(&clk->prepare_lock);\n" - "> +\tif (clk->prepare_count = 0 && clk->ops->prepare)\n" + "> +\tif (clk->prepare_count == 0 && clk->ops->prepare)\n" "> +\t\tret = clk->ops->prepare(clk);\n" "> +\n" "> +\tif (!ret)\n" @@ -134,9 +134,9 @@ "> +{\n" "> +\tmutex_lock(&clk->prepare_lock);\n" "> +\n" - "> +\tWARN_ON(clk->prepare_count = 0);\n" + "> +\tWARN_ON(clk->prepare_count == 0);\n" "> +\n" - "> +\tif (--clk->prepare_count = 0 && clk->ops->unprepare)\n" + "> +\tif (--clk->prepare_count == 0 && clk->ops->unprepare)\n" "> +\t\tclk->ops->unprepare(clk);\n" "> +\n" "> +\tmutex_unlock(&clk->prepare_lock);\n" @@ -150,9 +150,9 @@ "> +\n" "> +\tspin_lock_irqsave(&clk->enable_lock, flags);\n" "\n" - "\tWARN_ON(clk->prepare_count = 0); ?\n" + "\tWARN_ON(clk->prepare_count == 0); ?\n" "\n" - "> +\tif (clk->enable_count = 0 && clk->ops->enable)\n" + "> +\tif (clk->enable_count == 0 && clk->ops->enable)\n" "> +\t\tret = clk->ops->enable(clk);\n" "\n" "Does it make sense to have a clock with no enable function which still\n" @@ -179,9 +179,9 @@ "> +\n" "> +\tspin_lock_irqsave(&clk->enable_lock, flags);\n" "> +\n" - "> +\tWARN_ON(clk->enable_count = 0);\n" + "> +\tWARN_ON(clk->enable_count == 0);\n" "> +\n" - "> +\tif (!--clk->enable_count = 0 && clk->ops->disable)\n" + "> +\tif (!--clk->enable_count == 0 && clk->ops->disable)\n" "> +\t\tclk->ops->disable(clk);\n" "> +\n" "> +\tspin_unlock_irqrestore(&clk->enable_lock, flags);\n" @@ -489,7 +489,7 @@ "> * @clk: clock source\n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-kernel\" in\n" - "> the body of a message to majordomo@vger.kernel.org\n" + "> the body of a message to majordomo at vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" "> Please read the FAQ at http://www.tux.org/lkml/\n" "\n" @@ -498,9 +498,9 @@ "Bluewater Systems Ltd - ARM Technology Solution Centre\n" "\n" "Ryan Mallon \t\t5 Amuri Park, 404 Barbadoes St\n" - "ryan@bluewatersys.com \tPO Box 13 889, Christchurch 8013\n" + "ryan at bluewatersys.com \tPO Box 13 889, Christchurch 8013\n" "http://www.bluewatersys.com\tNew Zealand\n" "Phone: +64 3 3779127\t\tFreecall: Australia 1800 148 751\n" "Fax: +64 3 3779135\t\t\t USA 1800 261 2934" -deba21d91ab421b4733bf721c589cfabb1de3f854ee67fc34c61b798cfc2ab45 +1328919fc968d49b8e62302f9a7e828cf0e29faa64b6f9480565d195bb7ddf44
diff --git a/a/1.txt b/N2/1.txt index ba4b7c8..3df2f54 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -112,7 +112,7 @@ Couple more comments below. > + int ret = 0; > + > + mutex_lock(&clk->prepare_lock); -> + if (clk->prepare_count = 0 && clk->ops->prepare) +> + if (clk->prepare_count == 0 && clk->ops->prepare) > + ret = clk->ops->prepare(clk); > + > + if (!ret) @@ -127,9 +127,9 @@ Couple more comments below. > +{ > + mutex_lock(&clk->prepare_lock); > + -> + WARN_ON(clk->prepare_count = 0); +> + WARN_ON(clk->prepare_count == 0); > + -> + if (--clk->prepare_count = 0 && clk->ops->unprepare) +> + if (--clk->prepare_count == 0 && clk->ops->unprepare) > + clk->ops->unprepare(clk); > + > + mutex_unlock(&clk->prepare_lock); @@ -143,9 +143,9 @@ Couple more comments below. > + > + spin_lock_irqsave(&clk->enable_lock, flags); - WARN_ON(clk->prepare_count = 0); ? + WARN_ON(clk->prepare_count == 0); ? -> + if (clk->enable_count = 0 && clk->ops->enable) +> + if (clk->enable_count == 0 && clk->ops->enable) > + ret = clk->ops->enable(clk); Does it make sense to have a clock with no enable function which still @@ -172,9 +172,9 @@ can just supply empty functions. > + > + spin_lock_irqsave(&clk->enable_lock, flags); > + -> + WARN_ON(clk->enable_count = 0); +> + WARN_ON(clk->enable_count == 0); > + -> + if (!--clk->enable_count = 0 && clk->ops->disable) +> + if (!--clk->enable_count == 0 && clk->ops->disable) > + clk->ops->disable(clk); > + > + spin_unlock_irqrestore(&clk->enable_lock, flags); diff --git a/a/content_digest b/N2/content_digest index 989d78c..e43a63a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,22 @@ "ref\01297233693.242364.862698430999.1.gpush@pororo\0" "From\0Ryan Mallon <ryan@bluewatersys.com>\0" "Subject\0Re: [RFC,PATCH 1/3] Add a common struct clk\0" - "Date\0Wed, 09 Feb 2011 20:21:14 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 10 Feb 2011 09:21:14 +1300\0" + "To\0Jeremy Kerr <jeremy.kerr@canonical.com>\0" + "Cc\0linux-kernel@vger.kernel.org" + linux-arm-kernel@lists.infradead.org + Nicolas Pitre <nicolas.pitre@linaro.org> + Dima Zavin <dmitriyz@google.com> + Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com> + Vincent Guittot <vincent.guittot@linaro.org> + linux-sh@vger.kernel.org + Ben Herrenschmidt <benh@kernel.crashing.org> + " Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>" + Sascha Hauer <s.hauer@pengutronix.de> + Paul Mundt <lethal@linux-sh.org> + Saravana Kannan <skannan@codeaurora.org> + Ben Dooks <ben-linux@fluff.org> + " Russell King <linux@arm.linux.org.uk>\0" "\00:1\0" "b\0" "On 02/09/2011 07:41 PM, Jeremy Kerr wrote:\n" @@ -119,7 +133,7 @@ "> +\tint ret = 0;\n" "> +\n" "> +\tmutex_lock(&clk->prepare_lock);\n" - "> +\tif (clk->prepare_count = 0 && clk->ops->prepare)\n" + "> +\tif (clk->prepare_count == 0 && clk->ops->prepare)\n" "> +\t\tret = clk->ops->prepare(clk);\n" "> +\n" "> +\tif (!ret)\n" @@ -134,9 +148,9 @@ "> +{\n" "> +\tmutex_lock(&clk->prepare_lock);\n" "> +\n" - "> +\tWARN_ON(clk->prepare_count = 0);\n" + "> +\tWARN_ON(clk->prepare_count == 0);\n" "> +\n" - "> +\tif (--clk->prepare_count = 0 && clk->ops->unprepare)\n" + "> +\tif (--clk->prepare_count == 0 && clk->ops->unprepare)\n" "> +\t\tclk->ops->unprepare(clk);\n" "> +\n" "> +\tmutex_unlock(&clk->prepare_lock);\n" @@ -150,9 +164,9 @@ "> +\n" "> +\tspin_lock_irqsave(&clk->enable_lock, flags);\n" "\n" - "\tWARN_ON(clk->prepare_count = 0); ?\n" + "\tWARN_ON(clk->prepare_count == 0); ?\n" "\n" - "> +\tif (clk->enable_count = 0 && clk->ops->enable)\n" + "> +\tif (clk->enable_count == 0 && clk->ops->enable)\n" "> +\t\tret = clk->ops->enable(clk);\n" "\n" "Does it make sense to have a clock with no enable function which still\n" @@ -179,9 +193,9 @@ "> +\n" "> +\tspin_lock_irqsave(&clk->enable_lock, flags);\n" "> +\n" - "> +\tWARN_ON(clk->enable_count = 0);\n" + "> +\tWARN_ON(clk->enable_count == 0);\n" "> +\n" - "> +\tif (!--clk->enable_count = 0 && clk->ops->disable)\n" + "> +\tif (!--clk->enable_count == 0 && clk->ops->disable)\n" "> +\t\tclk->ops->disable(clk);\n" "> +\n" "> +\tspin_unlock_irqrestore(&clk->enable_lock, flags);\n" @@ -503,4 +517,4 @@ "Phone: +64 3 3779127\t\tFreecall: Australia 1800 148 751\n" "Fax: +64 3 3779135\t\t\t USA 1800 261 2934" -deba21d91ab421b4733bf721c589cfabb1de3f854ee67fc34c61b798cfc2ab45 +9377dbc0020b398bd85b75481b1d8b12b752fde95b89d651725332e9c8896916
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.