[PATCH 1/2] pseries/vio: Remove stray #ifdef CONFIG_PPC_PSERIES

Michael Ellerman mpe at ellerman.id.au
Fri Jan 31 21:38:08 AEDT 2020


Subject: Re: [PATCH 1/2] pseries/vio: Remove stray #ifdef CONFIG_PPC_PSERIES
                         ^
                         powerpc/

Please.

I'll fix it up.

Oliver O'Halloran <oohall at gmail.com> writes:
> vio.c requires CONFIG_IBMVIO which in turn depends on PPC_PSERIES.
> In other words, this ifdef is pointless.

And all of platforms/pseries is only built if PPC_PSERIES=y.

> At a guess it's a carry-over from pre-history.

It's not pre-history. Probably should have been cleaned up in:

commit b0787660260604ba63621881851de0032279819b
Author:     Stephen Rothwell <sfr at canb.auug.org.au>
AuthorDate: Wed Mar 7 18:43:10 2012 +0000
Commit:     Benjamin Herrenschmidt <benh at kernel.crashing.org>
CommitDate: Fri Mar 9 10:35:23 2012 +1100

    powerpc: clean up vio.c
    
    This cleans up vio.c after the removal of the legacy iSeries platform.
    It also removes some no longer referenced include files.
    
    Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>


cheers

> diff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c
> index f682b7b..37f1f25 100644
> --- a/arch/powerpc/platforms/pseries/vio.c
> +++ b/arch/powerpc/platforms/pseries/vio.c
> @@ -1628,7 +1628,6 @@ const void *vio_get_attribute(struct vio_dev *vdev, char *which, int *length)
>  }
>  EXPORT_SYMBOL(vio_get_attribute);
>  
> -#ifdef CONFIG_PPC_PSERIES
>  /* vio_find_name() - internal because only vio.c knows how we formatted the
>   * kobject name
>   */
> @@ -1698,7 +1697,6 @@ int vio_disable_interrupts(struct vio_dev *dev)
>  	return rc;
>  }
>  EXPORT_SYMBOL(vio_disable_interrupts);
> -#endif /* CONFIG_PPC_PSERIES */
>  
>  static int __init vio_init(void)
>  {
> -- 
> 2.9.5


More information about the Linuxppc-dev mailing list