android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: imx: Remove "maybe_unused" attributes

Browse Source 
The SPI-driver no longer contains the conditions for various CPUs, so
"maybe_unused" attributes is no longer needed.
This patch removes these attributes.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Alexander Shiyan 2016-06-08 20:02:08 +03:00 committed by Mark Brown
parent c0c7a5d796
commit f989bc6958
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/spi/spi-imx.c
View File

@ -309,7 +309,7 @@ static unsigned int mx51_ecspi_clkdiv(struct spi_imx_data *spi_imx,
(post << MX51_ECSPI_CTRL_POSTDIV_OFFSET); (post << MX51_ECSPI_CTRL_POSTDIV_OFFSET);
} }
static void __maybe_unused mx51_ecspi_intctrl(struct spi_imx_data *spi_imx, int enable) static void mx51_ecspi_intctrl(struct spi_imx_data *spi_imx, int enable)
{ {
unsigned val = 0; unsigned val = 0;
@ -322,7 +322,7 @@ static void __maybe_unused mx51_ecspi_intctrl(struct spi_imx_data *spi_imx, int
writel(val, spi_imx->base + MX51_ECSPI_INT); writel(val, spi_imx->base + MX51_ECSPI_INT);
} }
static void __maybe_unused mx51_ecspi_trigger(struct spi_imx_data *spi_imx) static void mx51_ecspi_trigger(struct spi_imx_data *spi_imx)
{ {
u32 reg; u32 reg;
@ -331,8 +331,8 @@ static void __maybe_unused mx51_ecspi_trigger(struct spi_imx_data *spi_imx)
writel(reg, spi_imx->base + MX51_ECSPI_CTRL); writel(reg, spi_imx->base + MX51_ECSPI_CTRL);
} }
static int __maybe_unused mx51_ecspi_config(struct spi_device *spi, static int mx51_ecspi_config(struct spi_device *spi,
struct spi_imx_config *config) struct spi_imx_config *config)
{ {
struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master); struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master);
u32 ctrl = MX51_ECSPI_CTRL_ENABLE; u32 ctrl = MX51_ECSPI_CTRL_ENABLE;
@ -422,12 +422,12 @@ static int __maybe_unused mx51_ecspi_config(struct spi_device *spi,
return 0; return 0;
} }
static int __maybe_unused mx51_ecspi_rx_available(struct spi_imx_data *spi_imx) static int mx51_ecspi_rx_available(struct spi_imx_data *spi_imx)
{ {
return readl(spi_imx->base + MX51_ECSPI_STAT) & MX51_ECSPI_STAT_RR; return readl(spi_imx->base + MX51_ECSPI_STAT) & MX51_ECSPI_STAT_RR;
} }
static void __maybe_unused mx51_ecspi_reset(struct spi_imx_data *spi_imx) static void mx51_ecspi_reset(struct spi_imx_data *spi_imx)
{ {
/* drain receive buffer */ /* drain receive buffer */
while (mx51_ecspi_rx_available(spi_imx)) while (mx51_ecspi_rx_available(spi_imx))
@ -457,7 +457,7 @@ static void __maybe_unused mx51_ecspi_reset(struct spi_imx_data *spi_imx)
* the i.MX35 has a slightly different register layout for bits * the i.MX35 has a slightly different register layout for bits
* we do not use here. * we do not use here.
*/ */
static void __maybe_unused mx31_intctrl(struct spi_imx_data *spi_imx, int enable) static void mx31_intctrl(struct spi_imx_data *spi_imx, int enable)
{ {
unsigned int val = 0; unsigned int val = 0;
@ -469,7 +469,7 @@ static void __maybe_unused mx31_intctrl(struct spi_imx_data *spi_imx, int enable
writel(val, spi_imx->base + MXC_CSPIINT); writel(val, spi_imx->base + MXC_CSPIINT);
} }
static void __maybe_unused mx31_trigger(struct spi_imx_data *spi_imx) static void mx31_trigger(struct spi_imx_data *spi_imx)
{ {
unsigned int reg; unsigned int reg;
@ -478,8 +478,7 @@ static void __maybe_unused mx31_trigger(struct spi_imx_data *spi_imx)
writel(reg, spi_imx->base + MXC_CSPICTRL); writel(reg, spi_imx->base + MXC_CSPICTRL);
} }
static int __maybe_unused mx31_config(struct spi_device *spi, static int mx31_config(struct spi_device *spi, struct spi_imx_config *config)
struct spi_imx_config *config)
{ {
struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master); struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master);
unsigned int reg = MX31_CSPICTRL_ENABLE | MX31_CSPICTRL_MASTER; unsigned int reg = MX31_CSPICTRL_ENABLE | MX31_CSPICTRL_MASTER;
@ -510,12 +509,12 @@ static int __maybe_unused mx31_config(struct spi_device *spi,
return 0; return 0;
} }
static int __maybe_unused mx31_rx_available(struct spi_imx_data *spi_imx) static int mx31_rx_available(struct spi_imx_data *spi_imx)
{ {
return readl(spi_imx->base + MX31_CSPISTATUS) & MX31_STATUS_RR; return readl(spi_imx->base + MX31_CSPISTATUS) & MX31_STATUS_RR;
} }
static void __maybe_unused mx31_reset(struct spi_imx_data *spi_imx) static void mx31_reset(struct spi_imx_data *spi_imx)
{ {
/* drain receive buffer */ /* drain receive buffer */
while (readl(spi_imx->base + MX31_CSPISTATUS) & MX31_STATUS_RR) while (readl(spi_imx->base + MX31_CSPISTATUS) & MX31_STATUS_RR)
@ -535,7 +534,7 @@ static void __maybe_unused mx31_reset(struct spi_imx_data *spi_imx)
#define MX21_CSPICTRL_DR_SHIFT 14 #define MX21_CSPICTRL_DR_SHIFT 14
#define MX21_CSPICTRL_CS_SHIFT 19 #define MX21_CSPICTRL_CS_SHIFT 19
static void __maybe_unused mx21_intctrl(struct spi_imx_data *spi_imx, int enable) static void mx21_intctrl(struct spi_imx_data *spi_imx, int enable)
{ {
unsigned int val = 0; unsigned int val = 0;
@ -547,7 +546,7 @@ static void __maybe_unused mx21_intctrl(struct spi_imx_data *spi_imx, int enable
writel(val, spi_imx->base + MXC_CSPIINT); writel(val, spi_imx->base + MXC_CSPIINT);
} }
static void __maybe_unused mx21_trigger(struct spi_imx_data *spi_imx) static void mx21_trigger(struct spi_imx_data *spi_imx)
{ {
unsigned int reg; unsigned int reg;
@ -556,8 +555,7 @@ static void __maybe_unused mx21_trigger(struct spi_imx_data *spi_imx)
writel(reg, spi_imx->base + MXC_CSPICTRL); writel(reg, spi_imx->base + MXC_CSPICTRL);
} }
static int __maybe_unused mx21_config(struct spi_device *spi, static int mx21_config(struct spi_device *spi, struct spi_imx_config *config)
struct spi_imx_config *config)
{ {
struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master); struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master);
unsigned int reg = MX21_CSPICTRL_ENABLE | MX21_CSPICTRL_MASTER; unsigned int reg = MX21_CSPICTRL_ENABLE | MX21_CSPICTRL_MASTER;
@ -581,12 +579,12 @@ static int __maybe_unused mx21_config(struct spi_device *spi,
return 0; return 0;
} }
static int __maybe_unused mx21_rx_available(struct spi_imx_data *spi_imx) static int mx21_rx_available(struct spi_imx_data *spi_imx)
{ {
return readl(spi_imx->base + MXC_CSPIINT) & MX21_INTREG_RR; return readl(spi_imx->base + MXC_CSPIINT) & MX21_INTREG_RR;
} }
static void __maybe_unused mx21_reset(struct spi_imx_data *spi_imx) static void mx21_reset(struct spi_imx_data *spi_imx)
{ {
writel(1, spi_imx->base + MXC_RESET); writel(1, spi_imx->base + MXC_RESET);
} }
@ -602,7 +600,7 @@ static void __maybe_unused mx21_reset(struct spi_imx_data *spi_imx)
#define MX1_CSPICTRL_MASTER (1 << 10) #define MX1_CSPICTRL_MASTER (1 << 10)
#define MX1_CSPICTRL_DR_SHIFT 13 #define MX1_CSPICTRL_DR_SHIFT 13
static void __maybe_unused mx1_intctrl(struct spi_imx_data *spi_imx, int enable) static void mx1_intctrl(struct spi_imx_data *spi_imx, int enable)
{ {
unsigned int val = 0; unsigned int val = 0;
@ -614,7 +612,7 @@ static void __maybe_unused mx1_intctrl(struct spi_imx_data *spi_imx, int enable)
writel(val, spi_imx->base + MXC_CSPIINT); writel(val, spi_imx->base + MXC_CSPIINT);
} }
static void __maybe_unused mx1_trigger(struct spi_imx_data *spi_imx) static void mx1_trigger(struct spi_imx_data *spi_imx)
{ {
unsigned int reg; unsigned int reg;
@ -623,8 +621,7 @@ static void __maybe_unused mx1_trigger(struct spi_imx_data *spi_imx)
writel(reg, spi_imx->base + MXC_CSPICTRL); writel(reg, spi_imx->base + MXC_CSPICTRL);
} }
static int __maybe_unused mx1_config(struct spi_device *spi, static int mx1_config(struct spi_device *spi, struct spi_imx_config *config)
struct spi_imx_config *config)
{ {
struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master); struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master);
unsigned int reg = MX1_CSPICTRL_ENABLE | MX1_CSPICTRL_MASTER; unsigned int reg = MX1_CSPICTRL_ENABLE | MX1_CSPICTRL_MASTER;
@ -643,12 +640,12 @@ static int __maybe_unused mx1_config(struct spi_device *spi,
return 0; return 0;
} }
static int __maybe_unused mx1_rx_available(struct spi_imx_data *spi_imx) static int mx1_rx_available(struct spi_imx_data *spi_imx)
{ {
return readl(spi_imx->base + MXC_CSPIINT) & MX1_INTREG_RR; return readl(spi_imx->base + MXC_CSPIINT) & MX1_INTREG_RR;
} }
static void __maybe_unused mx1_reset(struct spi_imx_data *spi_imx) static void mx1_reset(struct spi_imx_data *spi_imx)
{ {
writel(1, spi_imx->base + MXC_RESET); writel(1, spi_imx->base + MXC_RESET);
} }