[PATCH v3 11/14] omap: mailbox: only compile for configured archs

[Hiroshi DOYU]

From: ext Felipe Contreras <felipe.contreras at gmail.com>
Subject: [PATCH v3 11/14] omap: mailbox: only compile for configured archs
Date: Sat, 22 May 2010 19:14:22 +0200

> Signed-off-by: Felipe Contreras <felipe.contreras at gmail.com>
> ---
>  arch/arm/mach-omap2/mailbox.c |   14 ++++++++++++--
>  1 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
> index f55fa84..1f0c5cd 100644
> --- a/arch/arm/mach-omap2/mailbox.c
> +++ b/arch/arm/mach-omap2/mailbox.c
> @@ -286,6 +286,7 @@ static struct omap_mbox_ops omap2_mbox_ops = {
>  
>  /* FIXME: the following structs should be filled automatically by the user id */
>  
> +#if defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_ARCH_OMAP2420)
>  /* DSP */
>  static struct omap_mbox2_priv omap2_mbox_dsp_priv = {
>  	.tx_fifo = {
> @@ -308,11 +309,13 @@ struct omap_mbox mbox_dsp_info = {
>  	.ops	= &omap2_mbox_ops,
>  	.priv	= &omap2_mbox_dsp_priv,
>  };
> +#endif
>  
> +#if defined(CONFIG_ARCH_OMAP3430)
>  struct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info, NULL };
> +#endif
>  
>  #if defined(CONFIG_ARCH_OMAP2420)
> -
>  /* IVA */
>  static struct omap_mbox2_priv omap2_mbox_iva_priv = {
>  	.tx_fifo = {
> @@ -339,6 +342,7 @@ static struct omap_mbox mbox_iva_info = {
>  struct omap_mbox *omap2_mboxes[] = { &mbox_iva_info, &mbox_dsp_info, NULL };
>  #endif
>  
> +#if defined(CONFIG_ARCH_OMAP4)
>  /* OMAP4 */
>  static struct omap_mbox2_priv omap2_mbox_1_priv = {
>  	.tx_fifo = {
> @@ -385,6 +389,7 @@ struct omap_mbox mbox_2_info = {
>  };
>  
>  struct omap_mbox *omap4_mboxes[] = { &mbox_1_info, &mbox_2_info, NULL };
> +#endif
>  
>  static int __devinit omap2_mbox_probe(struct platform_device *pdev)
>  {
> @@ -394,11 +399,14 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
>  
>  	res = pdev->resource;
>  
> -	if (cpu_is_omap3430()) {
> +	if (false);

nitpcik:
The above may look better as below:

	if (false)
		;

"checkpatch.pl" also doesn't complain.

> +#if defined(CONFIG_ARCH_OMAP3430)
> +	else if (cpu_is_omap3430()) {
>  		list = omap3_mboxes;
>  
>  		list[0]->irq = platform_get_irq_byname(pdev, "dsp");
>  	}
> +#endif
>  #if defined(CONFIG_ARCH_OMAP2420)
>  	else if (cpu_is_omap2420()) {
>  		list = omap2_mboxes;
> @@ -407,12 +415,14 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
>  		list[1]->irq = platform_get_irq_byname(pdev, "iva");
>  	}
>  #endif
> +#if defined(CONFIG_ARCH_OMAP4)
>  	else if (cpu_is_omap44xx()) {
>  		list = omap4_mboxes;
>  
>  		list[0]->irq = list[1]->irq =
>  			platform_get_irq_byname(pdev, "mbox");

For checkpatch.pl,

  		list[0]->irq =
  			platform_get_irq_byname(pdev, "mbox");
  		list[1]->irq = list[0]->irq;

>  	}
> +#endif
>  	else {
>  		pr_err("%s: platform not supported\n", __func__);
>  		return -ENODEV;
> -- 
> 1.7.1
>