diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-09 10:06:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-09 10:06:21 +0100 |
| commit | c68acd82f680364d56c5dae7469326545d00012a (patch) | |
| tree | a5c530bfac3d2c6257fc173bd91aabbd2a467d91 | |
| parent | 8559a7a85f46a83c5a28eeb82e9a4e392c82d825 (diff) | |
| download | barebox-c68acd82f680364d56c5dae7469326545d00012a.tar.gz barebox-c68acd82f680364d56c5dae7469326545d00012a.tar.xz | |
spi: imx: Use IS_ENABLED to drop ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/spi/imx_spi.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index 80655a72c1..a1b91a9329 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -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; |