Blackfin: bf537: rename "CONFIG_AD7314"

[linux.git] / arch / blackfin / mach-bf537 / boards / stamp.c

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 44fd1d4682ac3f3e411acfcf728cb74011f163d4..de2187f40f0231d9b254a3630b9954bc3bf983bb 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -655,13 +655,13 @@ static struct bfin5xx_spi_chip ad2s90_spi_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_AD2S120X) || defined(CONFIG_AD2S120X_MODULE)
-static unsigned short ad2s120x_platform_data[] = {
+#if IS_ENABLED(CONFIG_AD2S1200)
+static unsigned short ad2s1200_platform_data[] = {
        /* used as SAMPLE and RDVEL */
        GPIO_PF5, GPIO_PF6, 0
 };
 
-static struct bfin5xx_spi_chip ad2s120x_spi_chip_info = {
+static struct bfin5xx_spi_chip ad2s1200_spi_chip_info = {
        .enable_dma = 0,
 };
 #endif
@@ -682,7 +682,7 @@ static struct bfin5xx_spi_chip ad2s1210_spi_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_AD7314)
 static struct bfin5xx_spi_chip ad7314_spi_chip_info = {
        .enable_dma = 0,
 };
@@ -986,7 +986,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
        },
 #endif
 
-#if defined(CONFIG_SND_SOC_ADAV80X) || defined(CONFIG_SND_SOC_ADV80X_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_ADAV80X)
        {
                .modalias = "adav801",
                .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -1019,13 +1019,13 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
        },
 #endif
 
-#if defined(CONFIG_AD2S120X) || defined(CONFIG_AD2S120X_MODULE)
+#if IS_ENABLED(CONFIG_AD2S1200)
        {
-               .modalias = "ad2s120x",
+               .modalias = "ad2s1200",
                .bus_num = 0,
                .chip_select = 4,            /* CS, change it for your board */
-               .platform_data = ad2s120x_platform_data,
-               .controller_data = &ad2s120x_spi_chip_info,
+               .platform_data = ad2s1200_platform_data,
+               .controller_data = &ad2s1200_spi_chip_info,
        },
 #endif
 
@@ -1040,7 +1040,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
        },
 #endif
 
-#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_AD7314)
        {
                .modalias = "ad7314",
                .max_speed_hz = 1000000,