spi: atmel-quadspi: fix naming scheme (1db6de22) · Commits · 戴 / test

drivers/spi/atmel-quadspi.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -158,14 +158,14 @@ struct atmel_qspi {
		struct completion cmd_completion;
		};

		struct qspi_mode {
		struct atmel_qspi_mode {
		u8 cmd_buswidth;
		u8 addr_buswidth;
		u8 data_buswidth;
		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, 2, QSPI_IFR_WIDTH_DUAL_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 },
		};

		static inline bool is_compatible(const struct spi_mem_op *op,
		const struct qspi_mode *mode)
		static inline bool atmel_qspi_is_compatible(const struct spi_mem_op *op,
		const struct atmel_qspi_mode *mode)
		{
		if (op->cmd.buswidth != mode->cmd_buswidth)
		return false;
		@@ -190,12 +190,12 @@ static inline bool is_compatible(const struct spi_mem_op *op,
		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;

		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 -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,
		const struct spi_mem_op *op)
		{
		if (find_mode(op) < 0)
		if (atmel_qspi_find_mode(op) < 0)
		return false;

		/* 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;
		}

		mode = find_mode(op);
		mode = atmel_qspi_find_mode(op);
		if (mode < 0)
		return -ENOTSUPP;

Admin message