Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 747824c6 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm: remove remnants of DRM_COPY_FROM/TO_USER_IOCTL 



This is a bug in the savage driver since I introduced these changes.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f9618ac0

drivers/char/drm/drm_os_linux.h

+0 −8
Original line number Diff line number Diff line
@@ -62,14 +62,6 @@ static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size) 


#endif



/** For data going into the kernel through the ioctl argument */

#define DRM_COPY_FROM_USER_IOCTL(arg1, arg2, arg3)	\

	if ( copy_from_user(&arg1, arg2, arg3) )	\

		return -EFAULT

/** For data going from the kernel through the ioctl argument */

#define DRM_COPY_TO_USER_IOCTL(arg1, arg2, arg3)	\

	if ( copy_to_user(arg1, &arg2, arg3) )		\

		return -EFAULT

/** Other copying of data to kernel space */

#define DRM_COPY_FROM_USER(arg1, arg2, arg3)		\

	copy_from_user(arg1, arg2, arg3)

drivers/char/drm/savage_bci.c

+0 −3
Original line number Diff line number Diff line
@@ -968,9 +968,6 @@ static int savage_bci_event_wait(struct drm_device *dev, void *data, struct drm_ 


	DRM_DEBUG("\n");



	DRM_COPY_FROM_USER_IOCTL(event, (drm_savage_event_wait_t __user *) data,

				 sizeof(event));



	UPDATE_EVENT_COUNTER();

	if (dev_priv->status_ptr)

		hw_e = dev_priv->status_ptr[1] & 0xffff;