[PATCH] Blackfin: bf537: rename ad2s120x ->ad2s1200

[PATCH] Blackfin: bf537: rename ad2s120x ->ad2s1200

[Paul Bolle]

In v3.2 the Analog Devices ad2s1200/ad2s1205 driver was renamed from
ad2s120x to ad2s1200. But it apparently forgot to rename the references
to this driver in the BF537-STAMP code. Rename these now, and use the
IS_ENABLED() macro, while we're at it.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
0) Also untested. The ".modalias" change is educated guesswork.

1) See commit 10e4a52b6e471cea2e87e71f8708a8c8c6b75266
("staging:iio:resolver rename ad2s120x ->ad2s1200") for the commit that
started all this.

 arch/blackfin/mach-bf537/boards/stamp.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 9735345..e6fdc2a 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -654,13 +654,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
@@ -1018,13 +1018,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
 
-- 
1.7.11.7

Re: [PATCH] Blackfin: bf537: rename ad2s120x ->ad2s1200

[Paul Bolle]

[Replaced previous maintainer and list with current maintainer and
list.]

On Thu, 2013-04-04 at 13:02 +0200, Paul Bolle wrote:
> In v3.2 the Analog Devices ad2s1200/ad2s1205 driver was renamed from
> ad2s120x to ad2s1200. But it apparently forgot to rename the references
> to this driver in the BF537-STAMP code. Rename these now, and use the
> IS_ENABLED() macro, while we're at it.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>

This issue is also still present in v3.14-rc2. Can someone please have a
look at this patch?

> 0) Also untested. The ".modalias" change is educated guesswork.
> 
> 1) See commit 10e4a52b6e471cea2e87e71f8708a8c8c6b75266
> ("staging:iio:resolver rename ad2s120x ->ad2s1200") for the commit that
> started all this.
> 
>  arch/blackfin/mach-bf537/boards/stamp.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
> index 9735345..e6fdc2a 100644
> --- a/arch/blackfin/mach-bf537/boards/stamp.c
> +++ b/arch/blackfin/mach-bf537/boards/stamp.c
> @@ -654,13 +654,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
> @@ -1018,13 +1018,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
>  

This should be the last Kconfig related issue that I reported last year,
but was never fixed. I'm haven't checked what else lurks in blackfin.
Let's first see how these issues get resolved.

Thanks,


Paul Bolle