[PATCH 11/11] drm: Remove dummy agp ioctl wrappers

2015-09-28 Thread David Herrmann
Hi

On Tue, Sep 8, 2015 at 1:56 PM, Daniel Vetter  wrote:
> They're only used in the drm ioctl table, and there they're excluded
> when AGP support is disabled. So this is just dead code ripe for
> removal.
>
> Signed-off-by: Daniel Vetter 

Reviewed-by: David Herrmann 

Thanks
David

> ---
>  include/drm/drm_agpsupport.h | 48 
> 
>  1 file changed, 48 deletions(-)
>
> diff --git a/include/drm/drm_agpsupport.h b/include/drm/drm_agpsupport.h
> index 3d0833c63af2..addf0ea3e158 100644
> --- a/include/drm/drm_agpsupport.h
> +++ b/include/drm/drm_agpsupport.h
> @@ -105,95 +105,47 @@ static inline int drm_agp_acquire(struct drm_device 
> *dev)
> return -ENODEV;
>  }
>
> -static inline int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,
> -   struct drm_file *file_priv)
> -{
> -   return -ENODEV;
> -}
> -
>  static inline int drm_agp_release(struct drm_device *dev)
>  {
> return -ENODEV;
>  }
>
> -static inline int drm_agp_release_ioctl(struct drm_device *dev, void *data,
> -   struct drm_file *file_priv)
> -{
> -   return -ENODEV;
> -}
> -
>  static inline int drm_agp_enable(struct drm_device *dev,
>  struct drm_agp_mode mode)
>  {
> return -ENODEV;
>  }
>
> -static inline int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
> -  struct drm_file *file_priv)
> -{
> -   return -ENODEV;
> -}
> -
>  static inline int drm_agp_info(struct drm_device *dev,
>struct drm_agp_info *info)
>  {
> return -ENODEV;
>  }
>
> -static inline int drm_agp_info_ioctl(struct drm_device *dev, void *data,
> -struct drm_file *file_priv)
> -{
> -   return -ENODEV;
> -}
> -
>  static inline int drm_agp_alloc(struct drm_device *dev,
> struct drm_agp_buffer *request)
>  {
> return -ENODEV;
>  }
>
> -static inline int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
> - struct drm_file *file_priv)
> -{
> -   return -ENODEV;
> -}
> -
>  static inline int drm_agp_free(struct drm_device *dev,
>struct drm_agp_buffer *request)
>  {
> return -ENODEV;
>  }
>
> -static inline int drm_agp_free_ioctl(struct drm_device *dev, void *data,
> -struct drm_file *file_priv)
> -{
> -   return -ENODEV;
> -}
> -
>  static inline int drm_agp_unbind(struct drm_device *dev,
>  struct drm_agp_binding *request)
>  {
> return -ENODEV;
>  }
>
> -static inline int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
> -  struct drm_file *file_priv)
> -{
> -   return -ENODEV;
> -}
> -
>  static inline int drm_agp_bind(struct drm_device *dev,
>struct drm_agp_binding *request)
>  {
> return -ENODEV;
>  }
>
> -static inline int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
> -struct drm_file *file_priv)
> -{
> -   return -ENODEV;
> -}
> -
>  #endif /* CONFIG_AGP */
>
>  #endif /* _DRM_AGPSUPPORT_H_ */
> --
> 2.5.1
>
> ___
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel


[PATCH 11/11] drm: Remove dummy agp ioctl wrappers

2015-09-08 Thread Daniel Vetter
They're only used in the drm ioctl table, and there they're excluded
when AGP support is disabled. So this is just dead code ripe for
removal.

Signed-off-by: Daniel Vetter 
---
 include/drm/drm_agpsupport.h | 48 
 1 file changed, 48 deletions(-)

diff --git a/include/drm/drm_agpsupport.h b/include/drm/drm_agpsupport.h
index 3d0833c63af2..addf0ea3e158 100644
--- a/include/drm/drm_agpsupport.h
+++ b/include/drm/drm_agpsupport.h
@@ -105,95 +105,47 @@ static inline int drm_agp_acquire(struct drm_device *dev)
return -ENODEV;
 }

-static inline int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,
-   struct drm_file *file_priv)
-{
-   return -ENODEV;
-}
-
 static inline int drm_agp_release(struct drm_device *dev)
 {
return -ENODEV;
 }

-static inline int drm_agp_release_ioctl(struct drm_device *dev, void *data,
-   struct drm_file *file_priv)
-{
-   return -ENODEV;
-}
-
 static inline int drm_agp_enable(struct drm_device *dev,
 struct drm_agp_mode mode)
 {
return -ENODEV;
 }

-static inline int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
-  struct drm_file *file_priv)
-{
-   return -ENODEV;
-}
-
 static inline int drm_agp_info(struct drm_device *dev,
   struct drm_agp_info *info)
 {
return -ENODEV;
 }

-static inline int drm_agp_info_ioctl(struct drm_device *dev, void *data,
-struct drm_file *file_priv)
-{
-   return -ENODEV;
-}
-
 static inline int drm_agp_alloc(struct drm_device *dev,
struct drm_agp_buffer *request)
 {
return -ENODEV;
 }

-static inline int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
-{
-   return -ENODEV;
-}
-
 static inline int drm_agp_free(struct drm_device *dev,
   struct drm_agp_buffer *request)
 {
return -ENODEV;
 }

-static inline int drm_agp_free_ioctl(struct drm_device *dev, void *data,
-struct drm_file *file_priv)
-{
-   return -ENODEV;
-}
-
 static inline int drm_agp_unbind(struct drm_device *dev,
 struct drm_agp_binding *request)
 {
return -ENODEV;
 }

-static inline int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
-  struct drm_file *file_priv)
-{
-   return -ENODEV;
-}
-
 static inline int drm_agp_bind(struct drm_device *dev,
   struct drm_agp_binding *request)
 {
return -ENODEV;
 }

-static inline int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
-struct drm_file *file_priv)
-{
-   return -ENODEV;
-}
-
 #endif /* CONFIG_AGP */

 #endif /* _DRM_AGPSUPPORT_H_ */
-- 
2.5.1