From patchwork Tue Feb 5 14:07:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tokunori Ikegami X-Patchwork-Id: 1036774 X-Patchwork-Delegate: vigneshr@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=yahoo.co.jp Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gbMr7ECt"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=yahoo.co.jp header.i=@yahoo.co.jp header.b="DYpCPPKh"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43v60z47tRz9s4V for ; Wed, 6 Feb 2019 01:10:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=KD1WXFhfL+qDXNIRlM+1al/2RbLljIH9E549IGX9np4=; b=gbMr7ECtMI/qaiCGnO6h5EP4f4 4Fb1IU+vL2f5VwmyN7o7kin6hFDEozZ2v0sQnjw/hiMfvxroMZmqX+vqIPC9l/WwBGCpvA+OzIIY2 Tz5RBzRsUe40OwnQGstZQMOHpztULeElTuLyNeGruXoBrpPAH6L0Xfz78KwQmWjRM1RF55rRw40ZB I8Zm1tCAJ3k6ef9UI8agF5cqkFuwsDXCWK+Vn4ykH05pWhqlxpPt8O2r5qhCOFQd7stx+/oVcKdZ8 TsJmlKGz8gHR+NuLt107ikkp5QqUYxGZ6ZPWG26UPYJ9azjVR4lkU4LIla4jljpT0kOmGYZi7JUFL qdlHAPlg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gr1Qb-0000Of-Ll; Tue, 05 Feb 2019 14:10:21 +0000 Received: from nh503-vm5.bullet.mail.kks.yahoo.co.jp ([183.79.56.191]) by bombadil.infradead.org with smtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gr1PK-0006lr-3F for linux-mtd@lists.infradead.org; Tue, 05 Feb 2019 14:09:07 +0000 Received: from [183.79.100.139] by nh503.bullet.mail.kks.yahoo.co.jp with NNFMP; 05 Feb 2019 14:08:59 -0000 Received: from [183.79.100.137] by t502.bullet.mail.kks.yahoo.co.jp with NNFMP; 05 Feb 2019 14:08:59 -0000 Received: from [127.0.0.1] by omp506.mail.kks.yahoo.co.jp with NNFMP; 05 Feb 2019 14:08:59 -0000 X-Yahoo-Newman-Property: ymail-3 X-Yahoo-Newman-Id: 105648.46795.bm@omp506.mail.kks.yahoo.co.jp Received: (qmail 45797 invoked by alias); 5 Feb 2019 14:08:58 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.jp; s=yj20110701; t=1549375738; bh=y0dblB+tqhR7P8h6hfIUrboO/khcJkBtBD9SV5tOC1E=; h=Received:X-YMail-JAS:X-Apparently-From:X-YMail-OSG:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=DYpCPPKhBa9iO+9DH0zMQUZrWvbvB12ySk6rCLd3ah7t8sOy7oE0K6tvT6WAsq90GwVah31wA4dB9ZZK/ChZmuksfyZgZjC3tEhJHZRXodgb216qgxsly4nLQIcmvJpL5z/0HpOiAuZkSd6GncTp6PfUQeCYuG2fw4fPiEsmj0c= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=yj20110701; d=yahoo.co.jp; h=Received:X-YMail-JAS:X-Apparently-From:X-YMail-OSG:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=qXsqUEHm455rbO/Oho8P1sd2kPHP/ZBmu/0wlZiRpf6jzD4DCfZ1nHqmkAjiCp+FaNXh2f8uJmYIAAvgTRGaqLHNssUUMGLAbw1AhXQIZrtcZuDwwjjTTNf9t3wiv0ieSCjVul1WfmkaBMYMZSrilwLJNf6LL0WKXmHF7sLee9I= ; Received: from unknown (HELO localhost.localdomain) (106.72.39.32 with login) by smtp5006.mail.kks.ynwp.yahoo.co.jp with SMTP; 5 Feb 2019 14:08:58 -0000 X-YMail-JAS: qiw0TaEVM1m81lkxkGuki4bmOxkGWF2h2zk00XjzaU.9YJAP2xSAYSqwpd0Qzhqr2BcNzeAa_q6PN1G0FLiN0M8V9UwMLA2wi9uWMhJkzRapUI1oEn_gk008qhsaGynGp603HerqPA-- X-Apparently-From: X-YMail-OSG: WIBXlB8VM1mN50QeZzJjBMf.7WQSOQHrXm5Ke3ITCdkatrF kTG5o17wPpj.fuxlw4djobpGOhsypnq7G0PqLVQyfmkTVudxqE3A8gyaCKJp DN2aZS7N.j.AZ_60xNw2YrOtOPVXnMJwKJe6jnYISfdz1ygAXo1VmOFUD1LN rUQUupyd5EKHzvp2zF0QtA6srEGWJPVmQ9pt1bbTSC0wJmhJXXg_klwbaKCO y7HtYaEG4S7rqqdCNAhx5fm4gq2w_ZHRme_IdmLHZNhv95ZjpOoPNBCkfqvq b_EpgkcV6b9lVnUZd68UcdoJr53uLzmDt7EOly7rTQ33v0wGYsvLGll44F._ B.ZSrDskb79b2IcWuXeRXVNnK4Rq8F92LQeqf_UwoBeUXUiJN41VzB50F5OG 9gWT5lTMjfXDPbBuvXtaDGUvb.J4be6vLe1XvmjF.qY2J0ss1TJReyAoSrMh YQ.PQkaTpq6UKfv09RefhfhnBntqUyiNnvW2rNSvPpqoQdtUSQwiPI_jNyfC sy.gIepLJiPqM6A6C7Nzxm7U3vD.DcFiPr8U3BuzadNq4S4heTmfzxKbZwfq SlYClO9Kyr3xlO7Y7_hGjR7.1_vsEi.i7AbVLAdAEax8gATSW From: Tokunori Ikegami To: Boris Brezillon Subject: [PATCH v5 07/11] mtd: cfi_cmdset_0002: Remove op_done goto statement from do_write_oneword() Date: Tue, 5 Feb 2019 23:07:55 +0900 Message-Id: <20190205140759.2360-8-ikegami_to@yahoo.co.jp> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190205140759.2360-1-ikegami_to@yahoo.co.jp> References: <20190205140759.2360-1-ikegami_to@yahoo.co.jp> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190205_060902_625222_69F1FCC5 X-CRM114-Status: GOOD ( 11.21 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [183.79.56.191 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (ikegami_to[at]yahoo.co.jp) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joakim Tjernlund , linux-mtd@lists.infradead.org, Tokunori Ikegami , Chris Packham , Fabio Bettoni MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This is just to refactor the function by removing the goto statement. Signed-off-by: Tokunori Ikegami Cc: Fabio Bettoni Co: Hauke Mehrtens Co: Koen Vandeputte Cc: Chris Packham Cc: Joakim Tjernlund Cc: linux-mtd@lists.infradead.org --- Changes since v4: - None. Changes since v3: - Rebased on the patch v4 01/11. - Change the email address of Tokunori Ikegami to ikegami_to@yahoo.co.jp. Changes since v2: - Just rebased. Changes since v1: - Add the patch. drivers/mtd/chips/cfi_cmdset_0002.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index a11dc40..a5513bd 100755 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -1671,7 +1671,8 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, oldd = map_read(map, adr); if (map_word_equal(map, oldd, datum)) { pr_debug("MTD %s(): NOP\n", __func__); - goto op_done; + do_write_oneword_done(map, chip, adr, mode); + return ret; } XIP_INVAL_CACHED_RANGE(map, adr, map_bankwidth(map)); @@ -1691,7 +1692,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, } } xip_enable(map, chip, adr); - op_done: + do_write_oneword_done(map, chip, adr, mode); return ret;