* [PATCH] spi: sprd: Add a prefix for SPI DMA channel macros
@ 2019-02-13 13:08 Baolin Wang
2019-02-13 15:57 ` Applied "spi: sprd: Add a prefix for SPI DMA channel macros" to the spi tree Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Baolin Wang @ 2019-02-13 13:08 UTC (permalink / raw)
To: broonie
Cc: orsonzhai, zhang.lyra, lanqing.liu, baolin.wang, linux-spi, linux-kernel
Add a prefix for SPI DMA channel macros to avoid namespace conflicts,
and no functional changes.
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
drivers/spi/spi-sprd.c | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/drivers/spi/spi-sprd.c b/drivers/spi/spi-sprd.c
index 0c04a1d..1b7eebb 100644
--- a/drivers/spi/spi-sprd.c
+++ b/drivers/spi/spi-sprd.c
@@ -135,14 +135,14 @@
#define SPRD_SPI_DMA_STEP 8
enum sprd_spi_dma_channel {
- SPI_RX,
- SPI_TX,
- SPI_MAX,
+ SPRD_SPI_RX,
+ SPRD_SPI_TX,
+ SPRD_SPI_MAX,
};
struct sprd_spi_dma {
bool enable;
- struct dma_chan *dma_chan[SPI_MAX];
+ struct dma_chan *dma_chan[SPRD_SPI_MAX];
enum dma_slave_buswidth width;
u32 fragmens_len;
u32 rx_len;
@@ -516,7 +516,7 @@ static int sprd_spi_dma_submit(struct dma_chan *dma_chan,
static int sprd_spi_dma_rx_config(struct sprd_spi *ss, struct spi_transfer *t)
{
- struct dma_chan *dma_chan = ss->dma.dma_chan[SPI_RX];
+ struct dma_chan *dma_chan = ss->dma.dma_chan[SPRD_SPI_RX];
struct dma_slave_config config = {
.src_addr = ss->phy_base,
.src_addr_width = ss->dma.width,
@@ -534,7 +534,7 @@ static int sprd_spi_dma_rx_config(struct sprd_spi *ss, struct spi_transfer *t)
static int sprd_spi_dma_tx_config(struct sprd_spi *ss, struct spi_transfer *t)
{
- struct dma_chan *dma_chan = ss->dma.dma_chan[SPI_TX];
+ struct dma_chan *dma_chan = ss->dma.dma_chan[SPRD_SPI_TX];
struct dma_slave_config config = {
.dst_addr = ss->phy_base,
.src_addr_width = ss->dma.width,
@@ -552,23 +552,23 @@ static int sprd_spi_dma_tx_config(struct sprd_spi *ss, struct spi_transfer *t)
static int sprd_spi_dma_request(struct sprd_spi *ss)
{
- ss->dma.dma_chan[SPI_RX] = dma_request_chan(ss->dev, "rx_chn");
- if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPI_RX])) {
- if (PTR_ERR(ss->dma.dma_chan[SPI_RX]) == -EPROBE_DEFER)
- return PTR_ERR(ss->dma.dma_chan[SPI_RX]);
+ ss->dma.dma_chan[SPRD_SPI_RX] = dma_request_chan(ss->dev, "rx_chn");
+ if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_RX])) {
+ if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]) == -EPROBE_DEFER)
+ return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]);
dev_err(ss->dev, "request RX DMA channel failed!\n");
- return PTR_ERR(ss->dma.dma_chan[SPI_RX]);
+ return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]);
}
- ss->dma.dma_chan[SPI_TX] = dma_request_chan(ss->dev, "tx_chn");
- if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPI_TX])) {
- if (PTR_ERR(ss->dma.dma_chan[SPI_TX]) == -EPROBE_DEFER)
- return PTR_ERR(ss->dma.dma_chan[SPI_TX]);
+ ss->dma.dma_chan[SPRD_SPI_TX] = dma_request_chan(ss->dev, "tx_chn");
+ if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_TX])) {
+ if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]) == -EPROBE_DEFER)
+ return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]);
dev_err(ss->dev, "request TX DMA channel failed!\n");
- dma_release_channel(ss->dma.dma_chan[SPI_RX]);
- return PTR_ERR(ss->dma.dma_chan[SPI_TX]);
+ dma_release_channel(ss->dma.dma_chan[SPRD_SPI_RX]);
+ return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]);
}
return 0;
@@ -576,11 +576,11 @@ static int sprd_spi_dma_request(struct sprd_spi *ss)
static void sprd_spi_dma_release(struct sprd_spi *ss)
{
- if (ss->dma.dma_chan[SPI_RX])
- dma_release_channel(ss->dma.dma_chan[SPI_RX]);
+ if (ss->dma.dma_chan[SPRD_SPI_RX])
+ dma_release_channel(ss->dma.dma_chan[SPRD_SPI_RX]);
- if (ss->dma.dma_chan[SPI_TX])
- dma_release_channel(ss->dma.dma_chan[SPI_TX]);
+ if (ss->dma.dma_chan[SPRD_SPI_TX])
+ dma_release_channel(ss->dma.dma_chan[SPRD_SPI_TX]);
}
static int sprd_spi_dma_txrx_bufs(struct spi_device *sdev,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Applied "spi: sprd: Add a prefix for SPI DMA channel macros" to the spi tree
2019-02-13 13:08 [PATCH] spi: sprd: Add a prefix for SPI DMA channel macros Baolin Wang
@ 2019-02-13 15:57 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2019-02-13 15:57 UTC (permalink / raw)
To: Baolin Wang
Cc: Mark Brown, broonie, orsonzhai, zhang.lyra, lanqing.liu,
baolin.wang, linux-spi, linux-kernel, linux-spi
The patch
spi: sprd: Add a prefix for SPI DMA channel macros
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 5e060c48bc52d6e269cd01261cce3b260eba84ba Mon Sep 17 00:00:00 2001
From: Baolin Wang <baolin.wang@linaro.org>
Date: Wed, 13 Feb 2019 21:08:16 +0800
Subject: [PATCH] spi: sprd: Add a prefix for SPI DMA channel macros
Add a prefix for SPI DMA channel macros to avoid namespace conflicts,
and no functional changes.
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
drivers/spi/spi-sprd.c | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/drivers/spi/spi-sprd.c b/drivers/spi/spi-sprd.c
index a4398e737650..f6c8838f7dc3 100644
--- a/drivers/spi/spi-sprd.c
+++ b/drivers/spi/spi-sprd.c
@@ -135,14 +135,14 @@
#define SPRD_SPI_DMA_STEP 8
enum sprd_spi_dma_channel {
- SPI_RX,
- SPI_TX,
- SPI_MAX,
+ SPRD_SPI_RX,
+ SPRD_SPI_TX,
+ SPRD_SPI_MAX,
};
struct sprd_spi_dma {
bool enable;
- struct dma_chan *dma_chan[SPI_MAX];
+ struct dma_chan *dma_chan[SPRD_SPI_MAX];
enum dma_slave_buswidth width;
u32 fragmens_len;
u32 rx_len;
@@ -514,7 +514,7 @@ static int sprd_spi_dma_submit(struct dma_chan *dma_chan,
static int sprd_spi_dma_rx_config(struct sprd_spi *ss, struct spi_transfer *t)
{
- struct dma_chan *dma_chan = ss->dma.dma_chan[SPI_RX];
+ struct dma_chan *dma_chan = ss->dma.dma_chan[SPRD_SPI_RX];
struct dma_slave_config config = {
.src_addr = ss->phy_base,
.src_addr_width = ss->dma.width,
@@ -532,7 +532,7 @@ static int sprd_spi_dma_rx_config(struct sprd_spi *ss, struct spi_transfer *t)
static int sprd_spi_dma_tx_config(struct sprd_spi *ss, struct spi_transfer *t)
{
- struct dma_chan *dma_chan = ss->dma.dma_chan[SPI_TX];
+ struct dma_chan *dma_chan = ss->dma.dma_chan[SPRD_SPI_TX];
struct dma_slave_config config = {
.dst_addr = ss->phy_base,
.src_addr_width = ss->dma.width,
@@ -550,23 +550,23 @@ static int sprd_spi_dma_tx_config(struct sprd_spi *ss, struct spi_transfer *t)
static int sprd_spi_dma_request(struct sprd_spi *ss)
{
- ss->dma.dma_chan[SPI_RX] = dma_request_chan(ss->dev, "rx_chn");
- if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPI_RX])) {
- if (PTR_ERR(ss->dma.dma_chan[SPI_RX]) == -EPROBE_DEFER)
- return PTR_ERR(ss->dma.dma_chan[SPI_RX]);
+ ss->dma.dma_chan[SPRD_SPI_RX] = dma_request_chan(ss->dev, "rx_chn");
+ if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_RX])) {
+ if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]) == -EPROBE_DEFER)
+ return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]);
dev_err(ss->dev, "request RX DMA channel failed!\n");
- return PTR_ERR(ss->dma.dma_chan[SPI_RX]);
+ return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]);
}
- ss->dma.dma_chan[SPI_TX] = dma_request_chan(ss->dev, "tx_chn");
- if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPI_TX])) {
- if (PTR_ERR(ss->dma.dma_chan[SPI_TX]) == -EPROBE_DEFER)
- return PTR_ERR(ss->dma.dma_chan[SPI_TX]);
+ ss->dma.dma_chan[SPRD_SPI_TX] = dma_request_chan(ss->dev, "tx_chn");
+ if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_TX])) {
+ if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]) == -EPROBE_DEFER)
+ return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]);
dev_err(ss->dev, "request TX DMA channel failed!\n");
- dma_release_channel(ss->dma.dma_chan[SPI_RX]);
- return PTR_ERR(ss->dma.dma_chan[SPI_TX]);
+ dma_release_channel(ss->dma.dma_chan[SPRD_SPI_RX]);
+ return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]);
}
return 0;
@@ -574,11 +574,11 @@ static int sprd_spi_dma_request(struct sprd_spi *ss)
static void sprd_spi_dma_release(struct sprd_spi *ss)
{
- if (ss->dma.dma_chan[SPI_RX])
- dma_release_channel(ss->dma.dma_chan[SPI_RX]);
+ if (ss->dma.dma_chan[SPRD_SPI_RX])
+ dma_release_channel(ss->dma.dma_chan[SPRD_SPI_RX]);
- if (ss->dma.dma_chan[SPI_TX])
- dma_release_channel(ss->dma.dma_chan[SPI_TX]);
+ if (ss->dma.dma_chan[SPRD_SPI_TX])
+ dma_release_channel(ss->dma.dma_chan[SPRD_SPI_TX]);
}
static int sprd_spi_dma_txrx_bufs(struct spi_device *sdev,
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-13 15:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-13 13:08 [PATCH] spi: sprd: Add a prefix for SPI DMA channel macros Baolin Wang
2019-02-13 15:57 ` Applied "spi: sprd: Add a prefix for SPI DMA channel macros" to the spi tree Mark Brown
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).