From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Mark Brown <broonie@kernel.org>
Cc: kernel@pengutronix.de, linux-spi@vger.kernel.org,
linux-kernel@vger.kernel.org,
Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH v3 18/32] spi: cadence-quadspi: Follow renaming of SPI "master" to "controller"
Date: Wed, 7 Feb 2024 19:40:32 +0100 [thread overview]
Message-ID: <d741960846b7f4896eeff91a4c8c7dfa8a6f8b7b.1707324794.git.u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <cover.1707324793.git.u.kleine-koenig@pengutronix.de>
In commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller"")
some functions and struct members were renamed. To not break all drivers
compatibility macros were provided.
To be able to remove these compatibility macros push the renaming into
this driver.
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/spi/spi-cadence-quadspi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index eb6cc861b00b..a5e2f7786b76 100644
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -1410,7 +1410,7 @@ static int cqspi_mem_process(struct spi_mem *mem, const struct spi_mem_op *op)
static int cqspi_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op)
{
int ret;
- struct cqspi_st *cqspi = spi_master_get_devdata(mem->spi->master);
+ struct cqspi_st *cqspi = spi_controller_get_devdata(mem->spi->controller);
struct device *dev = &cqspi->pdev->dev;
ret = pm_runtime_resume_and_get(dev);
--
2.43.0
next prev parent reply other threads:[~2024-02-07 18:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-07 18:40 [PATCH v3 00/32] spi: get rid of some legacy macros Uwe Kleine-König
2024-02-07 18:40 ` [PATCH v3 16/32] spi: bitbang: Follow renaming of SPI "master" to "controller" Uwe Kleine-König
2024-02-07 18:40 ` [PATCH v3 17/32] spi: cadence-quadspi: Don't emit error message on allocation error Uwe Kleine-König
2024-02-07 18:40 ` Uwe Kleine-König [this message]
2024-02-07 18:40 ` [PATCH v3 19/32] spi: cavium: Follow renaming of SPI "master" to "controller" Uwe Kleine-König
2024-02-07 18:40 ` [PATCH v3 20/32] spi: geni-qcom: " Uwe Kleine-König
2024-02-07 18:40 ` [PATCH v3 21/32] spi: loopback-test: " Uwe Kleine-König
2024-02-07 18:40 ` [PATCH v3 22/32] spi: slave-mt27xx: " Uwe Kleine-König
2024-02-07 18:40 ` [PATCH v3 23/32] spi: spidev: " Uwe Kleine-König
2024-02-07 18:40 ` [PATCH v3 30/32] spi: fsl-lib: " Uwe Kleine-König
2024-02-07 18:40 ` [PATCH v3 31/32] spi: Drop compat layer from renaming " Uwe Kleine-König
2024-02-09 15:24 ` Andy Shevchenko
2024-02-09 15:48 ` Mark Brown
2024-02-09 15:54 ` Andy Shevchenko
2024-02-07 18:40 ` [PATCH v3 32/32] Documentation: spi: Update documentation for " Uwe Kleine-König
2024-02-09 15:23 ` Andy Shevchenko
2024-02-08 21:21 ` [PATCH v3 00/32] spi: get rid of some legacy macros Mark Brown
2024-03-25 1:54 ` patchwork-bot+chrome-platform
2024-03-25 2:13 ` patchwork-bot+chrome-platform
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=d741960846b7f4896eeff91a4c8c7dfa8a6f8b7b.1707324794.git.u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=Jonathan.Cameron@huawei.com \
--cc=broonie@kernel.org \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).