From be014d2b248a9f2eec0c8b5e6a145e86b2a551c2 Mon Sep 17 00:00:00 2001 From: Matt Sealey Date: Mon, 3 Dec 2012 16:24:51 -0600 Subject: [PATCH] amd-gpu: remove addtimestamp ioctl as it has no userspace users (except libkgsl which needs kicking to remove the call) --- drivers/mxc/amd-gpu/kgsl.c | 9 +++++---- include/linux/mxc_kgsl.h | 14 +++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/mxc/amd-gpu/kgsl.c b/drivers/mxc/amd-gpu/kgsl.c index 0d88f4d8ce7..972879bf7df 100644 --- a/drivers/mxc/amd-gpu/kgsl.c +++ b/drivers/mxc/amd-gpu/kgsl.c @@ -462,7 +462,6 @@ done: return result; } - static int kgsl_ioctl_device_setproperty(struct file *fd, void __user *arg) { int result; @@ -955,6 +954,7 @@ static int kgsl_ioctl_drawctxt_bind_gmem_shadow(struct file *fd, void __user *ar return status; } +#if 0 static int kgsl_ioctl_add_timestamp(struct file *fd, void __user *arg) { struct kgsl_add_timestamp param; @@ -973,6 +973,7 @@ static int kgsl_ioctl_add_timestamp(struct file *fd, void __user *arg) } return GSL_SUCCESS; } +#endif static int kgsl_ioctl(struct inode *inode, struct file *fd, unsigned int cmd, unsigned long arg) { @@ -1061,9 +1062,9 @@ static int kgsl_ioctl(struct inode *inode, struct file *fd, unsigned int cmd, un case IOCTL_KGSL_DRAWCTXT_BIND_GMEM_SHADOW: result = kgsl_ioctl_drawctxt_bind_gmem_shadow(fd, (void __user *) arg); break; - case IOCTL_KGSL_ADD_TIMESTAMP: - result = kgsl_ioctl_add_timestamp(fd, (void __user *) arg); - break; +// case IOCTL_KGSL_ADD_TIMESTAMP: +// result = kgsl_ioctl_add_timestamp(fd, (void __user *) arg); +// break; default: pr_err("%s: invalid ioctl code %08x\n", __func__, cmd); result = -ENOTTY; diff --git a/include/linux/mxc_kgsl.h b/include/linux/mxc_kgsl.h index b076d198468..c6e051485bf 100644 --- a/include/linux/mxc_kgsl.h +++ b/include/linux/mxc_kgsl.h @@ -487,13 +487,13 @@ struct kgsl_sharedmem_fromhostpointer { _IOW(KGSL_IOC_TYPE, 0x38, struct kgsl_sharedmem_fromhostpointer) /* NQ */ -struct kgsl_add_timestamp { - unsigned int device_id; - unsigned int *timestamp; -}; - -#define IOCTL_KGSL_ADD_TIMESTAMP \ - _IOWR(KGSL_IOC_TYPE, 0x39, struct kgsl_add_timestamp) +//struct kgsl_add_timestamp { +// unsigned int device_id; +// unsigned int *timestamp; +//}; +// +//#define IOCTL_KGSL_ADD_TIMESTAMP \ +// _IOWR(KGSL_IOC_TYPE, 0x39, struct kgsl_add_timestamp) /* NQ */ #define IOCTL_KGSL_DRIVER_EXIT \