[PATCH] vgaarb: mark vga_tryget static

[PATCH] vgaarb: mark vga_tryget static

[Christoph Hellwig]

This symbols isn't used anywhere outside of vgaarb.c.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/gpu/vga/vgaarb.c | 3 +--
 include/linux/vgaarb.h   | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index f2f3ef8af2710f..5180c5687ee530 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -529,7 +529,7 @@ EXPORT_SYMBOL(vga_get);
  *
  * 0 on success, negative error code on failure.
  */
-int vga_tryget(struct pci_dev *pdev, unsigned int rsrc)
+static int vga_tryget(struct pci_dev *pdev, unsigned int rsrc)
 {
 	struct vga_device *vgadev;
 	unsigned long flags;
@@ -554,7 +554,6 @@ int vga_tryget(struct pci_dev *pdev, unsigned int rsrc)
 	spin_unlock_irqrestore(&vga_lock, flags);
 	return rc;
 }
-EXPORT_SYMBOL(vga_tryget);
 
 /**
  * vga_put - release lock on legacy VGA resources
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index 553b34c8b5f700..977caf96c8d2a3 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -109,12 +109,6 @@ static inline int vga_get_uninterruptible(struct pci_dev *pdev,
        return vga_get(pdev, rsrc, 0);
 }
 
-#if defined(CONFIG_VGA_ARB)
-extern int vga_tryget(struct pci_dev *pdev, unsigned int rsrc);
-#else
-static inline int vga_tryget(struct pci_dev *pdev, unsigned int rsrc) { return 0; }
-#endif
-
 #if defined(CONFIG_VGA_ARB)
 extern void vga_put(struct pci_dev *pdev, unsigned int rsrc);
 #else
-- 
2.27.0

Re: [PATCH] vgaarb: mark vga_tryget static

[daniel]

On Sat, Aug 01, 2020 at 08:17:13AM +0200, Christoph Hellwig wrote:
> This symbols isn't used anywhere outside of vgaarb.c.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Nice catch, patch queued up for 5.9.

Thanks, Daniel

> ---
>  drivers/gpu/vga/vgaarb.c | 3 +--
>  include/linux/vgaarb.h   | 6 ------
>  2 files changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
> index f2f3ef8af2710f..5180c5687ee530 100644
> --- a/drivers/gpu/vga/vgaarb.c
> +++ b/drivers/gpu/vga/vgaarb.c
> @@ -529,7 +529,7 @@ EXPORT_SYMBOL(vga_get);
>   *
>   * 0 on success, negative error code on failure.
>   */
> -int vga_tryget(struct pci_dev *pdev, unsigned int rsrc)
> +static int vga_tryget(struct pci_dev *pdev, unsigned int rsrc)
>  {
>  	struct vga_device *vgadev;
>  	unsigned long flags;
> @@ -554,7 +554,6 @@ int vga_tryget(struct pci_dev *pdev, unsigned int rsrc)
>  	spin_unlock_irqrestore(&vga_lock, flags);
>  	return rc;
>  }
> -EXPORT_SYMBOL(vga_tryget);
>  
>  /**
>   * vga_put - release lock on legacy VGA resources
> diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
> index 553b34c8b5f700..977caf96c8d2a3 100644
> --- a/include/linux/vgaarb.h
> +++ b/include/linux/vgaarb.h
> @@ -109,12 +109,6 @@ static inline int vga_get_uninterruptible(struct pci_dev *pdev,
>         return vga_get(pdev, rsrc, 0);
>  }
>  
> -#if defined(CONFIG_VGA_ARB)
> -extern int vga_tryget(struct pci_dev *pdev, unsigned int rsrc);
> -#else
> -static inline int vga_tryget(struct pci_dev *pdev, unsigned int rsrc) { return 0; }
> -#endif
> -
>  #if defined(CONFIG_VGA_ARB)
>  extern void vga_put(struct pci_dev *pdev, unsigned int rsrc);
>  #else
> -- 
> 2.27.0
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch