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

Commit b9523249 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm: use kcalloc now that it is available.. 



Make the DRM drm_calloc call kcalloc now.

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent f6501308

drivers/char/drm/drmP.h

+7 −1
Original line number Diff line number Diff line
@@ -806,7 +806,6 @@ extern ssize_t drm_read(struct file *filp, char __user *buf, size_t count, 
extern void	     drm_mem_init(void);

extern int	     drm_mem_info(char *buf, char **start, off_t offset,

				   int request, int *eof, void *data);

extern void	     *drm_calloc(size_t nmemb, size_t size, int area);

extern void	     *drm_realloc(void *oldpt, size_t oldsize, size_t size,

				   int area);

extern unsigned long drm_alloc_pages(int order, int area);
@@ -1064,9 +1063,16 @@ static __inline__ void drm_free(void *pt, size_t size, int area) 
{

	kfree(pt);

}



/** Wrapper around kcalloc() */

static __inline__ void *drm_calloc(size_t nmemb, size_t size, int area)

{

	return kcalloc(nmemb, size, GFP_KERNEL);

}

#else

extern void *drm_alloc(size_t size, int area);

extern void drm_free(void *pt, size_t size, int area);

extern void *drm_calloc(size_t nmemb, size_t size, int area);

#endif



/*@}*/

drivers/char/drm/drm_memory.c

+0 −13
Original line number Diff line number Diff line
@@ -65,19 +65,6 @@ int drm_mem_info(char *buf, char **start, off_t offset, 
	return 0;

}



/** Wrapper around kmalloc() */

void *drm_calloc(size_t nmemb, size_t size, int area)

{

	void *addr;



	addr = kmalloc(size * nmemb, GFP_KERNEL);

	if (addr != NULL)

		memset((void *)addr, 0, size * nmemb);



	return addr;

}

EXPORT_SYMBOL(drm_calloc);



/** Wrapper around kmalloc() and kfree() */

void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area)

{