geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unused, and unused-but-set variables warnings 

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewed-by: Emil Velikov <eil.l.velikov@gmail.com>
main
Jan Vesely 2015-02-27 12:47:46 -05:00
parent 13e34308b7
commit 0706c14e7c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/exynos/exynos_fimg2d_test.c
View File

@ -360,7 +360,7 @@ static int g2d_copy_with_scale_test(struct exynos_device *dev,
{ {
struct g2d_context *ctx; struct g2d_context *ctx;
struct g2d_image src_img, dst_img; struct g2d_image src_img, dst_img;
unsigned int src_x, src_y, dst_x, dst_y, img_w, img_h; unsigned int src_x, src_y, img_w, img_h;
unsigned long userptr, size; unsigned long userptr, size;
int ret; int ret;
@ -374,8 +374,6 @@ static int g2d_copy_with_scale_test(struct exynos_device *dev,
src_x = 0; src_x = 0;
src_y = 0; src_y = 0;
dst_x = 0;
dst_y = 0;
img_w = screen_width; img_w = screen_width;
img_h = screen_height; img_h = screen_height;

7
xf86drm.c
View File

@ -313,9 +313,12 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
char buf[64]; char buf[64];
int fd; int fd;
mode_t devmode = DRM_DEV_MODE, serv_mode; mode_t devmode = DRM_DEV_MODE, serv_mode;
gid_t serv_group;
#if !defined(UDEV)
int isroot = !geteuid(); int isroot = !geteuid();
uid_t user = DRM_DEV_UID; uid_t user = DRM_DEV_UID;
gid_t group = DRM_DEV_GID, serv_group; gid_t group = DRM_DEV_GID;
#endif
switch (type) { switch (type) {
case DRM_NODE_PRIMARY: case DRM_NODE_PRIMARY:
@ -338,7 +341,6 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
drm_server_info->get_perms(&serv_group, &serv_mode); drm_server_info->get_perms(&serv_group, &serv_mode);
devmode = serv_mode ? serv_mode : DRM_DEV_MODE; devmode = serv_mode ? serv_mode : DRM_DEV_MODE;
devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH); devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
} }
#if !defined(UDEV) #if !defined(UDEV)
@ -359,6 +361,7 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
} }
if (drm_server_info) { if (drm_server_info) {
group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
chown_check_return(buf, user, group); chown_check_return(buf, user, group);
chmod(buf, devmode); chmod(buf, devmode);
} }