renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-20 11:34:02 +08:00
Code

spi: sprd: Add a prefix for SPI DMA channel macros

Browse Source 
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>
This commit is contained in:
Baolin Wang 2019-02-13 21:08:16 +08:00 committed by Mark Brown
parent 386119bc7b
commit 5e060c48bc
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/spi/spi-sprd.c
View File

@ -135,14 +135,14 @@
#define SPRD_SPI_DMA_STEP 8 #define SPRD_SPI_DMA_STEP 8
enum sprd_spi_dma_channel { enum sprd_spi_dma_channel {
SPI_RX, SPRD_SPI_RX,
SPI_TX, SPRD_SPI_TX,
SPI_MAX, SPRD_SPI_MAX,
}; };
struct sprd_spi_dma { struct sprd_spi_dma {
bool enable; bool enable;
struct dma_chan *dma_chan[SPI_MAX]; struct dma_chan *dma_chan[SPRD_SPI_MAX];
enum dma_slave_buswidth width; enum dma_slave_buswidth width;
u32 fragmens_len; u32 fragmens_len;
u32 rx_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) 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 = { struct dma_slave_config config = {
.src_addr = ss->phy_base, .src_addr = ss->phy_base,
.src_addr_width = ss->dma.width, .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) 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 = { struct dma_slave_config config = {
.dst_addr = ss->phy_base, .dst_addr = ss->phy_base,
.src_addr_width = ss->dma.width, .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) static int sprd_spi_dma_request(struct sprd_spi *ss)
{ {
ss->dma.dma_chan[SPI_RX] = dma_request_chan(ss->dev, "rx_chn"); ss->dma.dma_chan[SPRD_SPI_RX] = dma_request_chan(ss->dev, "rx_chn");
if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPI_RX])) { if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_RX])) {
if (PTR_ERR(ss->dma.dma_chan[SPI_RX]) == -EPROBE_DEFER) if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]) == -EPROBE_DEFER)
return PTR_ERR(ss->dma.dma_chan[SPI_RX]); return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]);
dev_err(ss->dev, "request RX DMA channel failed!\n"); 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"); ss->dma.dma_chan[SPRD_SPI_TX] = dma_request_chan(ss->dev, "tx_chn");
if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPI_TX])) { if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_TX])) {
if (PTR_ERR(ss->dma.dma_chan[SPI_TX]) == -EPROBE_DEFER) if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]) == -EPROBE_DEFER)
return PTR_ERR(ss->dma.dma_chan[SPI_TX]); return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]);
dev_err(ss->dev, "request TX DMA channel failed!\n"); dev_err(ss->dev, "request TX DMA channel failed!\n");
dma_release_channel(ss->dma.dma_chan[SPI_RX]); dma_release_channel(ss->dma.dma_chan[SPRD_SPI_RX]);
return PTR_ERR(ss->dma.dma_chan[SPI_TX]); return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]);
} }
return 0; 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) static void sprd_spi_dma_release(struct sprd_spi *ss)
{ {
if (ss->dma.dma_chan[SPI_RX]) if (ss->dma.dma_chan[SPRD_SPI_RX])
dma_release_channel(ss->dma.dma_chan[SPI_RX]); dma_release_channel(ss->dma.dma_chan[SPRD_SPI_RX]);
if (ss->dma.dma_chan[SPI_TX]) if (ss->dma.dma_chan[SPRD_SPI_TX])
dma_release_channel(ss->dma.dma_chan[SPI_TX]); dma_release_channel(ss->dma.dma_chan[SPRD_SPI_TX]);
} }
static int sprd_spi_dma_txrx_bufs(struct spi_device *sdev, static int sprd_spi_dma_txrx_bufs(struct spi_device *sdev,