instead of functions that just return an error, just inline them into

the ioctl handler.

3 files changed, 5 insertions, 27 deletions

diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index ca929f091e3..a3ed8cf1acd 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -685,9 +685,6 @@ int	drm_irq_by_busid(struct drm_device *, void *, struct drm_file *);
 int	drm_getunique(struct drm_device *, void *, struct drm_file *);
 int	drm_setunique(struct drm_device *, void *, struct drm_file *);
 int	drm_getmap(struct drm_device *, void *, struct drm_file *);
-int	drm_getclient(struct drm_device *, void *, struct drm_file *);
-int	drm_getstats(struct drm_device *, void *, struct drm_file *);
-int	drm_noop(struct drm_device *, void *, struct drm_file *);
 
 /* Context IOCTL support (drm_context.c) */
 int	drm_resctx(struct drm_device *, void *, struct drm_file *);
diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index 6026a95ee19..bb377f67295 100644
--- a/sys/dev/pci/drm/drm_drv.c
+++ b/sys/dev/pci/drm/drm_drv.c
@@ -569,15 +569,16 @@ drmioctl(dev_t kdev, u_long cmd, caddr_t data, int flags,
 		return (drm_getmagic(dev, data, file_priv));
 	case DRM_IOCTL_GET_MAP:
 		return (drm_getmap(dev, data, file_priv));
-	case DRM_IOCTL_GET_CLIENT:
-		return (drm_getclient(dev, data, file_priv));
-	case DRM_IOCTL_GET_STATS:
-		return (drm_getstats(dev, data, file_priv));
 	case DRM_IOCTL_WAIT_VBLANK:
 		return (drm_wait_vblank(dev, data, file_priv));
 	case DRM_IOCTL_MODESET_CTL:
 		return (drm_modeset_ctl(dev, data, file_priv));
 
+	/* removed */
+	case DRM_IOCTL_GET_CLIENT:
+		/*FALLTHROUGH*/
+	case DRM_IOCTL_GET_STATS:
+		return (EINVAL);
 	/*
 	 * no-oped ioctls, we don't check permissions on them because
 	 * they do nothing. they'll be removed as soon as userland is
diff --git a/sys/dev/pci/drm/drm_ioctl.c b/sys/dev/pci/drm/drm_ioctl.c
index 8d8bdf113e2..176d834223f 100644
--- a/sys/dev/pci/drm/drm_ioctl.c
+++ b/sys/dev/pci/drm/drm_ioctl.c
@@ -181,18 +181,6 @@ drm_getmap(struct drm_device *dev, void *data, struct drm_file *file_priv)
 	return 0;
 }
 
-int
-drm_getclient(struct drm_device *dev, void *data, struct drm_file *file_priv)
-{
-	return (EINVAL);
-}
-
-int
-drm_getstats(struct drm_device *dev, void *data, struct drm_file *file_priv)
-{
-	return (EINVAL);
-}
-
 #define DRM_IF_MAJOR	1
 #define DRM_IF_MINOR	2
 
@@ -237,11 +225,3 @@ drm_setversion(struct drm_device *dev, void *data, struct drm_file *file_priv)
 
 	return 0;
 }
-
-
-int
-drm_noop(struct drm_device *dev, void *data, struct drm_file *file_priv)
-{
-	DRM_DEBUG("\n");
-	return 0;
-}