diff options
author | Boris BREZILLON <boris.brezillon@free-electrons.com> | 2014-11-14 13:30:30 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-11-14 18:29:14 -0500 |
commit | d7f8db5300d1f50b5631796086dbd4efc5b5d707 (patch) | |
tree | fc408a6376c135b4f328051c03cfb16fbd3f9f51 /drivers/gpu/drm/omapdrm | |
parent | 8bd4ae202813ac04f35dacf43263e1cf96743292 (diff) |
drm: flip-work: change drm_flip_work_init prototype
Now that we're using lists instead of kfifo to store drm flip-work tasks
we do not need the size parameter passed to drm_flip_work_init function
anymore.
Moreover this function cannot fail anymore, we can thus remove the return
code.
Modify drm_flip_work_init users to take account of these changes.
[airlied: fixed two unused variable warnings]
Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_plane.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c index 891a4dc608af..0ad740132ac3 100644 --- a/drivers/gpu/drm/omapdrm/omap_plane.c +++ b/drivers/gpu/drm/omapdrm/omap_plane.c | |||
@@ -394,14 +394,10 @@ struct drm_plane *omap_plane_init(struct drm_device *dev, | |||
394 | 394 | ||
395 | omap_plane = kzalloc(sizeof(*omap_plane), GFP_KERNEL); | 395 | omap_plane = kzalloc(sizeof(*omap_plane), GFP_KERNEL); |
396 | if (!omap_plane) | 396 | if (!omap_plane) |
397 | goto fail; | 397 | return NULL; |
398 | 398 | ||
399 | ret = drm_flip_work_init(&omap_plane->unpin_work, 16, | 399 | drm_flip_work_init(&omap_plane->unpin_work, |
400 | "unpin", unpin_worker); | 400 | "unpin", unpin_worker); |
401 | if (ret) { | ||
402 | dev_err(dev->dev, "could not allocate unpin FIFO\n"); | ||
403 | goto fail; | ||
404 | } | ||
405 | 401 | ||
406 | omap_plane->nformats = omap_framebuffer_get_formats( | 402 | omap_plane->nformats = omap_framebuffer_get_formats( |
407 | omap_plane->formats, ARRAY_SIZE(omap_plane->formats), | 403 | omap_plane->formats, ARRAY_SIZE(omap_plane->formats), |
@@ -443,10 +439,4 @@ struct drm_plane *omap_plane_init(struct drm_device *dev, | |||
443 | omap_plane->info.zorder = id; | 439 | omap_plane->info.zorder = id; |
444 | 440 | ||
445 | return plane; | 441 | return plane; |
446 | |||
447 | fail: | ||
448 | if (plane) | ||
449 | omap_plane_destroy(plane); | ||
450 | |||
451 | return NULL; | ||
452 | } | 442 | } |