From patchwork Mon Apr 1 04:49:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 1072307 X-Patchwork-Delegate: tudor.ambarus@gmail.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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ky9o/Yrx"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SDzGIH//"; 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 44XfzL4vR4z9sQw for ; Mon, 1 Apr 2019 15:50:22 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=lgnVEXxbL1zUjvfXp62o53YFm6QfIMszQ9U1PoyJceY=; b=Ky9o/Yrx5+wEub Oxj/iV8iSPacL4OzbIlmXE13IW6IdTirUzAxnKunit3oYtZz/dOMP8OKW6zR4tJTVVUI+Ea3k6N5Z j7wJMZOmEj7f83FkavJtsuGsN3IECZCo2diewARS+xWpn7LigKbe3ZXb0+JK3Frc7gjR4NKKDj8OV q5eZtisHQaONH/5Rb+t479QoeYU0iQc78SXrtUxVCyAo6OUsxn3VOvLEfedy5N8oV6tc3AC4tCoPI 0Ok5aLr2jYqXHzhu0SDU3/kDtnkG74A5BoLCyO0QY7rMOoQuy4N/LAj2Uqe+wjlcP5K3EKcEmXFwM BzAyi6EOGv/PRHMo65SQ==; 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 1hAotk-0005Re-21; Mon, 01 Apr 2019 04:50:16 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hAotN-0003rG-DM for linux-mtd@lists.infradead.org; Mon, 01 Apr 2019 04:49:54 +0000 Received: by mail-pl1-x641.google.com with SMTP id m10so3836517plt.10 for ; Sun, 31 Mar 2019 21:49:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=moNJlz8Hnp8YLvfjdfiXHR1qR6R97pFA3oXU5nhsmmU=; b=SDzGIH//bFj5ysGW9Bn4ADrZSYG7CaIdulWP2HGxnsk+BALBtIkYpbUa42iQKrpvfk gZDagi7qJeK3zODSAh6PWxsvRsyWjO7wqK1lONBVo8jGGamAtBf05XpCCjioEOwmXCX/ l7Qho1wfAnhtAqqz3s+SSGfffkKKrrnhR2gZKu7J99PYHRQWCnAU6aYJgQQazoqhbM3i VIPGuQJ6mArLwnNxoq8LDZNjvWtdZhrMvxiZSCmLLvptPp4zC8Rd6J38EAXhIM84IAln Xd0MRNgwZY9P/HiwPmjBsFfxzYH3dLNvj/q8ANVOZpaMDhCVJyzcoA5R96AZ0PqGFLHD LPEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=moNJlz8Hnp8YLvfjdfiXHR1qR6R97pFA3oXU5nhsmmU=; b=miQQWb59VqA/n/pS75gIvkbA/2irquG2yZnzKqNSFJA3Sw4QbOGgIkQeJYpeJ3xDvR 3qun3oQA1bymw/n6VNbV+gqolod3Zs2XUQT4xlQcCHSAwDI8p2Pf7skBRqNgwtEX4mPz NmCVJUQRxkZ+okXRMPAvxyGVNZ9t10TNVCHCMm716bWX4Ludst1PWZujyGzWTFCYVhzh ppwCerhVtOjlxCKBM7ZOce3tKD/OS99bYrYjL52rEa+/TpiidqPdYMyANTbdzPNh0FGh cg4NIJgEba/shgAKLZtB/BO+i263zJGeepM3TfY87bblTBsDHUGs3hqqWmYyM84fH5q0 axDw== X-Gm-Message-State: APjAAAWYV5Xxh2k2c2IUo5YjVofe15C6MRS/WoKAgUXw7E1sZzFMVCy+ 3nhc82ABst/neSqoYUHkmnghr3DN X-Google-Smtp-Source: APXvYqxPoH5bx85nZpF1l5tdVoirRcUd3/NBIvDFXloIEDGmac9KOCbNo8hjLENNpqF5oQ9voX9hQw== X-Received: by 2002:a17:902:bb98:: with SMTP id m24mr40860174pls.17.1554094192397; Sun, 31 Mar 2019 21:49:52 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id i31sm16256097pgi.36.2019.03.31.21.49.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 31 Mar 2019 21:49:51 -0700 (PDT) From: Andrey Smirnov To: linux-mtd@lists.infradead.org Subject: [PATCH 3/3] mtd: devices: m25p80: Share code between m25p80_read() and m25p80_write() Date: Sun, 31 Mar 2019 21:49:38 -0700 Message-Id: <20190401044938.31237-3-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190401044938.31237-1-andrew.smirnov@gmail.com> References: <20190401044938.31237-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190331_214953_450716_8D1645F8 X-CRM114-Status: GOOD ( 15.65 ) 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 https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:641 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (andrew.smirnov[at]gmail.com) -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_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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: Marek Vasut , Andrey Smirnov , linux-kernel@vger.kernel.org, Boris Brezillon , Brian Norris , Chris Healy Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Move shared parts of m25p80_read() and m25p80_write() into a separate subroutine and convert the rest of the code to use it. No functional change intended. Signed-off-by: Andrey Smirnov Cc: Brian Norris Cc: Boris Brezillon Cc: Marek Vasut Cc: Chris Healy Cc: linux-mtd@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/mtd/devices/m25p80.c | 58 ++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index a54cad9bb6e3..199f7c210799 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -81,34 +81,41 @@ static int m25p80_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) return ret; } -static ssize_t m25p80_write(struct spi_nor *nor, loff_t to, size_t len, - const u_char *buf) +static ssize_t m25p80_read_write(struct spi_nor *nor, struct spi_mem_op *op, + enum spi_nor_protocol proto) { struct m25p *flash = nor->priv; - struct spi_mem_op op = - SPI_MEM_OP(SPI_MEM_OP_CMD(nor->program_opcode, 1), - SPI_MEM_OP_ADDR(nor->addr_width, to, 1), - SPI_MEM_OP_NO_DUMMY, - SPI_MEM_OP_DATA_OUT(len, buf, 1)); int ret; /* get transfer protocols. */ - op.cmd.buswidth = spi_nor_get_protocol_inst_nbits(nor->write_proto); - op.addr.buswidth = spi_nor_get_protocol_addr_nbits(nor->write_proto); - op.data.buswidth = spi_nor_get_protocol_data_nbits(nor->write_proto); - - if (nor->program_opcode == SPINOR_OP_AAI_WP && nor->sst_write_second) - op.addr.nbytes = 0; + op->cmd.buswidth = spi_nor_get_protocol_inst_nbits(proto); + op->addr.buswidth = spi_nor_get_protocol_addr_nbits(proto); + op->data.buswidth = spi_nor_get_protocol_data_nbits(proto); - ret = spi_mem_adjust_op_size(flash->spimem, &op); + ret = spi_mem_adjust_op_size(flash->spimem, op); if (ret) return ret; - ret = spi_mem_exec_op(flash->spimem, &op); + ret = spi_mem_exec_op(flash->spimem, op); if (ret) return ret; - return op.data.nbytes; + return op->data.nbytes; +} + +static ssize_t m25p80_write(struct spi_nor *nor, loff_t to, size_t len, + const u_char *buf) +{ + struct spi_mem_op op = + SPI_MEM_OP(SPI_MEM_OP_CMD(nor->program_opcode, 1), + SPI_MEM_OP_ADDR(nor->addr_width, to, 1), + SPI_MEM_OP_NO_DUMMY, + SPI_MEM_OP_DATA_OUT(len, buf, 1)); + + if (nor->program_opcode == SPINOR_OP_AAI_WP && nor->sst_write_second) + op.addr.nbytes = 0; + + return m25p80_read_write(nor, &op, nor->write_proto); } /* @@ -118,32 +125,17 @@ static ssize_t m25p80_write(struct spi_nor *nor, loff_t to, size_t len, static ssize_t m25p80_read(struct spi_nor *nor, loff_t from, size_t len, u_char *buf) { - struct m25p *flash = nor->priv; struct spi_mem_op op = SPI_MEM_OP(SPI_MEM_OP_CMD(nor->read_opcode, 1), SPI_MEM_OP_ADDR(nor->addr_width, from, 1), SPI_MEM_OP_DUMMY(nor->read_dummy, 1), SPI_MEM_OP_DATA_IN(len, buf, 1)); - int ret; - - /* get transfer protocols. */ - op.cmd.buswidth = spi_nor_get_protocol_inst_nbits(nor->read_proto); - op.addr.buswidth = spi_nor_get_protocol_addr_nbits(nor->read_proto); - op.dummy.buswidth = op.addr.buswidth; - op.data.buswidth = spi_nor_get_protocol_data_nbits(nor->read_proto); + op.dummy.buswidth = spi_nor_get_protocol_addr_nbits(nor->read_proto); /* convert the dummy cycles to the number of bytes */ op.dummy.nbytes = (nor->read_dummy * op.dummy.buswidth) / 8; - ret = spi_mem_adjust_op_size(flash->spimem, &op); - if (ret) - return ret; - - ret = spi_mem_exec_op(flash->spimem, &op); - if (ret) - return ret; - - return op.data.nbytes; + return m25p80_read_write(nor, &op, nor->read_proto); } /*