[PATCH 1/4] spi: altera: remove unnecessary #ifdef CONFIG_OF

[PATCH 1/4] spi: altera: remove unnecessary #ifdef CONFIG_OF

[Jingoo Han]

Remove unnecessary #ifdef CONFIG_OF, because this is already
handled by the of_match_ptr macro.

Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
---
 drivers/spi/spi-altera.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 5b5709a5c957..588d428f47c8 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -268,14 +268,12 @@ static int altera_spi_remove(struct platform_device *dev)
 	return 0;
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id altera_spi_match[] = {
 	{ .compatible = "ALTR,spi-1.0", },
 	{ .compatible = "altr,spi-1.0", },
 	{},
 };
 MODULE_DEVICE_TABLE(of, altera_spi_match);
-#endif /* CONFIG_OF */
 
 static struct platform_driver altera_spi_driver = {
 	.probe = altera_spi_probe,
-- 
2.0.0


--
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

[PATCH 2/4] spi: atmel: remove unnecessary #if defined(CONFIG_OF)

[Jingoo Han]

Remove unnecessary  #if defined(CONFIG_OF), because this is
already handled by the of_match_ptr macro.

Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
---
 drivers/spi/spi-atmel.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 113c83f44b5c..9f5066fa1473 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1481,14 +1481,12 @@ static SIMPLE_DEV_PM_OPS(atmel_spi_pm_ops, atmel_spi_suspend, atmel_spi_resume);
 #define ATMEL_SPI_PM_OPS	NULL
 #endif
 
-#if defined(CONFIG_OF)
 static const struct of_device_id atmel_spi_dt_ids[] = {
 	{ .compatible = "atmel,at91rm9200-spi" },
 	{ /* sentinel */ }
 };
 
 MODULE_DEVICE_TABLE(of, atmel_spi_dt_ids);
-#endif
 
 static struct platform_driver atmel_spi_driver = {
 	.driver		= {
-- 
2.0.0


--
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/4] spi: atmel: remove unnecessary #if defined(CONFIG_OF)

[Nicolas Ferre]

On 02/09/2014 05:24, Jingoo Han :
> Remove unnecessary  #if defined(CONFIG_OF), because this is
> already handled by the of_match_ptr macro.
> 
> Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>

Ok:
Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>

> ---
>  drivers/spi/spi-atmel.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
> index 113c83f44b5c..9f5066fa1473 100644
> --- a/drivers/spi/spi-atmel.c
> +++ b/drivers/spi/spi-atmel.c
> @@ -1481,14 +1481,12 @@ static SIMPLE_DEV_PM_OPS(atmel_spi_pm_ops, atmel_spi_suspend, atmel_spi_resume);
>  #define ATMEL_SPI_PM_OPS	NULL
>  #endif
>  
> -#if defined(CONFIG_OF)
>  static const struct of_device_id atmel_spi_dt_ids[] = {
>  	{ .compatible = "atmel,at91rm9200-spi" },
>  	{ /* sentinel */ }
>  };
>  
>  MODULE_DEVICE_TABLE(of, atmel_spi_dt_ids);
> -#endif
>  
>  static struct platform_driver atmel_spi_driver = {
>  	.driver		= {
> 


-- 
Nicolas Ferre
--
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/4] spi: atmel: remove unnecessary #if defined(CONFIG_OF)

[Mark Brown]

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

On Tue, Sep 02, 2014 at 12:24:00PM +0900, Jingoo Han wrote:
> Remove unnecessary  #if defined(CONFIG_OF), because this is
> already handled by the of_match_ptr macro.

Applied, thanks.

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

Re: [PATCH 2/4] spi: atmel: remove unnecessary #if defined(CONFIG_OF)

[Geert Uytterhoeven]

On Tue, Sep 2, 2014 at 12:50 PM, Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:
> On Tue, Sep 02, 2014 at 12:24:00PM +0900, Jingoo Han wrote:
>> Remove unnecessary  #if defined(CONFIG_OF), because this is
>> already handled by the of_match_ptr macro.
>
> Applied, thanks.

If CONFIG_OF is not set, binary size is increased, as the OF match
table is still emitted, while it's no longer in use:

m68k allmodconfig:

   text   data    bss    dec    hex filename
   7318    373      0   7691   1e0b drivers/spi/spi-atmel.o.old
   7710    373      0   8083   1f93 drivers/spi/spi-atmel.o.new
  10037    781      0  10818   2a42 drivers/spi/spi-atmel.ko.old
  10465    781      0  11246   2bee drivers/spi/spi-atmel.ko.new

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/4] spi: atmel: remove unnecessary #if defined(CONFIG_OF)

[Mark Brown]

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

On Tue, Sep 02, 2014 at 02:15:09PM +0200, Geert Uytterhoeven wrote:
> On Tue, Sep 2, 2014 at 12:50 PM, Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:
> > On Tue, Sep 02, 2014 at 12:24:00PM +0900, Jingoo Han wrote:
> >> Remove unnecessary  #if defined(CONFIG_OF), because this is
> >> already handled by the of_match_ptr macro.

> > Applied, thanks.

> If CONFIG_OF is not set, binary size is increased, as the OF match
> table is still emitted, while it's no longer in use:

OK, I've discarded the series.

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

Re: [PATCH 2/4] spi: atmel: remove unnecessary #if defined(CONFIG_OF)

[Jingoo Han]

On Wednesday, September 03, 2014 1:37 AM, Mark Brown wrote:
> On Tue, Sep 02, 2014 at 02:15:09PM +0200, Geert Uytterhoeven wrote:
> > On Tue, Sep 2, 2014 at 12:50 PM, Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:
> > > On Tue, Sep 02, 2014 at 12:24:00PM +0900, Jingoo Han wrote:
> > >> Remove unnecessary  #if defined(CONFIG_OF), because this is
> > >> already handled by the of_match_ptr macro.
> 
> > > Applied, thanks.
> 
> > If CONFIG_OF is not set, binary size is increased, as the OF match
> > table is still emitted, while it's no longer in use:
> 
> OK, I've discarded the series.

(+cc Axel Lin, Max Filippov)

OK, I see. I appreciate Geert's feedback. :-)

However, personally I don't like #ifdef guards. I think that
#ifdef guards can be removed for the same binary, regardless
of kernel config options.

In this case, the binary size is more important than #ifdef guards,
right?

Best regards,
Jingoo Han

--
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/4] spi: atmel: remove unnecessary #if defined(CONFIG_OF)

[Mark Brown]

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

On Wed, Sep 03, 2014 at 10:25:02AM +0900, Jingoo Han wrote:

> However, personally I don't like #ifdef guards. I think that
> #ifdef guards can be removed for the same binary, regardless
> of kernel config options.

> In this case, the binary size is more important than #ifdef guards,
> right?

Right.  The ideal thing would be to teach the module table stuff to
disable itself when the relevant support isn't in the kernel but that's
probably going to be hard to do in a tasteful fashion; perhaps wrappers
(OF_MODULE_TABLE) might be OK.

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

[PATCH 3/4] spi: oc-tiny: remove unnecessary #ifdef CONFIG_OF

[Jingoo Han]

Remove unnecessary #ifdef CONFIG_OF, because this is already
handled by the of_match_ptr macro.

Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
---
 drivers/spi/spi-oc-tiny.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index 8998d11c7238..baac441fa6f6 100644
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -338,13 +338,11 @@ static int tiny_spi_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id tiny_spi_match[] = {
 	{ .compatible = "opencores,tiny-spi-rtlsvn2", },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tiny_spi_match);
-#endif /* CONFIG_OF */
 
 static struct platform_driver tiny_spi_driver = {
 	.probe = tiny_spi_probe,
-- 
2.0.0


--
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

[PATCH 4/4] spi: xtensa-xtfpga: remove unnecessary #ifdef CONFIG_OF

[Jingoo Han]

Remove unnecessary #ifdef CONFIG_OF, because this is already
handled by the of_match_ptr macro.

Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
---
 drivers/spi/spi-xtensa-xtfpga.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/spi/spi-xtensa-xtfpga.c b/drivers/spi/spi-xtensa-xtfpga.c
index 41e158187f9d..553b5e189273 100644
--- a/drivers/spi/spi-xtensa-xtfpga.c
+++ b/drivers/spi/spi-xtensa-xtfpga.c
@@ -146,13 +146,11 @@ static int xtfpga_spi_remove(struct platform_device *pdev)
 
 MODULE_ALIAS("platform:" XTFPGA_SPI_NAME);
 
-#ifdef CONFIG_OF
 static const struct of_device_id xtfpga_spi_of_match[] = {
 	{ .compatible = "cdns,xtfpga-spi", },
 	{}
 };
 MODULE_DEVICE_TABLE(of, xtfpga_spi_of_match);
-#endif
 
 static struct platform_driver xtfpga_spi_driver = {
 	.probe = xtfpga_spi_probe,
-- 
2.0.0


--
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 4/4] spi: xtensa-xtfpga: remove unnecessary #ifdef CONFIG_OF

[Max Filippov]

On Tue, Sep 2, 2014 at 7:26 AM, Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> wrote:
> Remove unnecessary #ifdef CONFIG_OF, because this is already
> handled by the of_match_ptr macro.
>
> Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
> ---
>  drivers/spi/spi-xtensa-xtfpga.c | 2 --
>  1 file changed, 2 deletions(-)

Acked-by: Max Filippov <jcmvbkbc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

-- 
Thanks.
-- Max
--
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 4/4] spi: xtensa-xtfpga: remove unnecessary #ifdef CONFIG_OF

[Mark Brown]

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

On Tue, Sep 02, 2014 at 12:26:02PM +0900, Jingoo Han wrote:
> Remove unnecessary #ifdef CONFIG_OF, because this is already
> handled by the of_match_ptr macro.

Applied, thanks.

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

Re: [PATCH 1/4] spi: altera: remove unnecessary #ifdef CONFIG_OF

[Axel Lin]

2014-09-02 11:22 GMT+08:00 Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>:
> Remove unnecessary #ifdef CONFIG_OF, because this is already
> handled by the of_match_ptr macro.
>
> Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
> ---
>  drivers/spi/spi-altera.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
> index 5b5709a5c957..588d428f47c8 100644
> --- a/drivers/spi/spi-altera.c
> +++ b/drivers/spi/spi-altera.c
> @@ -268,14 +268,12 @@ static int altera_spi_remove(struct platform_device *dev)
>         return 0;
>  }
>
> -#ifdef CONFIG_OF
>  static const struct of_device_id altera_spi_match[] = {
>         { .compatible = "ALTR,spi-1.0", },
>         { .compatible = "altr,spi-1.0", },
>         {},
>  };
>  MODULE_DEVICE_TABLE(of, altera_spi_match);
> -#endif /* CONFIG_OF */

For !CONFIG_OF case:
        #define of_match_ptr(_ptr)      NULL
Can you explain how of_match_ptr() handle this?

Thanks,
Axel
--
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/4] spi: altera: remove unnecessary #ifdef CONFIG_OF

[Mark Brown]

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

On Tue, Sep 02, 2014 at 01:34:39PM +0800, Axel Lin wrote:

> > -#ifdef CONFIG_OF
> >  static const struct of_device_id altera_spi_match[] = {
> >         { .compatible = "ALTR,spi-1.0", },
> >         { .compatible = "altr,spi-1.0", },
> >         {},
> >  };
> >  MODULE_DEVICE_TABLE(of, altera_spi_match);
> > -#endif /* CONFIG_OF */

> For !CONFIG_OF case:
>         #define of_match_ptr(_ptr)      NULL
> Can you explain how of_match_ptr() handle this?

Unless MODULE_DEVICE_TABLE knows about OF that's not going to trigger
the dead code elimination.

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