Re: [PATCH] vfio: platform: mark symbols static where possible

[Alex Williamson]

On Thu,  1 Sep 2016 19:15:35 +0800
Baoyou Xie <baoyou.xie@xxxxxxxxxx> wrote:

> We get a few warnings when building kernel with W=1:
> drivers/vfio/platform/vfio_platform_common.c:76:5: warning: no previous prototype for 'vfio_platform_acpi_call_reset' [-Wmissing-prototypes]
> drivers/vfio/platform/vfio_platform_common.c:98:6: warning: no previous prototype for 'vfio_platform_acpi_has_reset' [-Wmissing-prototypes]
> drivers/vfio/platform/vfio_platform_common.c:640:5: warning: no previous prototype for 'vfio_platform_of_probe' [-Wmissing-prototypes]
> drivers/vfio/platform/reset/vfio_platform_amdxgbe.c:59:5: warning: no previous prototype for 'vfio_platform_amdxgbe_reset' [-Wmissing-prototypes]
> drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c:60:5: warning: no previous prototype for 'vfio_platform_calxedaxgmac_reset' [-Wmissing-prototypes]
> ....
> 
> In fact, these functions are only used in the file in which they are
> declared and don't need a declaration, but can be made static.
> so this patch marks these functions with 'static'.
> 
> Signed-off-by: Baoyou Xie <baoyou.xie@xxxxxxxxxx>
> ---
>  drivers/vfio/platform/reset/vfio_platform_amdxgbe.c      | 2 +-
>  drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c | 2 +-
>  drivers/vfio/platform/vfio_platform_common.c             | 6 +++---
>  3 files changed, 5 insertions(+), 5 deletions(-)

Applied to next branch for v4.9 with Arnd's, Eric's, and Baptiste's
R-b/A-b.  Thanks,

Alex

> diff --git a/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c b/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c
> index d4030d0..bcd419c 100644
> --- a/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c
> +++ b/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c
> @@ -56,7 +56,7 @@ static void xmdio_write(void *ioaddr, unsigned int mmd,
>  	iowrite32(value, ioaddr + ((mmd_address & 0xff) << 2));
>  }
>  
> -int vfio_platform_amdxgbe_reset(struct vfio_platform_device *vdev)
> +static int vfio_platform_amdxgbe_reset(struct vfio_platform_device *vdev)
>  {
>  	struct vfio_platform_region *xgmac_regs = &vdev->regions[0];
>  	struct vfio_platform_region *xpcs_regs = &vdev->regions[1];
> diff --git a/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c b/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c
> index e3d3d94..49e5df6 100644
> --- a/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c
> +++ b/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c
> @@ -57,7 +57,7 @@ static inline void xgmac_mac_disable(void __iomem *ioaddr)
>  	writel(value, ioaddr + XGMAC_CONTROL);
>  }
>  
> -int vfio_platform_calxedaxgmac_reset(struct vfio_platform_device *vdev)
> +static int vfio_platform_calxedaxgmac_reset(struct vfio_platform_device *vdev)
>  {
>  	struct vfio_platform_region *reg = &vdev->regions[0];
>  
> diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c
> index 1cf2d46..d781428 100644
> --- a/drivers/vfio/platform/vfio_platform_common.c
> +++ b/drivers/vfio/platform/vfio_platform_common.c
> @@ -73,7 +73,7 @@ static int vfio_platform_acpi_probe(struct vfio_platform_device *vdev,
>  	return WARN_ON(!vdev->acpihid) ? -EINVAL : 0;
>  }
>  
> -int vfio_platform_acpi_call_reset(struct vfio_platform_device *vdev,
> +static int vfio_platform_acpi_call_reset(struct vfio_platform_device *vdev,
>  				  const char **extra_dbg)
>  {
>  #ifdef CONFIG_ACPI
> @@ -95,7 +95,7 @@ int vfio_platform_acpi_call_reset(struct vfio_platform_device *vdev,
>  #endif
>  }
>  
> -bool vfio_platform_acpi_has_reset(struct vfio_platform_device *vdev)
> +static bool vfio_platform_acpi_has_reset(struct vfio_platform_device *vdev)
>  {
>  #ifdef CONFIG_ACPI
>  	struct device *dev = vdev->device;
> @@ -637,7 +637,7 @@ static const struct vfio_device_ops vfio_platform_ops = {
>  	.mmap		= vfio_platform_mmap,
>  };
>  
> -int vfio_platform_of_probe(struct vfio_platform_device *vdev,
> +static int vfio_platform_of_probe(struct vfio_platform_device *vdev,
>  			   struct device *dev)
>  {
>  	int ret;