All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yang Yingliang <yangyingliang@huawei.com>
To: <linux-spi@vger.kernel.org>
Cc: <broonie@kernel.org>, <geert@linux-m68k.org>, <lukas@wunner.de>,
	<yangyingliang@huawei.com>
Subject: [PATCH -next 13/21] spi: mtk-snfi: switch to use modern name
Date: Thu, 10 Aug 2023 16:29:56 +0800	[thread overview]
Message-ID: <20230810083004.3988597-14-yangyingliang@huawei.com> (raw)
In-Reply-To: <20230810083004.3988597-1-yangyingliang@huawei.com>

Change legacy name master to modern name host or controller.

No functional changed.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/spi/spi-mtk-snfi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi-mtk-snfi.c b/drivers/spi/spi-mtk-snfi.c
index 4433a8a9299f..43659014bef8 100644
--- a/drivers/spi/spi-mtk-snfi.c
+++ b/drivers/spi/spi-mtk-snfi.c
@@ -1255,7 +1255,7 @@ static bool mtk_snand_supports_op(struct spi_mem *mem,
 
 static int mtk_snand_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op)
 {
-	struct mtk_snand *ms = spi_controller_get_devdata(mem->spi->master);
+	struct mtk_snand *ms = spi_controller_get_devdata(mem->spi->controller);
 	// page ops transfer size must be exactly ((sector_size + spare_size) *
 	// nsectors). Limit the op size if the caller requests more than that.
 	// exec_op will read more than needed and discard the leftover if the
@@ -1282,7 +1282,7 @@ static int mtk_snand_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op)
 
 static int mtk_snand_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
 {
-	struct mtk_snand *ms = spi_controller_get_devdata(mem->spi->master);
+	struct mtk_snand *ms = spi_controller_get_devdata(mem->spi->controller);
 
 	dev_dbg(ms->dev, "OP %02x ADDR %08llX@%d:%u DATA %d:%u", op->cmd.opcode,
 		op->addr.val, op->addr.buswidth, op->addr.nbytes,
@@ -1382,7 +1382,7 @@ static int mtk_snand_probe(struct platform_device *pdev)
 	if (!dev_id)
 		return -EINVAL;
 
-	ctlr = devm_spi_alloc_master(&pdev->dev, sizeof(*ms));
+	ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*ms));
 	if (!ctlr)
 		return -ENOMEM;
 	platform_set_drvdata(pdev, ctlr);
-- 
2.25.1


  parent reply	other threads:[~2023-08-10  8:33 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-10  8:29 [PATCH -next 00/21] spi: switch to use modern name (part3) Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 01/21] spi: lm70llp: switch to use modern name Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 02/21] spi: lp-8841: " Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 03/21] spi: meson-spicc: " Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 04/21] spi: meson-spifc: " Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 05/21] spi: microchip-core-qspi: " Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 06/21] spi: microchip-core: " Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 07/21] spi: mpc512x-psc: " Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 08/21] spi: mpc52xx-psc: " Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 09/21] spi: mpc52xx: " Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 10/21] spi: mt65xx: " Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 11/21] spi: mt7621: " Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 12/21] spi: mtk-nor: " Yang Yingliang
2023-08-10  8:29 ` Yang Yingliang [this message]
2023-08-10  8:29 ` [PATCH -next 14/21] spi: mux: switch to use spi_alloc_host() Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 15/21] spi: mxic: switch to use modern name Yang Yingliang
2023-08-10  8:29 ` [PATCH -next 16/21] spi: mxs: " Yang Yingliang
2023-08-10  8:30 ` [PATCH -next 17/21] spi: npcm-pspi: " Yang Yingliang
2023-08-10  8:30 ` [PATCH -next 18/21] spi: nxp-fspi: " Yang Yingliang
2023-08-10  8:30 ` [PATCH -next 19/21] spi: oc-tiny: " Yang Yingliang
2023-08-10  8:30 ` [PATCH -next 20/21] spi: omap-uwire: " Yang Yingliang
2023-08-10  8:30 ` [PATCH -next 21/21] spi: omap2-mcspi: " Yang Yingliang
2023-09-12 14:58 ` [PATCH -next 00/21] spi: switch to use modern name (part3) Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230810083004.3988597-14-yangyingliang@huawei.com \
    --to=yangyingliang@huawei.com \
    --cc=broonie@kernel.org \
    --cc=geert@linux-m68k.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=lukas@wunner.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.