diff for duplicates of <20150126061920.6848.22644.sendpatchset@little-apple> diff --git a/a/1.txt b/N1/1.txt index f9dbe7e..32d9012 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -251,7 +251,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> - pllc2_table_rebuild(clk); - - /* -- * If the PLL is off, mult = 1, clk->rate will be updated in +- * If the PLL is off, mult == 1, clk->rate will be updated in - * pllc2_enable(). - */ - if (__raw_readl(PLLC2CR) & (1 << 31)) @@ -296,7 +296,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> - if (idx < 0) - return idx; - -- if (rate = clk->parent->rate) +- if (rate == clk->parent->rate) - return -EINVAL; - - value = __raw_readl(PLLC2CR) & ~(0x3f << 24); @@ -318,10 +318,10 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> - - /* Search the parent */ - for (i = 0; i < clk->parent_num; i++) -- if (clk->parent_table[i] = parent) +- if (clk->parent_table[i] == parent) - break; - -- if (i = clk->parent_num) +- if (i == clk->parent_num) - return -ENODEV; - - ret = clk_reparent(clk, parent); @@ -1726,25 +1726,25 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> - - /* make bitmaps of limited number of wakeup sources */ - -- if ((mstpsr2 & (1 << 23)) = 0) /* SPU2 */ +- if ((mstpsr2 & (1 << 23)) == 0) /* SPU2 */ - msk |= 1 << 31; - -- if ((mstpsr2 & (1 << 12)) = 0) /* MFI_MFIM */ +- if ((mstpsr2 & (1 << 12)) == 0) /* MFI_MFIM */ - msk |= 1 << 21; - -- if ((mstpsr4 & (1 << 3)) = 0) /* KEYSC */ +- if ((mstpsr4 & (1 << 3)) == 0) /* KEYSC */ - msk |= 1 << 2; - -- if ((mstpsr1 & (1 << 24)) = 0) /* CMT0 */ +- if ((mstpsr1 & (1 << 24)) == 0) /* CMT0 */ - msk |= 1 << 1; - -- if ((mstpsr3 & (1 << 29)) = 0) /* CMT1 */ +- if ((mstpsr3 & (1 << 29)) == 0) /* CMT1 */ - msk |= 1 << 1; - -- if ((mstpsr4 & (1 << 0)) = 0) /* CMT2 */ +- if ((mstpsr4 & (1 << 0)) == 0) /* CMT2 */ - msk |= 1 << 1; - -- if ((mstpsr2 & (1 << 13)) = 0) /* MFI_MFIS */ +- if ((mstpsr2 & (1 << 13)) == 0) /* MFI_MFIS */ - msk2 |= 1 << 17; - - *mskp = msk; @@ -1836,7 +1836,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -#ifdef CONFIG_CPU_IDLE -static int sh7372_do_idle_core_standby(unsigned long unused) -{ -- cpu_do_idle(); /* WFI when SYSTBCR = 0x10 -> Core Standby */ +- cpu_do_idle(); /* WFI when SYSTBCR == 0x10 -> Core Standby */ - return 0; -} - diff --git a/a/content_digest b/N1/content_digest index 377b93a..dfc09d4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020150126061747.6848.9708.sendpatchset@little-apple\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 09/14 v2] ARM: shmobile: sh7372: Remove Legacy C SoC code\0" - "Date\0Mon, 26 Jan 2015 06:19:20 +0000\0" + "Date\0Mon, 26 Jan 2015 15:19:20 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -258,7 +258,7 @@ "-\tpllc2_table_rebuild(clk);\n" "-\n" "-\t/*\n" - "-\t * If the PLL is off, mult = 1, clk->rate will be updated in\n" + "-\t * If the PLL is off, mult == 1, clk->rate will be updated in\n" "-\t * pllc2_enable().\n" "-\t */\n" "-\tif (__raw_readl(PLLC2CR) & (1 << 31))\n" @@ -303,7 +303,7 @@ "-\tif (idx < 0)\n" "-\t\treturn idx;\n" "-\n" - "-\tif (rate = clk->parent->rate)\n" + "-\tif (rate == clk->parent->rate)\n" "-\t\treturn -EINVAL;\n" "-\n" "-\tvalue = __raw_readl(PLLC2CR) & ~(0x3f << 24);\n" @@ -325,10 +325,10 @@ "-\n" "-\t/* Search the parent */\n" "-\tfor (i = 0; i < clk->parent_num; i++)\n" - "-\t\tif (clk->parent_table[i] = parent)\n" + "-\t\tif (clk->parent_table[i] == parent)\n" "-\t\t\tbreak;\n" "-\n" - "-\tif (i = clk->parent_num)\n" + "-\tif (i == clk->parent_num)\n" "-\t\treturn -ENODEV;\n" "-\n" "-\tret = clk_reparent(clk, parent);\n" @@ -1733,25 +1733,25 @@ "-\n" "-\t/* make bitmaps of limited number of wakeup sources */\n" "-\n" - "-\tif ((mstpsr2 & (1 << 23)) = 0) /* SPU2 */\n" + "-\tif ((mstpsr2 & (1 << 23)) == 0) /* SPU2 */\n" "-\t\tmsk |= 1 << 31;\n" "-\n" - "-\tif ((mstpsr2 & (1 << 12)) = 0) /* MFI_MFIM */\n" + "-\tif ((mstpsr2 & (1 << 12)) == 0) /* MFI_MFIM */\n" "-\t\tmsk |= 1 << 21;\n" "-\n" - "-\tif ((mstpsr4 & (1 << 3)) = 0) /* KEYSC */\n" + "-\tif ((mstpsr4 & (1 << 3)) == 0) /* KEYSC */\n" "-\t\tmsk |= 1 << 2;\n" "-\n" - "-\tif ((mstpsr1 & (1 << 24)) = 0) /* CMT0 */\n" + "-\tif ((mstpsr1 & (1 << 24)) == 0) /* CMT0 */\n" "-\t\tmsk |= 1 << 1;\n" "-\n" - "-\tif ((mstpsr3 & (1 << 29)) = 0) /* CMT1 */\n" + "-\tif ((mstpsr3 & (1 << 29)) == 0) /* CMT1 */\n" "-\t\tmsk |= 1 << 1;\n" "-\n" - "-\tif ((mstpsr4 & (1 << 0)) = 0) /* CMT2 */\n" + "-\tif ((mstpsr4 & (1 << 0)) == 0) /* CMT2 */\n" "-\t\tmsk |= 1 << 1;\n" "-\n" - "-\tif ((mstpsr2 & (1 << 13)) = 0) /* MFI_MFIS */\n" + "-\tif ((mstpsr2 & (1 << 13)) == 0) /* MFI_MFIS */\n" "-\t\tmsk2 |= 1 << 17;\n" "-\n" "-\t*mskp = msk;\n" @@ -1843,7 +1843,7 @@ "-#ifdef CONFIG_CPU_IDLE\n" "-static int sh7372_do_idle_core_standby(unsigned long unused)\n" "-{\n" - "-\tcpu_do_idle(); /* WFI when SYSTBCR = 0x10 -> Core Standby */\n" + "-\tcpu_do_idle(); /* WFI when SYSTBCR == 0x10 -> Core Standby */\n" "-\treturn 0;\n" "-}\n" "-\n" @@ -3222,4 +3222,4 @@ "-\t.word v7_flush_dcache_all\n" -#endif -624f42fa35d78942343a2bb979d132382fe6228b755e31c913039843012acf21 +207c6ffd55d369b9eb47a1832c155421405927337e98fb6c1cf1565057b041ac
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.