[05/10] drm: make drm_vblank_count_and_time() static

Commit Message

Gustavo Padovan June 7, 2016, 2:07 p.m. UTC

From: Gustavo Padovan <[e-mail]>

As they are not used anywhere outside drm_irq.c make them static.

Signed-off-by: Gustavo Padovan <[e-mail]>
---
 drivers/gpu/drm/drm_irq.c | 7 ++-----
 include/drm/drmP.h        | 2 --
 2 files changed, 2 insertions(+), 7 deletions(-)

Comments

Gustavo Padovan June 7, 2016, 2:58 p.m. UTC | #1

2016-06-07 Gustavo Padovan <[e-mail]>:

> From: Gustavo Padovan <[e-mail]>
> 
> As they are not used anywhere outside drm_irq.c make them static.
> 
> Signed-off-by: Gustavo Padovan <[e-mail]>
> ---
>  drivers/gpu/drm/drm_irq.c | 7 ++-----
>  include/drm/drmP.h        | 2 --
>  2 files changed, 2 insertions(+), 7 deletions(-)

This one is broken. Ignore it for now.

	Gustavo

Patch

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 76e39c5..44ea2fa 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -945,8 +945,8 @@  EXPORT_SYMBOL(drm_crtc_vblank_count);
  *
  * This is the legacy version of drm_crtc_vblank_count_and_time().
  */
-u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
-			      struct timeval *vblanktime)
+static u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
+				     struct timeval *vblanktime)
 {
 	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 	u32 vblank_count;
@@ -963,7 +963,6 @@  u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
 
 	return vblank_count;
 }
-EXPORT_SYMBOL(drm_vblank_count_and_time);
 
 /**
  * drm_crtc_vblank_count_and_time - retrieve "cooked" vblank counter value
@@ -975,8 +974,6 @@  EXPORT_SYMBOL(drm_vblank_count_and_time);
  * vblank events since the system was booted, including lost events due to
  * modesetting activity. Returns corresponding system timestamp of the time
  * of the vblank interval that corresponds to the current vblank counter value.
- *
- * This is the native KMS version of drm_vblank_count_and_time().
  */
 u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
 				   struct timeval *vblanktime)
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 23f79a5..f7f5fbb 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -965,8 +965,6 @@  extern int drm_wait_vblank(struct drm_device *dev, void *data,
 			   struct drm_file *filp);
 extern u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe);
 extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc);
-extern u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
-				     struct timeval *vblanktime);
 extern u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
 					  struct timeval *vblanktime);
 extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,