Received: by 10.213.65.68 with SMTP id h4csp640370imn; Tue, 20 Mar 2018 11:31:40 -0700 (PDT) X-Google-Smtp-Source: AG47ELtztn65FhmwkAqF/w0LavwVo2/4abXpmtYrYTgGjtsdOIXhxSY9LPKiIjeHZZ7AFlig3huf X-Received: by 10.98.67.217 with SMTP id l86mr8907972pfi.40.1521570700489; Tue, 20 Mar 2018 11:31:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521570700; cv=none; d=google.com; s=arc-20160816; b=TtgeIu6StvooT0y9xeif099/Jf7QN/0zmUv4jAeECi0dkGD6wn9E3/I14oxG99Qef4 pRImk8oPsl97OftBNY4LydpjzbxTjSdFz91ZX8voxm/wXRanpfkP1gSF/gSxFFFBZ/4F /+2ik6UGQV8gJonZ4414jZcBFg/PP981Q5hZEhOpshXuSJMotHYUWtLzORZGoPmX9Npv 3NWhItaJSZqnycOjpZy8gDwK4Ah/5glOQ+eu3TFWTHLeFbpTQI71YluU7yadpilpMIfG 5t6P/FjSs/1WwX3cXAqMoaltAiwakcxl1HWjO708EdVlEzl6dZ+lrSbja92UbzMFCc4O sPng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=eU1RCaUM8gT3Qi1alTTjoD/aPi8L66QRRMGja44Ag3k=; b=ZjrXNQyB+nRlOgWhWzDvSDbUGvZgw+eH77rb1bbRwC26+1vSAffu9G5J7Elr2DgjTs xFz6whA77mDuc5Kp/Xr+n8ZGgCxndJYRk1jGHFszBgoA0D9tHLeedBvc4lYhOEhYd+z1 bIDAaplxwsllbnagLoZmvQerduhrjdZrJRCfhLedYXZFod3LDPZheTCEh7+gpQqbIGaI PwmBh92Xpkd6OdK73DPkGhcKZq7q1bZhSWI5PacZdk55Cjh1RYTNjx3/LzHYAEbfmI4k Zq627+B7d0+fPsn9XqZg8jQlzOyBhrTc2DVV5LS0xXpuommyvpDJml5ASexfde0hOyc7 PoVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=SeJFOjnZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h187si1543769pgc.294.2018.03.20.11.31.25; Tue, 20 Mar 2018 11:31:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=SeJFOjnZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751832AbeCTSaS (ORCPT + 99 others); Tue, 20 Mar 2018 14:30:18 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:46603 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751320AbeCTSaR (ORCPT ); Tue, 20 Mar 2018 14:30:17 -0400 Received: by mail-pl0-f65.google.com with SMTP id f5-v6so1514280plj.13 for ; Tue, 20 Mar 2018 11:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=eU1RCaUM8gT3Qi1alTTjoD/aPi8L66QRRMGja44Ag3k=; b=SeJFOjnZS0QqWYWmXwuSrn7GbvguEOv7vgwIsMlyFFQJ+kMjluV2DRBF90irJ6315v EgHWNssvLqjhPx7ryNWq8TU+NI5QIB1wqX6uGL89AForgMlJhaDOhRP/rvOd9aPvHyxK ZlzyUPY/4+77/stksYImNi8hPwPvSQyn3zkBZst1LMqv5pzMI3xVA2nEFLnNUhzMyv86 4aH1poKqR/v4pKGf0ZbpxlWQUcWINICQtyMjq32brSpO0uIsdXktrjc1AWegRIv+CJ4r Et0hQVUP7rnuYa11A9R9nUG6hEIOGLdVyA5Z1AQozH+GWSZrU00adFG1LAv3cqcLId5r 1xSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eU1RCaUM8gT3Qi1alTTjoD/aPi8L66QRRMGja44Ag3k=; b=MhLAeZdP8u6YE/vz+C9FhZWdMe8jP72Ob1fAl9AdzbLFIv/Okvh/C3VTGpgeKBWyHF NS0E7fTnSlwR+w/lrqLvWhey3HZQjUKleAUiewvPuo5VWg+0Ng/BZBWQzoz54VPHcITG tZ5SrThGDy3/hMPoheFQAYj1bVv+voFa2Sk+1vu8WRLdfvNs0g0rFKeRvnVpIXmS1tmJ k+2k7N5Pjx26DeKNYvwWq6uyiGz0S9Na6lcOt5uxXJIi8Zxcp/xg2j6rtCu7QzdaW+ak RC2l1LVyxJVhwYIDX1SnfmGH/PPBAhak65nlKD+VLIbr10e96vGTQnufA3XTP1faxYnq oIEA== X-Gm-Message-State: AElRT7FOUixjghNSjKx1DjCiOh/vQOl/KX2QSbzWDl6g4cXekOMzZ1r/ f5xnQaqAilXyKL+RwkaZEE4= X-Received: by 2002:a17:902:b088:: with SMTP id p8-v6mr2847506plr.235.1521570616304; Tue, 20 Mar 2018 11:30:16 -0700 (PDT) Received: from localhost.localdomain (ResNet-20-23.resnet.ucsb.edu. [169.231.20.23]) by smtp.gmail.com with ESMTPSA id j188sm5495253pfc.7.2018.03.20.11.30.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Mar 2018 11:30:14 -0700 (PDT) From: Santha Meena Ramamoorthy To: airlied@redhat.com Cc: kraxel@redhat.com, airlied@linux.ie, virtualization@lists.linux-foundation.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, outreachy-kernel@googlegroups.com, seanpaul@chromium.org, daniel.vetter@intel.com, Santha Meena Ramamoorthy Subject: [PATCH] drm/qxl: Replace drm_gem_object_reference/unreference() with _get/put() Date: Tue, 20 Mar 2018 11:29:27 -0700 Message-Id: <1521570567-22519-1-git-send-email-santhameena13@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace drm_gem_object_reference/unreference function with *_get/put() suffixes, because it is shorter and consistent with the kernel kref_get/put() functions. The following Coccinelle script was used: @@ expression e; @@ ( -drm_gem_object_reference(e); +drm_gem_object_get(e); | -drm_gem_object_unreference(e); +drm_gem_object_put(e); | -drm_gem_object_unreference_unlocked(e); +drm_gem_object_put_unlocked(e); ) Signed-off-by: Santha Meena Ramamoorthy --- drivers/gpu/drm/qxl/qxl_display.c | 4 ++-- drivers/gpu/drm/qxl/qxl_dumb.c | 2 +- drivers/gpu/drm/qxl/qxl_fb.c | 6 +++--- drivers/gpu/drm/qxl/qxl_gem.c | 2 +- drivers/gpu/drm/qxl/qxl_ioctl.c | 4 ++-- drivers/gpu/drm/qxl/qxl_object.c | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index 9a9214a..ecb35ed 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -309,7 +309,7 @@ void qxl_user_framebuffer_destroy(struct drm_framebuffer *fb) struct qxl_bo *bo = gem_to_qxl_bo(qxl_fb->obj); WARN_ON(bo->shadow); - drm_gem_object_unreference_unlocked(qxl_fb->obj); + drm_gem_object_put_unlocked(qxl_fb->obj); drm_framebuffer_cleanup(fb); kfree(qxl_fb); } @@ -1215,7 +1215,7 @@ qxl_user_framebuffer_create(struct drm_device *dev, ret = qxl_framebuffer_init(dev, qxl_fb, mode_cmd, obj, &qxl_fb_funcs); if (ret) { kfree(qxl_fb); - drm_gem_object_unreference_unlocked(obj); + drm_gem_object_put_unlocked(obj); return NULL; } diff --git a/drivers/gpu/drm/qxl/qxl_dumb.c b/drivers/gpu/drm/qxl/qxl_dumb.c index 11085ab..c666b89 100644 --- a/drivers/gpu/drm/qxl/qxl_dumb.c +++ b/drivers/gpu/drm/qxl/qxl_dumb.c @@ -82,6 +82,6 @@ int qxl_mode_dumb_mmap(struct drm_file *file_priv, return -ENOENT; qobj = gem_to_qxl_bo(gobj); *offset_p = qxl_bo_mmap_offset(qobj); - drm_gem_object_unreference_unlocked(gobj); + drm_gem_object_put_unlocked(gobj); return 0; } diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c index 23af3e3..3388914 100644 --- a/drivers/gpu/drm/qxl/qxl_fb.c +++ b/drivers/gpu/drm/qxl/qxl_fb.c @@ -95,7 +95,7 @@ static void qxlfb_destroy_pinned_object(struct drm_gem_object *gobj) qxl_bo_kunmap(qbo); qxl_bo_unpin(qbo); - drm_gem_object_unreference_unlocked(gobj); + drm_gem_object_put_unlocked(gobj); } int qxl_get_handle_for_primary_fb(struct qxl_device *qdev, @@ -316,11 +316,11 @@ static int qxlfb_create(struct qxl_fbdev *qfbdev, qxl_bo_unpin(qbo); } if (fb && ret) { - drm_gem_object_unreference_unlocked(gobj); + drm_gem_object_put_unlocked(gobj); drm_framebuffer_cleanup(fb); kfree(fb); } - drm_gem_object_unreference_unlocked(gobj); + drm_gem_object_put_unlocked(gobj); return ret; } diff --git a/drivers/gpu/drm/qxl/qxl_gem.c b/drivers/gpu/drm/qxl/qxl_gem.c index 85f5467..f5c1e78 100644 --- a/drivers/gpu/drm/qxl/qxl_gem.c +++ b/drivers/gpu/drm/qxl/qxl_gem.c @@ -98,7 +98,7 @@ int qxl_gem_object_create_with_handle(struct qxl_device *qdev, return r; /* drop reference from allocate - handle holds it now */ *qobj = gem_to_qxl_bo(gobj); - drm_gem_object_unreference_unlocked(gobj); + drm_gem_object_put_unlocked(gobj); return 0; } diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c index e8c0b10..e238a1a 100644 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c @@ -121,7 +121,7 @@ static int qxlhw_handle_to_bo(struct drm_file *file_priv, uint64_t handle, qobj = gem_to_qxl_bo(gobj); ret = qxl_release_list_add(release, qobj); - drm_gem_object_unreference_unlocked(gobj); + drm_gem_object_put_unlocked(gobj); if (ret) return ret; @@ -343,7 +343,7 @@ static int qxl_update_area_ioctl(struct drm_device *dev, void *data, qxl_bo_unreserve(qobj); out: - drm_gem_object_unreference_unlocked(gobj); + drm_gem_object_put_unlocked(gobj); return ret; } diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c index f6b80fe..e9fb0ab 100644 --- a/drivers/gpu/drm/qxl/qxl_object.c +++ b/drivers/gpu/drm/qxl/qxl_object.c @@ -211,13 +211,13 @@ void qxl_bo_unref(struct qxl_bo **bo) if ((*bo) == NULL) return; - drm_gem_object_unreference_unlocked(&(*bo)->gem_base); + drm_gem_object_put_unlocked(&(*bo)->gem_base); *bo = NULL; } struct qxl_bo *qxl_bo_ref(struct qxl_bo *bo) { - drm_gem_object_reference(&bo->gem_base); + drm_gem_object_get(&bo->gem_base); return bo; } @@ -318,7 +318,7 @@ void qxl_bo_force_delete(struct qxl_device *qdev) list_del_init(&bo->list); mutex_unlock(&qdev->gem.mutex); /* this should unref the ttm bo */ - drm_gem_object_unreference_unlocked(&bo->gem_base); + drm_gem_object_put_unlocked(&bo->gem_base); } } -- 2.7.4