Skip to content

Commit 14dee05

Browse files
Oleksandr Andrushchenkojgross1
authored andcommitted
drm/xen-front: Fix misused IS_ERR_OR_NULL checks
The patch c575b7e: "drm/xen-front: Add support for Xen PV display frontend" from Apr 3, 2018, leads to the following static checker warning: drivers/gpu/drm/xen/xen_drm_front_gem.c:140 xen_drm_front_gem_create() warn: passing zero to 'ERR_CAST' drivers/gpu/drm/xen/xen_drm_front_gem.c 133 struct drm_gem_object *xen_drm_front_gem_create(struct drm_device *dev, 134 size_t size) 135 { 136 struct xen_gem_object *xen_obj; 137 138 xen_obj = gem_create(dev, size); 139 if (IS_ERR_OR_NULL(xen_obj)) 140 return ERR_CAST(xen_obj); Fix this and the rest of misused places with IS_ERR_OR_NULL in the driver. Fixes: c575b7e: "drm/xen-front: Add support for Xen PV display frontend" Signed-off-by: Oleksandr Andrushchenko <[email protected]> Reported-by: Dan Carpenter <[email protected]> Reviewed-by: Dan Carpenter <[email protected]> Cc: <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Juergen Gross <[email protected]>
1 parent 5fa4e6f commit 14dee05

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

drivers/gpu/drm/xen/xen_drm_front.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,8 @@ static int xen_drm_drv_dumb_create(struct drm_file *filp,
400400
args->size = args->pitch * args->height;
401401

402402
obj = xen_drm_front_gem_create(dev, args->size);
403-
if (IS_ERR_OR_NULL(obj)) {
404-
ret = PTR_ERR_OR_ZERO(obj);
403+
if (IS_ERR(obj)) {
404+
ret = PTR_ERR(obj);
405405
goto fail;
406406
}
407407

drivers/gpu/drm/xen/xen_drm_front_gem.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static struct xen_gem_object *gem_create(struct drm_device *dev, size_t size)
8383

8484
size = round_up(size, PAGE_SIZE);
8585
xen_obj = gem_create_obj(dev, size);
86-
if (IS_ERR_OR_NULL(xen_obj))
86+
if (IS_ERR(xen_obj))
8787
return xen_obj;
8888

8989
if (drm_info->front_info->cfg.be_alloc) {
@@ -117,7 +117,7 @@ static struct xen_gem_object *gem_create(struct drm_device *dev, size_t size)
117117
*/
118118
xen_obj->num_pages = DIV_ROUND_UP(size, PAGE_SIZE);
119119
xen_obj->pages = drm_gem_get_pages(&xen_obj->base);
120-
if (IS_ERR_OR_NULL(xen_obj->pages)) {
120+
if (IS_ERR(xen_obj->pages)) {
121121
ret = PTR_ERR(xen_obj->pages);
122122
xen_obj->pages = NULL;
123123
goto fail;
@@ -136,7 +136,7 @@ struct drm_gem_object *xen_drm_front_gem_create(struct drm_device *dev,
136136
struct xen_gem_object *xen_obj;
137137

138138
xen_obj = gem_create(dev, size);
139-
if (IS_ERR_OR_NULL(xen_obj))
139+
if (IS_ERR(xen_obj))
140140
return ERR_CAST(xen_obj);
141141

142142
return &xen_obj->base;
@@ -194,7 +194,7 @@ xen_drm_front_gem_import_sg_table(struct drm_device *dev,
194194

195195
size = attach->dmabuf->size;
196196
xen_obj = gem_create_obj(dev, size);
197-
if (IS_ERR_OR_NULL(xen_obj))
197+
if (IS_ERR(xen_obj))
198198
return ERR_CAST(xen_obj);
199199

200200
ret = gem_alloc_pages_array(xen_obj, size);

drivers/gpu/drm/xen/xen_drm_front_kms.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fb_create(struct drm_device *dev, struct drm_file *filp,
6060
int ret;
6161

6262
fb = drm_gem_fb_create_with_funcs(dev, filp, mode_cmd, &fb_funcs);
63-
if (IS_ERR_OR_NULL(fb))
63+
if (IS_ERR(fb))
6464
return fb;
6565

6666
gem_obj = fb->obj[0];

0 commit comments

Comments
 (0)