sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

spi: imx: Use IS_ENABLED to drop ifdefs 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-02-09 10:06:21 +01:00
parent 8559a7a85f
commit c68acd82f6
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/spi/imx_spi.c
View File

@ -136,7 +136,6 @@ static int imx_spi_setup(struct spi_device *spi)
return 0;
}
#ifdef CONFIG_DRIVER_SPI_IMX_0_0
static unsigned int cspi_0_0_xchg_single(struct imx_spi *imx, unsigned int data)
{
void __iomem *base = imx->regs;
@ -206,9 +205,7 @@ static void cspi_0_0_init(struct imx_spi *imx)
readl(base + CSPI_0_0_RXDATA);
writel(0, base + CSPI_0_0_INT);
}
#endif
#ifdef CONFIG_DRIVER_SPI_IMX_0_7
static unsigned int cspi_0_7_xchg_single(struct imx_spi *imx, unsigned int data)
{
void __iomem *base = imx->regs;
@ -289,9 +286,7 @@ static void cspi_0_7_init(struct imx_spi *imx)
while (readl(base + CSPI_0_7_STAT) & CSPI_0_7_STAT_RR)
readl(base + CSPI_0_7_RXDATA);
}
#endif
#ifdef CONFIG_DRIVER_SPI_IMX_2_3
static unsigned int cspi_2_3_xchg_single(struct imx_spi *imx, unsigned int data)
{
void __iomem *base = imx->regs;
@ -393,7 +388,6 @@ static void cspi_2_3_chipselect(struct spi_device *spi, int is_active)
static void cspi_2_3_init(struct imx_spi *imx)
{
}
#endif
static void imx_spi_do_transfer(struct spi_device *spi, struct spi_transfer *t)
{
@ -452,29 +446,23 @@ static int imx_spi_transfer(struct spi_device *spi, struct spi_message *mesg)
return 0;
}
#ifdef CONFIG_DRIVER_SPI_IMX_0_0
static struct spi_imx_devtype_data spi_imx_devtype_data_0_0 = {
.chipselect = cspi_0_0_chipselect,
.xchg_single = cspi_0_0_xchg_single,
.init = cspi_0_0_init,
};
#endif
#ifdef CONFIG_DRIVER_SPI_IMX_0_7
static struct spi_imx_devtype_data spi_imx_devtype_data_0_7 = {
.chipselect = cspi_0_7_chipselect,
.xchg_single = cspi_0_7_xchg_single,
.init = cspi_0_7_init,
};
#endif
#ifdef CONFIG_DRIVER_SPI_IMX_2_3
static struct spi_imx_devtype_data spi_imx_devtype_data_2_3 = {
.chipselect = cspi_2_3_chipselect,
.xchg_single = cspi_2_3_xchg_single,
.init = cspi_2_3_init,
};
#endif
static int imx_spi_dt_probe(struct imx_spi *imx)
{
@ -531,18 +519,17 @@ static int imx_spi_probe(struct device_d *dev)
goto err_free;
}
#ifdef CONFIG_DRIVER_SPI_IMX_0_0
if (cpu_is_mx27())
if (IS_ENABLED(CONFIG_DRIVER_SPI_IMX_0_0) && cpu_is_mx27())
devdata = &spi_imx_devtype_data_0_0;
#endif
#ifdef CONFIG_DRIVER_SPI_IMX_0_7
if (cpu_is_mx25() || cpu_is_mx35())
if (IS_ENABLED(CONFIG_DRIVER_SPI_IMX_0_0) &&
(cpu_is_mx25() || cpu_is_mx35()))
devdata = &spi_imx_devtype_data_0_7;
#endif
#ifdef CONFIG_DRIVER_SPI_IMX_2_3
if (cpu_is_mx51() || cpu_is_mx53() || cpu_is_mx6())
if (IS_ENABLED(CONFIG_DRIVER_SPI_IMX_2_3) &&
(cpu_is_mx51() || cpu_is_mx53() || cpu_is_mx6()))
devdata = &spi_imx_devtype_data_2_3;
#endif
imx->chipselect = devdata->chipselect;
imx->xchg_single = devdata->xchg_single;
imx->init = devdata->init;