openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi: atmel-quadspi: fix naming scheme 

Let general names to core drivers.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: Boris Brezillon <bbrezillon@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Tudor Ambarus 2019-02-05 17:33:14 +00:00 committed by Mark Brown
parent 18b6f6e176
commit 1db6de22b2
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/spi/atmel-quadspi.c
View File

@ -158,14 +158,14 @@ struct atmel_qspi {
struct completion cmd_completion; struct completion cmd_completion;
}; };
struct qspi_mode { struct atmel_qspi_mode {
u8 cmd_buswidth; u8 cmd_buswidth;
u8 addr_buswidth; u8 addr_buswidth;
u8 data_buswidth; u8 data_buswidth;
u32 config; u32 config;
}; };
static const struct qspi_mode sama5d2_qspi_modes[] = { static const struct atmel_qspi_mode sama5d2_qspi_modes[] = {
{ 1, 1, 1, QSPI_IFR_WIDTH_SINGLE_BIT_SPI }, { 1, 1, 1, QSPI_IFR_WIDTH_SINGLE_BIT_SPI },
{ 1, 1, 2, QSPI_IFR_WIDTH_DUAL_OUTPUT }, { 1, 1, 2, QSPI_IFR_WIDTH_DUAL_OUTPUT },
{ 1, 1, 4, QSPI_IFR_WIDTH_QUAD_OUTPUT }, { 1, 1, 4, QSPI_IFR_WIDTH_QUAD_OUTPUT },
@ -175,8 +175,8 @@ static const struct qspi_mode sama5d2_qspi_modes[] = {
{ 4, 4, 4, QSPI_IFR_WIDTH_QUAD_CMD }, { 4, 4, 4, QSPI_IFR_WIDTH_QUAD_CMD },
}; };
static inline bool is_compatible(const struct spi_mem_op *op, static inline bool atmel_qspi_is_compatible(const struct spi_mem_op *op,
const struct qspi_mode *mode) const struct atmel_qspi_mode *mode)
{ {
if (op->cmd.buswidth != mode->cmd_buswidth) if (op->cmd.buswidth != mode->cmd_buswidth)
return false; return false;
@ -190,12 +190,12 @@ static inline bool is_compatible(const struct spi_mem_op *op,
return true; return true;
} }
static int find_mode(const struct spi_mem_op *op) static int atmel_qspi_find_mode(const struct spi_mem_op *op)
{ {
u32 i; u32 i;
for (i = 0; i < ARRAY_SIZE(sama5d2_qspi_modes); i++) for (i = 0; i < ARRAY_SIZE(sama5d2_qspi_modes); i++)
if (is_compatible(op, &sama5d2_qspi_modes[i])) if (atmel_qspi_is_compatible(op, &sama5d2_qspi_modes[i]))
return i; return i;
return -1; return -1;
@ -204,7 +204,7 @@ static int find_mode(const struct spi_mem_op *op)
static bool atmel_qspi_supports_op(struct spi_mem *mem, static bool atmel_qspi_supports_op(struct spi_mem *mem,
const struct spi_mem_op *op) const struct spi_mem_op *op)
{ {
if (find_mode(op) < 0) if (atmel_qspi_find_mode(op) < 0)
return false; return false;
/* special case not supported by hardware */ /* special case not supported by hardware */
@ -236,7 +236,7 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
aq->mr = QSPI_MR_SMM; aq->mr = QSPI_MR_SMM;
} }
mode = find_mode(op); mode = atmel_qspi_find_mode(op);
if (mode < 0) if (mode < 0)
return -ENOTSUPP; return -ENOTSUPP;