diff for duplicates of <4BD6B926.3020704@renesas.com> diff --git a/a/1.txt b/N1/1.txt index ef8605b..0d1c0c5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -288,7 +288,7 @@ index 0000000..4a62c96 + + if (!clk) + return; -+ if (p->sup_pclk && clk == host->clk) { ++ if (p->sup_pclk && clk = host->clk) { + sh_mmcif_bitset(host, MMCIF_CE_CLK_CTRL, CLK_SUP_PCLK); + } else { + for (i = 1; (unsigned int)host->clk / (1 << i) >= clk; i++) @@ -368,9 +368,9 @@ index 0000000..4a62c96 + /* buf read enable */ + sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFREN); + time = wait_event_interruptible_timeout(host->intr_wait, -+ host->wait_int == 1 || -+ host->sd_error == 1, host->timeout); -+ if (host->wait_int != 1 && (time == 0 || host->sd_error != 0)) ++ host->wait_int = 1 || ++ host->sd_error = 1, host->timeout); ++ if (host->wait_int != 1 && (time = 0 || host->sd_error != 0)) + return sh_mmcif_error_manage(host); + + host->wait_int = 0; @@ -382,9 +382,9 @@ index 0000000..4a62c96 + /* buffer read end */ + sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFRE); + time = wait_event_interruptible_timeout(host->intr_wait, -+ host->wait_int == 1 || -+ host->sd_error == 1, host->timeout); -+ if (host->wait_int != 1 && (time == 0 || host->sd_error != 0)) ++ host->wait_int = 1 || ++ host->sd_error = 1, host->timeout); ++ if (host->wait_int != 1 && (time = 0 || host->sd_error != 0)) + return sh_mmcif_error_manage(host); + + host->wait_int = 0; @@ -406,11 +406,11 @@ index 0000000..4a62c96 + sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFREN); + /* buf read enable */ + time = wait_event_interruptible_timeout(host->intr_wait, -+ host->wait_int == 1 || -+ host->sd_error == 1, host->timeout); ++ host->wait_int = 1 || ++ host->sd_error = 1, host->timeout); + + if (host->wait_int != 1 && -+ (time == 0 || host->sd_error != 0)) ++ (time = 0 || host->sd_error != 0)) + return sh_mmcif_error_manage(host); + + host->wait_int = 0; @@ -435,9 +435,9 @@ index 0000000..4a62c96 + + /* buf write enable */ + time = wait_event_interruptible_timeout(host->intr_wait, -+ host->wait_int == 1 || -+ host->sd_error == 1, host->timeout); -+ if (host->wait_int != 1 && (time == 0 || host->sd_error != 0)) ++ host->wait_int = 1 || ++ host->sd_error = 1, host->timeout); ++ if (host->wait_int != 1 && (time = 0 || host->sd_error != 0)) + return sh_mmcif_error_manage(host); + + host->wait_int = 0; @@ -450,9 +450,9 @@ index 0000000..4a62c96 + sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MDTRANE); + + time = wait_event_interruptible_timeout(host->intr_wait, -+ host->wait_int == 1 || -+ host->sd_error == 1, host->timeout); -+ if (host->wait_int != 1 && (time == 0 || host->sd_error != 0)) ++ host->wait_int = 1 || ++ host->sd_error = 1, host->timeout); ++ if (host->wait_int != 1 && (time = 0 || host->sd_error != 0)) + return sh_mmcif_error_manage(host); + + host->wait_int = 0; @@ -475,11 +475,11 @@ index 0000000..4a62c96 + sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFWEN); + /* buf write enable*/ + time = wait_event_interruptible_timeout(host->intr_wait, -+ host->wait_int == 1 || -+ host->sd_error == 1, host->timeout); ++ host->wait_int = 1 || ++ host->sd_error = 1, host->timeout); + + if (host->wait_int != 1 && -+ (time == 0 || host->sd_error != 0)) ++ (time = 0 || host->sd_error != 0)) + return sh_mmcif_error_manage(host); + + host->wait_int = 0; @@ -562,24 +562,24 @@ index 0000000..4a62c96 + } + } + /* DWEN */ -+ if (opc == MMC_WRITE_BLOCK || opc == MMC_WRITE_MULTIPLE_BLOCK) ++ if (opc = MMC_WRITE_BLOCK || opc = MMC_WRITE_MULTIPLE_BLOCK) + tmp |= CMD_SET_DWEN; + /* CMLTE/CMD12EN */ -+ if (opc == MMC_READ_MULTIPLE_BLOCK || opc == MMC_WRITE_MULTIPLE_BLOCK) { ++ if (opc = MMC_READ_MULTIPLE_BLOCK || opc = MMC_WRITE_MULTIPLE_BLOCK) { + tmp |= CMD_SET_CMLTE | CMD_SET_CMD12EN; + sh_mmcif_bitset(host, MMCIF_CE_BLOCK_SET, + mrq->data->blocks << 16); + } + /* RIDXC[1:0] check bits */ -+ if (opc == MMC_SEND_OP_COND || opc == MMC_ALL_SEND_CID || -+ opc == MMC_SEND_CSD || opc == MMC_SEND_CID) ++ if (opc = MMC_SEND_OP_COND || opc = MMC_ALL_SEND_CID || ++ opc = MMC_SEND_CSD || opc = MMC_SEND_CID) + tmp |= CMD_SET_RIDXC_BITS; + /* RCRC7C[1:0] check bits */ -+ if (opc == MMC_SEND_OP_COND) ++ if (opc = MMC_SEND_OP_COND) + tmp |= CMD_SET_CRC7C_BITS; + /* RCRC7C[1:0] internal CRC7 */ -+ if (opc == MMC_ALL_SEND_CID || -+ opc == MMC_SEND_CSD || opc == MMC_SEND_CID) ++ if (opc = MMC_ALL_SEND_CID || ++ opc = MMC_SEND_CSD || opc = MMC_SEND_CID) + tmp |= CMD_SET_CRC7C_INTERNAL; + + return opc = ((opc << 24) | tmp); @@ -655,8 +655,8 @@ index 0000000..4a62c96 + sh_mmcif_writel(host, MMCIF_CE_CMD_SET, opc); + + time = wait_event_interruptible_timeout(host->intr_wait, -+ host->wait_int == 1 || host->sd_error == 1, host->timeout); -+ if (host->wait_int != 1 && time == 0) { ++ host->wait_int = 1 || host->sd_error = 1, host->timeout); ++ if (host->wait_int != 1 && time = 0) { + cmd->error = sh_mmcif_error_manage(host); + return; + } @@ -682,7 +682,7 @@ index 0000000..4a62c96 + host->wait_int = 0; + return; + } -+ if (host->wait_int == 1) { ++ if (host->wait_int = 1) { + sh_mmcif_get_response(host, cmd); + host->wait_int = 0; + } @@ -691,8 +691,7 @@ index 0000000..4a62c96 + if (ret < 0) + mrq->data->bytes_xfered = 0; + else -+ mrq->data->bytes_xfered = -+ mrq->data->blocks * mrq->data->blksz; ++ mrq->data->bytes_xfered + mrq->data->blocks * mrq->data->blksz; + } + cmd->error = ret; +} @@ -702,9 +701,9 @@ index 0000000..4a62c96 +{ + long time; + -+ if (mrq->cmd->opcode == MMC_READ_MULTIPLE_BLOCK) ++ if (mrq->cmd->opcode = MMC_READ_MULTIPLE_BLOCK) + sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MCMD12DRE); -+ else if (mrq->cmd->opcode == MMC_WRITE_MULTIPLE_BLOCK) ++ else if (mrq->cmd->opcode = MMC_WRITE_MULTIPLE_BLOCK) + sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MCMD12RBE); + else { + pr_err(DRIVER_NAME": not support stop cmd\n"); @@ -713,9 +712,9 @@ index 0000000..4a62c96 + } + + time = wait_event_interruptible_timeout(host->intr_wait, -+ host->wait_int == 1 || -+ host->sd_error == 1, host->timeout); -+ if (host->wait_int != 1 && (time == 0 || host->sd_error != 0)) { ++ host->wait_int = 1 || ++ host->sd_error = 1, host->timeout); ++ if (host->wait_int != 1 && (time = 0 || host->sd_error != 0)) { + cmd->error = sh_mmcif_error_manage(host); + return; + } @@ -764,13 +763,13 @@ index 0000000..4a62c96 + struct sh_mmcif_host *host = mmc_priv(mmc); + struct sh_mmcif_plat_data *p = host->pd->dev.platform_data; + -+ if (ios->power_mode == MMC_POWER_OFF) { ++ if (ios->power_mode = MMC_POWER_OFF) { + /* clock stop */ + sh_mmcif_clock_control(host, 0); + if (p->down_pwr) + p->down_pwr(host->pd); + return; -+ } else if (ios->power_mode == MMC_POWER_UP) { ++ } else if (ios->power_mode = MMC_POWER_UP) { + if (p->set_pwr) + p->set_pwr(host->pd, ios->power_mode); + } diff --git a/a/content_digest b/N1/content_digest index e17edeb..fce2795 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Yusuke Goda <yusuke.goda.sx@renesas.com>\0" "Subject\0[PATCH 1/2] MMC: Add support MMCIF for SuperH\0" - "Date\0Tue, 27 Apr 2010 19:15:02 +0900\0" + "Date\0Tue, 27 Apr 2010 10:15:02 +0000\0" "To\0akpm@linux-foundation.org" ben@decadent.org.uk linux-mmc@vger.kernel.org @@ -298,7 +298,7 @@ "+\n" "+\tif (!clk)\n" "+\t\treturn;\n" - "+\tif (p->sup_pclk && clk == host->clk) {\n" + "+\tif (p->sup_pclk && clk = host->clk) {\n" "+\t\t\tsh_mmcif_bitset(host, MMCIF_CE_CLK_CTRL, CLK_SUP_PCLK);\n" "+\t} else {\n" "+\t\tfor (i = 1; (unsigned int)host->clk / (1 << i) >= clk; i++)\n" @@ -378,9 +378,9 @@ "+\t/* buf read enable */\n" "+\tsh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFREN);\n" "+\ttime = wait_event_interruptible_timeout(host->intr_wait,\n" - "+\t\t\thost->wait_int == 1 ||\n" - "+\t\t\thost->sd_error == 1, host->timeout);\n" - "+\tif (host->wait_int != 1 && (time == 0 || host->sd_error != 0))\n" + "+\t\t\thost->wait_int = 1 ||\n" + "+\t\t\thost->sd_error = 1, host->timeout);\n" + "+\tif (host->wait_int != 1 && (time = 0 || host->sd_error != 0))\n" "+\t\treturn sh_mmcif_error_manage(host);\n" "+\n" "+\thost->wait_int = 0;\n" @@ -392,9 +392,9 @@ "+\t/* buffer read end */\n" "+\tsh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFRE);\n" "+\ttime = wait_event_interruptible_timeout(host->intr_wait,\n" - "+\t\t\thost->wait_int == 1 ||\n" - "+\t\t\thost->sd_error == 1, host->timeout);\n" - "+\tif (host->wait_int != 1 && (time == 0 || host->sd_error != 0))\n" + "+\t\t\thost->wait_int = 1 ||\n" + "+\t\t\thost->sd_error = 1, host->timeout);\n" + "+\tif (host->wait_int != 1 && (time = 0 || host->sd_error != 0))\n" "+\t\treturn sh_mmcif_error_manage(host);\n" "+\n" "+\thost->wait_int = 0;\n" @@ -416,11 +416,11 @@ "+\t\t\tsh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFREN);\n" "+\t\t\t/* buf read enable */\n" "+\t\t\ttime = wait_event_interruptible_timeout(host->intr_wait,\n" - "+\t\t\t\thost->wait_int == 1 ||\n" - "+\t\t\t\thost->sd_error == 1, host->timeout);\n" + "+\t\t\t\thost->wait_int = 1 ||\n" + "+\t\t\t\thost->sd_error = 1, host->timeout);\n" "+\n" "+\t\t\tif (host->wait_int != 1 &&\n" - "+\t\t\t (time == 0 || host->sd_error != 0))\n" + "+\t\t\t (time = 0 || host->sd_error != 0))\n" "+\t\t\t\treturn sh_mmcif_error_manage(host);\n" "+\n" "+\t\t\thost->wait_int = 0;\n" @@ -445,9 +445,9 @@ "+\n" "+\t/* buf write enable */\n" "+\ttime = wait_event_interruptible_timeout(host->intr_wait,\n" - "+\t\t\thost->wait_int == 1 ||\n" - "+\t\t\thost->sd_error == 1, host->timeout);\n" - "+\tif (host->wait_int != 1 && (time == 0 || host->sd_error != 0))\n" + "+\t\t\thost->wait_int = 1 ||\n" + "+\t\t\thost->sd_error = 1, host->timeout);\n" + "+\tif (host->wait_int != 1 && (time = 0 || host->sd_error != 0))\n" "+\t\treturn sh_mmcif_error_manage(host);\n" "+\n" "+\thost->wait_int = 0;\n" @@ -460,9 +460,9 @@ "+\tsh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MDTRANE);\n" "+\n" "+\ttime = wait_event_interruptible_timeout(host->intr_wait,\n" - "+\t\t\thost->wait_int == 1 ||\n" - "+\t\t\thost->sd_error == 1, host->timeout);\n" - "+\tif (host->wait_int != 1 && (time == 0 || host->sd_error != 0))\n" + "+\t\t\thost->wait_int = 1 ||\n" + "+\t\t\thost->sd_error = 1, host->timeout);\n" + "+\tif (host->wait_int != 1 && (time = 0 || host->sd_error != 0))\n" "+\t\treturn sh_mmcif_error_manage(host);\n" "+\n" "+\thost->wait_int = 0;\n" @@ -485,11 +485,11 @@ "+\t\t\tsh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFWEN);\n" "+\t\t\t/* buf write enable*/\n" "+\t\t\ttime = wait_event_interruptible_timeout(host->intr_wait,\n" - "+\t\t\t\thost->wait_int == 1 ||\n" - "+\t\t\t\thost->sd_error == 1, host->timeout);\n" + "+\t\t\t\thost->wait_int = 1 ||\n" + "+\t\t\t\thost->sd_error = 1, host->timeout);\n" "+\n" "+\t\t\tif (host->wait_int != 1 &&\n" - "+\t\t\t (time == 0 || host->sd_error != 0))\n" + "+\t\t\t (time = 0 || host->sd_error != 0))\n" "+\t\t\t\treturn sh_mmcif_error_manage(host);\n" "+\n" "+\t\t\thost->wait_int = 0;\n" @@ -572,24 +572,24 @@ "+\t\t}\n" "+\t}\n" "+\t/* DWEN */\n" - "+\tif (opc == MMC_WRITE_BLOCK || opc == MMC_WRITE_MULTIPLE_BLOCK)\n" + "+\tif (opc = MMC_WRITE_BLOCK || opc = MMC_WRITE_MULTIPLE_BLOCK)\n" "+\t\ttmp |= CMD_SET_DWEN;\n" "+\t/* CMLTE/CMD12EN */\n" - "+\tif (opc == MMC_READ_MULTIPLE_BLOCK || opc == MMC_WRITE_MULTIPLE_BLOCK) {\n" + "+\tif (opc = MMC_READ_MULTIPLE_BLOCK || opc = MMC_WRITE_MULTIPLE_BLOCK) {\n" "+\t\ttmp |= CMD_SET_CMLTE | CMD_SET_CMD12EN;\n" "+\t\tsh_mmcif_bitset(host, MMCIF_CE_BLOCK_SET,\n" "+\t\t\t\t\tmrq->data->blocks << 16);\n" "+\t}\n" "+\t/* RIDXC[1:0] check bits */\n" - "+\tif (opc == MMC_SEND_OP_COND || opc == MMC_ALL_SEND_CID ||\n" - "+\t opc == MMC_SEND_CSD || opc == MMC_SEND_CID)\n" + "+\tif (opc = MMC_SEND_OP_COND || opc = MMC_ALL_SEND_CID ||\n" + "+\t opc = MMC_SEND_CSD || opc = MMC_SEND_CID)\n" "+\t\ttmp |= CMD_SET_RIDXC_BITS;\n" "+\t/* RCRC7C[1:0] check bits */\n" - "+\tif (opc == MMC_SEND_OP_COND)\n" + "+\tif (opc = MMC_SEND_OP_COND)\n" "+\t\ttmp |= CMD_SET_CRC7C_BITS;\n" "+\t/* RCRC7C[1:0] internal CRC7 */\n" - "+\tif (opc == MMC_ALL_SEND_CID ||\n" - "+\t\topc == MMC_SEND_CSD || opc == MMC_SEND_CID)\n" + "+\tif (opc = MMC_ALL_SEND_CID ||\n" + "+\t\topc = MMC_SEND_CSD || opc = MMC_SEND_CID)\n" "+\t\ttmp |= CMD_SET_CRC7C_INTERNAL;\n" "+\n" "+\treturn opc = ((opc << 24) | tmp);\n" @@ -665,8 +665,8 @@ "+\tsh_mmcif_writel(host, MMCIF_CE_CMD_SET, opc);\n" "+\n" "+\ttime = wait_event_interruptible_timeout(host->intr_wait,\n" - "+\t\thost->wait_int == 1 || host->sd_error == 1, host->timeout);\n" - "+\tif (host->wait_int != 1 && time == 0) {\n" + "+\t\thost->wait_int = 1 || host->sd_error = 1, host->timeout);\n" + "+\tif (host->wait_int != 1 && time = 0) {\n" "+\t\tcmd->error = sh_mmcif_error_manage(host);\n" "+\t\treturn;\n" "+\t}\n" @@ -692,7 +692,7 @@ "+\t\thost->wait_int = 0;\n" "+\t\treturn;\n" "+\t}\n" - "+\tif (host->wait_int == 1) {\n" + "+\tif (host->wait_int = 1) {\n" "+\t\tsh_mmcif_get_response(host, cmd);\n" "+\t\thost->wait_int = 0;\n" "+\t}\n" @@ -701,8 +701,7 @@ "+\t\tif (ret < 0)\n" "+\t\t\tmrq->data->bytes_xfered = 0;\n" "+\t\telse\n" - "+\t\t\tmrq->data->bytes_xfered =\n" - "+\t\t\t\tmrq->data->blocks * mrq->data->blksz;\n" + "+\t\t\tmrq->data->bytes_xfered +\t\t\t\tmrq->data->blocks * mrq->data->blksz;\n" "+\t}\n" "+\tcmd->error = ret;\n" "+}\n" @@ -712,9 +711,9 @@ "+{\n" "+\tlong time;\n" "+\n" - "+\tif (mrq->cmd->opcode == MMC_READ_MULTIPLE_BLOCK)\n" + "+\tif (mrq->cmd->opcode = MMC_READ_MULTIPLE_BLOCK)\n" "+\t\tsh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MCMD12DRE);\n" - "+\telse if (mrq->cmd->opcode == MMC_WRITE_MULTIPLE_BLOCK)\n" + "+\telse if (mrq->cmd->opcode = MMC_WRITE_MULTIPLE_BLOCK)\n" "+\t\tsh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MCMD12RBE);\n" "+\telse {\n" "+\t\tpr_err(DRIVER_NAME\": not support stop cmd\\n\");\n" @@ -723,9 +722,9 @@ "+\t}\n" "+\n" "+\ttime = wait_event_interruptible_timeout(host->intr_wait,\n" - "+\t\t\thost->wait_int == 1 ||\n" - "+\t\t\thost->sd_error == 1, host->timeout);\n" - "+\tif (host->wait_int != 1 && (time == 0 || host->sd_error != 0)) {\n" + "+\t\t\thost->wait_int = 1 ||\n" + "+\t\t\thost->sd_error = 1, host->timeout);\n" + "+\tif (host->wait_int != 1 && (time = 0 || host->sd_error != 0)) {\n" "+\t\tcmd->error = sh_mmcif_error_manage(host);\n" "+\t\treturn;\n" "+\t}\n" @@ -774,13 +773,13 @@ "+\tstruct sh_mmcif_host *host = mmc_priv(mmc);\n" "+\tstruct sh_mmcif_plat_data *p = host->pd->dev.platform_data;\n" "+\n" - "+\tif (ios->power_mode == MMC_POWER_OFF) {\n" + "+\tif (ios->power_mode = MMC_POWER_OFF) {\n" "+\t\t/* clock stop */\n" "+\t\tsh_mmcif_clock_control(host, 0);\n" "+\t\tif (p->down_pwr)\n" "+\t\t\tp->down_pwr(host->pd);\n" "+\t\treturn;\n" - "+\t} else if (ios->power_mode == MMC_POWER_UP) {\n" + "+\t} else if (ios->power_mode = MMC_POWER_UP) {\n" "+\t\tif (p->set_pwr)\n" "+\t\t\tp->set_pwr(host->pd, ios->power_mode);\n" "+\t}\n" @@ -1067,4 +1066,4 @@ "-- \n" 1.7.0 -8c828b9188cab60bd9df37dde9cb8ab88a767e6c9b6e0a815537ade40264f757 +820ab1e252660529779067d3431c9f30e53b27e64b2953cee52dd61492b6e1fd
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.