Move the no-op ioctl into drm_drv.h

5 files changed, 28 insertions, 22 deletions

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index a62514092..15775342d 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -646,6 +646,9 @@ extern int           DRM(open)(struct inode *inode, struct file *filp);
 extern int           DRM(release)(struct inode *inode, struct file *filp);
 extern int           DRM(ioctl)(struct inode *inode, struct file *filp,
 				unsigned int cmd, unsigned long arg);
+extern int	     DRM(noop_ioctl)(struct inode *inode, struct file *filp,
+				  unsigned int cmd, unsigned long arg);
+
 
 				/* Device support (drm_fops.h) */
 extern int	     DRM(open_helper)(struct inode *inode, struct file *filp,
@@ -757,10 +760,6 @@ extern int	     DRM(getmagic)(struct inode *inode, struct file *filp,
 extern int	     DRM(authmagic)(struct inode *inode, struct file *filp,
 				    unsigned int cmd, unsigned long arg);
 
-                                /* Placeholder for ioctls past */
-extern int	     DRM(noop)(struct inode *inode, struct file *filp,
-				  unsigned int cmd, unsigned long arg);
-
 				/* DMA support (drm_dma.h) */
 #if __HAVE_DMA
 extern int	     DRM(dma_setup)(drm_device_t *dev);
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 72c76c23c..57b521f77 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -179,8 +179,8 @@ static drm_ioctl_desc_t		  DRM(ioctls)[] = {
 	[DRM_IOCTL_NR(DRM_IOCTL_GET_STATS)]     = { DRM(getstats),    0, 0 },
 
 	[DRM_IOCTL_NR(DRM_IOCTL_SET_UNIQUE)]    = { DRM(setunique),   1, 1 },
-	[DRM_IOCTL_NR(DRM_IOCTL_BLOCK)]         = { DRM(noop),        1, 1 },
-	[DRM_IOCTL_NR(DRM_IOCTL_UNBLOCK)]       = { DRM(noop),        1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_BLOCK)]         = { DRM(noop_ioctl), 1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_UNBLOCK)]       = { DRM(noop_ioctl), 1, 1 },
 	[DRM_IOCTL_NR(DRM_IOCTL_AUTH_MAGIC)]    = { DRM(authmagic),   1, 1 },
 
 	[DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP)]       = { DRM(addmap_ioctl), 1, 1 },
@@ -209,7 +209,7 @@ static drm_ioctl_desc_t		  DRM(ioctls)[] = {
 	/* Gamma only, really */
 	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]        = { DRM(finish),      1, 0 },
 #else
-	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]        = { DRM(noop),      1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]        = { DRM(noop_ioctl), 1, 0 },
 #endif
 
 #if __HAVE_DMA
@@ -983,3 +983,11 @@ int DRM(ioctl)( struct inode *inode, struct file *filp,
 	return retcode;
 }
 
+/** No-op ioctl. Placeholder for ioctls past. */
+int DRM(noop_ioctl)(struct inode *inode, struct file *filp, unsigned int cmd,
+	       unsigned long arg)
+{
+	DRM_DEBUG("\n");
+	return 0;
+}
+
diff --git a/linux/drmP.h b/linux/drmP.h
index a62514092..15775342d 100644
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -646,6 +646,9 @@ extern int           DRM(open)(struct inode *inode, struct file *filp);
 extern int           DRM(release)(struct inode *inode, struct file *filp);
 extern int           DRM(ioctl)(struct inode *inode, struct file *filp,
 				unsigned int cmd, unsigned long arg);
+extern int	     DRM(noop_ioctl)(struct inode *inode, struct file *filp,
+				  unsigned int cmd, unsigned long arg);
+
 
 				/* Device support (drm_fops.h) */
 extern int	     DRM(open_helper)(struct inode *inode, struct file *filp,
@@ -757,10 +760,6 @@ extern int	     DRM(getmagic)(struct inode *inode, struct file *filp,
 extern int	     DRM(authmagic)(struct inode *inode, struct file *filp,
 				    unsigned int cmd, unsigned long arg);
 
-                                /* Placeholder for ioctls past */
-extern int	     DRM(noop)(struct inode *inode, struct file *filp,
-				  unsigned int cmd, unsigned long arg);
-
 				/* DMA support (drm_dma.h) */
 #if __HAVE_DMA
 extern int	     DRM(dma_setup)(drm_device_t *dev);
diff --git a/linux/drm_drv.h b/linux/drm_drv.h
index 72c76c23c..57b521f77 100644
--- a/linux/drm_drv.h
+++ b/linux/drm_drv.h
@@ -179,8 +179,8 @@ static drm_ioctl_desc_t		  DRM(ioctls)[] = {
 	[DRM_IOCTL_NR(DRM_IOCTL_GET_STATS)]     = { DRM(getstats),    0, 0 },
 
 	[DRM_IOCTL_NR(DRM_IOCTL_SET_UNIQUE)]    = { DRM(setunique),   1, 1 },
-	[DRM_IOCTL_NR(DRM_IOCTL_BLOCK)]         = { DRM(noop),        1, 1 },
-	[DRM_IOCTL_NR(DRM_IOCTL_UNBLOCK)]       = { DRM(noop),        1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_BLOCK)]         = { DRM(noop_ioctl), 1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_UNBLOCK)]       = { DRM(noop_ioctl), 1, 1 },
 	[DRM_IOCTL_NR(DRM_IOCTL_AUTH_MAGIC)]    = { DRM(authmagic),   1, 1 },
 
 	[DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP)]       = { DRM(addmap_ioctl), 1, 1 },
@@ -209,7 +209,7 @@ static drm_ioctl_desc_t		  DRM(ioctls)[] = {
 	/* Gamma only, really */
 	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]        = { DRM(finish),      1, 0 },
 #else
-	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]        = { DRM(noop),      1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]        = { DRM(noop_ioctl), 1, 0 },
 #endif
 
 #if __HAVE_DMA
@@ -983,3 +983,11 @@ int DRM(ioctl)( struct inode *inode, struct file *filp,
 	return retcode;
 }
 
+/** No-op ioctl. Placeholder for ioctls past. */
+int DRM(noop_ioctl)(struct inode *inode, struct file *filp, unsigned int cmd,
+	       unsigned long arg)
+{
+	DRM_DEBUG("\n");
+	return 0;
+}
+
diff --git a/linux/drm_lock_tmp.h b/linux/drm_lock_tmp.h
index 893a5e066..669ee5998 100644
--- a/linux/drm_lock_tmp.h
+++ b/linux/drm_lock_tmp.h
@@ -35,14 +35,6 @@
 #define __NO_VERSION__
 #include "drmP.h"
 
-/** No-op ioctl. */
-int DRM(noop)(struct inode *inode, struct file *filp, unsigned int cmd,
-	       unsigned long arg)
-{
-	DRM_DEBUG("\n");
-	return 0;
-}
-
 /**
  * Take the heavyweight lock.
  *