drm/exynos/ipp: remove file argument from node related functions
authorAndrzej Hajda <a.hajda@samsung.com>
Tue, 2 Sep 2014 12:55:06 +0000 (14:55 +0200)
committerInki Dae <daeinki@gmail.com>
Fri, 19 Sep 2014 15:56:13 +0000 (00:56 +0900)
Since file pointer is preserved in c_node passing it
as argument in node functions is redundant.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
drivers/gpu/drm/exynos/exynos_drm_ipp.c

index 05f0f4eae7bc99dc771f4e3816285702e4c8dc50..9e9714afca1dadb9be4a19fcd3d5c197eee18833 100644 (file)
@@ -529,7 +529,6 @@ static int ipp_put_mem_node(struct drm_device *drm_dev,
 
 static struct drm_exynos_ipp_mem_node
                *ipp_get_mem_node(struct drm_device *drm_dev,
-               struct drm_file *file,
                struct drm_exynos_ipp_cmd_node *c_node,
                struct drm_exynos_ipp_queue_buf *qbuf)
 {
@@ -560,7 +559,7 @@ static struct drm_exynos_ipp_mem_node
                        dma_addr_t *addr;
 
                        addr = exynos_drm_gem_get_dma_addr(drm_dev,
-                                       qbuf->handle[i], file);
+                                       qbuf->handle[i], c_node->filp);
                        if (IS_ERR(addr)) {
                                DRM_ERROR("failed to get addr.\n");
                                ipp_put_mem_node(drm_dev, c_node, m_node);
@@ -606,7 +605,6 @@ static void ipp_free_event(struct drm_pending_event *event)
 }
 
 static int ipp_get_event(struct drm_device *drm_dev,
-               struct drm_file *file,
                struct drm_exynos_ipp_cmd_node *c_node,
                struct drm_exynos_ipp_queue_buf *qbuf)
 {
@@ -618,7 +616,7 @@ static int ipp_get_event(struct drm_device *drm_dev,
        e = kzalloc(sizeof(*e), GFP_KERNEL);
        if (!e) {
                spin_lock_irqsave(&drm_dev->event_lock, flags);
-               file->event_space += sizeof(e->event);
+               c_node->filp->event_space += sizeof(e->event);
                spin_unlock_irqrestore(&drm_dev->event_lock, flags);
                return -ENOMEM;
        }
@@ -630,7 +628,7 @@ static int ipp_get_event(struct drm_device *drm_dev,
        e->event.prop_id = qbuf->prop_id;
        e->event.buf_id[EXYNOS_DRM_OPS_DST] = qbuf->buf_id;
        e->base.event = &e->event.base;
-       e->base.file_priv = file;
+       e->base.file_priv = c_node->filp;
        e->base.destroy = ipp_free_event;
        mutex_lock(&c_node->event_lock);
        list_add_tail(&e->base.link, &c_node->event_list);
@@ -908,7 +906,7 @@ int exynos_drm_ipp_queue_buf(struct drm_device *drm_dev, void *data,
        switch (qbuf->buf_type) {
        case IPP_BUF_ENQUEUE:
                /* get memory node */
-               m_node = ipp_get_mem_node(drm_dev, file, c_node, qbuf);
+               m_node = ipp_get_mem_node(drm_dev, c_node, qbuf);
                if (IS_ERR(m_node)) {
                        DRM_ERROR("failed to get m_node.\n");
                        return PTR_ERR(m_node);
@@ -921,7 +919,7 @@ int exynos_drm_ipp_queue_buf(struct drm_device *drm_dev, void *data,
                 */
                if (qbuf->ops_id == EXYNOS_DRM_OPS_DST) {
                        /* get event for destination buffer */
-                       ret = ipp_get_event(drm_dev, file, c_node, qbuf);
+                       ret = ipp_get_event(drm_dev, c_node, qbuf);
                        if (ret) {
                                DRM_ERROR("failed to get event.\n");
                                goto err_clean_node;