[PATCH 1/2] spi: rspi: Remove obsolete rspi-rz platform_device_id entry

[PATCH 1/2] spi: rspi: Remove obsolete rspi-rz platform_device_id entry

[Geert Uytterhoeven]

Since commit 05104c266ae9a167 ("ARM: shmobile: r7s72100: genmai: Remove
legacy board file"), r7s72100 is only supported in generic DT-only ARM
multi-platform builds.  The driver doesn't need to match platform
devices by name anymore, hence remove the corresponding
platform_device_id entry.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/spi/spi-rspi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index f9189a0c8cec81f2..56216b205e0f2c34 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -1295,7 +1295,6 @@ error1:
 
 static const struct platform_device_id spi_driver_ids[] = {
 	{ "rspi",	(kernel_ulong_t)&rspi_ops },
-	{ "rspi-rz",	(kernel_ulong_t)&rspi_rz_ops },
 	{ "qspi",	(kernel_ulong_t)&qspi_ops },
 	{},
 };
-- 
1.9.1

[PATCH 2/2] spi: rspi: Remove obsolete qspi platform_device_id entry

[Geert Uytterhoeven]

Since commit a483dcbfa21f919c ("ARM: shmobile: lager: Remove legacy
board support"), R-Car Gen2 SoCs are only supported in generic DT-only
ARM multi-platform builds.  The driver doesn't need to match platform
devices by name anymore, hence remove the corresponding
platform_device_id entry.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/spi/spi-rspi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 56216b205e0f2c34..3e82b84c9ed48b2f 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -1295,7 +1295,6 @@ error1:
 
 static const struct platform_device_id spi_driver_ids[] = {
 	{ "rspi",	(kernel_ulong_t)&rspi_ops },
-	{ "qspi",	(kernel_ulong_t)&qspi_ops },
 	{},
 };
 
-- 
1.9.1

Re: [PATCH 2/2] spi: rspi: Remove obsolete qspi platform_device_id entry

[Simon Horman]

On Tue, Jun 23, 2015 at 03:02:07PM +0200, Geert Uytterhoeven wrote:
> Since commit a483dcbfa21f919c ("ARM: shmobile: lager: Remove legacy
> board support"), R-Car Gen2 SoCs are only supported in generic DT-only
> ARM multi-platform builds.  The driver doesn't need to match platform
> devices by name anymore, hence remove the corresponding
> platform_device_id entry.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Simon Horman <horms+renesas@verge.net.au>

> ---
>  drivers/spi/spi-rspi.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
> index 56216b205e0f2c34..3e82b84c9ed48b2f 100644
> --- a/drivers/spi/spi-rspi.c
> +++ b/drivers/spi/spi-rspi.c
> @@ -1295,7 +1295,6 @@ error1:
>  
>  static const struct platform_device_id spi_driver_ids[] = {
>  	{ "rspi",	(kernel_ulong_t)&rspi_ops },
> -	{ "qspi",	(kernel_ulong_t)&qspi_ops },
>  	{},
>  };
>  
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 2/2] spi: rspi: Remove obsolete qspi platform_device_id entry

[Geert Uytterhoeven]

On Tue, Jun 23, 2015 at 3:02 PM, Geert Uytterhoeven
<geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> wrote:
> Since commit a483dcbfa21f919c ("ARM: shmobile: lager: Remove legacy
> board support"), R-Car Gen2 SoCs are only supported in generic DT-only
> ARM multi-platform builds.  The driver doesn't need to match platform
> devices by name anymore, hence remove the corresponding
> platform_device_id entry.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
> ---
>  drivers/spi/spi-rspi.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
> index 56216b205e0f2c34..3e82b84c9ed48b2f 100644
> --- a/drivers/spi/spi-rspi.c
> +++ b/drivers/spi/spi-rspi.c
> @@ -1295,7 +1295,6 @@ error1:
>
>  static const struct platform_device_id spi_driver_ids[] = {
>         { "rspi",       (kernel_ulong_t)&rspi_ops },
> -       { "qspi",       (kernel_ulong_t)&qspi_ops },
>         {},
>  };

qspi_ops is still used for DT matching, but rspi_of_match[] is protected
by #ifdef CONFIG_OF, so this may lead to compiler warnings.

Please drop this one, will fix.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] spi: rspi: Remove obsolete qspi platform_device_id entry

[Geert Uytterhoeven]

On Wed, Jun 24, 2015 at 10:01 AM, Geert Uytterhoeven
<geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> wrote:
> On Tue, Jun 23, 2015 at 3:02 PM, Geert Uytterhoeven
> <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> wrote:
>> Since commit a483dcbfa21f919c ("ARM: shmobile: lager: Remove legacy
>> board support"), R-Car Gen2 SoCs are only supported in generic DT-only
>> ARM multi-platform builds.  The driver doesn't need to match platform
>> devices by name anymore, hence remove the corresponding
>> platform_device_id entry.
>>
>> Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
>> ---
>>  drivers/spi/spi-rspi.c | 1 -
>>  1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
>> index 56216b205e0f2c34..3e82b84c9ed48b2f 100644
>> --- a/drivers/spi/spi-rspi.c
>> +++ b/drivers/spi/spi-rspi.c
>> @@ -1295,7 +1295,6 @@ error1:
>>
>>  static const struct platform_device_id spi_driver_ids[] = {
>>         { "rspi",       (kernel_ulong_t)&rspi_ops },
>> -       { "qspi",       (kernel_ulong_t)&qspi_ops },
>>         {},
>>  };
>
> qspi_ops is still used for DT matching, but rspi_of_match[] is protected
> by #ifdef CONFIG_OF, so this may lead to compiler warnings.

(same as rspi_rz_ops)

Unlike the sh_eth case, I don't get a warning if CONFIG_OF=n, because
qspi_ops is const. Not even with a picky gcc 4.1.2.

> Please drop this one, will fix.

And unlike the sh_eth case, this cannot be fixed with one #ifdef without
restructuring the whole driver.

Hence I'm inclined to withdraw my drop requst.
Mark, what do you think? Is this patch OK as-is?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] spi: rspi: Remove obsolete rspi-rz platform_device_id entry

[Simon Horman]

On Tue, Jun 23, 2015 at 03:02:06PM +0200, Geert Uytterhoeven wrote:
> Since commit 05104c266ae9a167 ("ARM: shmobile: r7s72100: genmai: Remove
> legacy board file"), r7s72100 is only supported in generic DT-only ARM
> multi-platform builds.  The driver doesn't need to match platform
> devices by name anymore, hence remove the corresponding
> platform_device_id entry.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Simon Horman <horms+renesas@verge.net.au>

> ---
>  drivers/spi/spi-rspi.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
> index f9189a0c8cec81f2..56216b205e0f2c34 100644
> --- a/drivers/spi/spi-rspi.c
> +++ b/drivers/spi/spi-rspi.c
> @@ -1295,7 +1295,6 @@ error1:
>  
>  static const struct platform_device_id spi_driver_ids[] = {
>  	{ "rspi",	(kernel_ulong_t)&rspi_ops },
> -	{ "rspi-rz",	(kernel_ulong_t)&rspi_rz_ops },
>  	{ "qspi",	(kernel_ulong_t)&qspi_ops },
>  	{},
>  };
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 1/2] spi: rspi: Remove obsolete rspi-rz platform_device_id entry

[Geert Uytterhoeven]

On Tue, Jun 23, 2015 at 3:02 PM, Geert Uytterhoeven
<geert+renesas@glider.be> wrote:
> Since commit 05104c266ae9a167 ("ARM: shmobile: r7s72100: genmai: Remove
> legacy board file"), r7s72100 is only supported in generic DT-only ARM
> multi-platform builds.  The driver doesn't need to match platform
> devices by name anymore, hence remove the corresponding
> platform_device_id entry.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  drivers/spi/spi-rspi.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
> index f9189a0c8cec81f2..56216b205e0f2c34 100644
> --- a/drivers/spi/spi-rspi.c
> +++ b/drivers/spi/spi-rspi.c
> @@ -1295,7 +1295,6 @@ error1:
>
>  static const struct platform_device_id spi_driver_ids[] = {
>         { "rspi",       (kernel_ulong_t)&rspi_ops },
> -       { "rspi-rz",    (kernel_ulong_t)&rspi_rz_ops },
>         { "qspi",       (kernel_ulong_t)&qspi_ops },
>         {},
>  };

rspi_rz_ops is still used for DT matching, but rspi_of_match[] is protected
by #ifdef CONFIG_OF, so this may lead to compiler warnings.

Please drop this one, will fix.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 1/2] spi: rspi: Remove obsolete rspi-rz platform_device_id entry

[Geert Uytterhoeven]

On Wed, Jun 24, 2015 at 10:01 AM, Geert Uytterhoeven
<geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> wrote:
> On Tue, Jun 23, 2015 at 3:02 PM, Geert Uytterhoeven
> <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> wrote:
>> Since commit 05104c266ae9a167 ("ARM: shmobile: r7s72100: genmai: Remove
>> legacy board file"), r7s72100 is only supported in generic DT-only ARM
>> multi-platform builds.  The driver doesn't need to match platform
>> devices by name anymore, hence remove the corresponding
>> platform_device_id entry.
>>
>> Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
>> ---
>>  drivers/spi/spi-rspi.c | 1 -
>>  1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
>> index f9189a0c8cec81f2..56216b205e0f2c34 100644
>> --- a/drivers/spi/spi-rspi.c
>> +++ b/drivers/spi/spi-rspi.c
>> @@ -1295,7 +1295,6 @@ error1:
>>
>>  static const struct platform_device_id spi_driver_ids[] = {
>>         { "rspi",       (kernel_ulong_t)&rspi_ops },
>> -       { "rspi-rz",    (kernel_ulong_t)&rspi_rz_ops },
>>         { "qspi",       (kernel_ulong_t)&qspi_ops },
>>         {},
>>  };
>
> rspi_rz_ops is still used for DT matching, but rspi_of_match[] is protected
> by #ifdef CONFIG_OF, so this may lead to compiler warnings.

Unlike the sh_eth case, I don't get a warning if CONFIG_OF=n, because
rspi_rz_ops is const. Not even with a picky gcc 4.1.2.

> Please drop this one, will fix.

And unlike the sh_eth case, this cannot be fixed with one #ifdef without
restructuring the whole driver.

Hence inclined to withdraw my drop requst.
Mark, what do you think? Is this patch OK as-is?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] spi: rspi: Remove obsolete rspi-rz platform_device_id entry

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 579 bytes --]

On Wed, Jun 24, 2015 at 11:19:09AM +0200, Geert Uytterhoeven wrote:

> Unlike the sh_eth case, I don't get a warning if CONFIG_OF=n, because
> rspi_rz_ops is const. Not even with a picky gcc 4.1.2.

OTOH what's 4.2 going to do, or clang...  

> > Please drop this one, will fix.

> And unlike the sh_eth case, this cannot be fixed with one #ifdef without
> restructuring the whole driver.

> Hence inclined to withdraw my drop requst.
> Mark, what do you think? Is this patch OK as-is?

Given that it's only removing one line I'm not sure it's worth the
effort.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]