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

Commit 156822f7 authored by Andres Salomon's avatar Andres Salomon Committed by Dave Airlie
Browse files

drm: kill more unused DRM macros 



There are a few more macros in drmP.h that are unused; DRM_GET_PRIV_SAREA,
DRM_ARRAY_SIZE, and DRM_WAITCOUNT can go away completely.

Unfortunately, DRM_COPY is still used in one place, but we can at least
move it to where it's used.  It's an awful looking macro..

[akpm: fix overeagerness]
Signed-off-by: default avatarAndres Salomon <dilinger@collabora.co.uk>
Cc: Dave Airlie <airlied@linux.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 420a4570

drivers/gpu/drm/drm_drv.c

+12 −0
Original line number Diff line number Diff line
@@ -365,6 +365,18 @@ static void __exit drm_core_exit(void) 
module_init(drm_core_init);

module_exit(drm_core_exit);



/**

 * Copy and IOCTL return string to user space

 */

#define DRM_COPY(name, value)                                         \

	len = strlen(value);                                          \

	if (len > name##_len) len = name##_len;                       \

	name##_len = strlen(value);                                   \

	if (len && name) {                                            \

		if (copy_to_user(name, value, len))                   \

			return -EFAULT;                               \

	}



/**

 * Get version information

 *

include/drm/drmP.h

+0 −23
Original line number Diff line number Diff line
@@ -255,19 +255,8 @@ extern void drm_ut_debug_printk(unsigned int request_level, 


#define DRM_LEFTCOUNT(x) (((x)->rp + (x)->count - (x)->wp) % ((x)->count + 1))

#define DRM_BUFCOUNT(x) ((x)->count - DRM_LEFTCOUNT(x))

#define DRM_WAITCOUNT(dev,idx) DRM_BUFCOUNT(&dev->queuelist[idx]->waitlist)



#define DRM_IF_VERSION(maj, min) (maj << 16 | min)

/**

 * Get the private SAREA mapping.

 *

 * \param _dev DRM device.

 * \param _ctx context number.

 * \param _map output mapping.

 */

#define DRM_GET_PRIV_SAREA(_dev, _ctx, _map) do {	\

	(_map) = (_dev)->context_sareas[_ctx];		\

} while(0)



/**

 * Test that the hardware lock is held by the caller, returning otherwise.
@@ -286,18 +275,6 @@ do { \ 
	}									\

} while (0)



/**

 * Copy and IOCTL return string to user space

 */

#define DRM_COPY( name, value )						\

	len = strlen( value );						\

	if ( len > name##_len ) len = name##_len;			\

	name##_len = strlen( value );					\

	if ( len && name ) {						\

		if ( copy_to_user( name, value, len ) )			\

			return -EFAULT;					\

	}



/**

 * Ioctl function type.

 *