From patchwork Fri May 15 09:51:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 11550925 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0639390 for ; Fri, 15 May 2020 09:54:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D8CF720709 for ; Fri, 15 May 2020 09:54:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K5no6ytI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8CF720709 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 31FCD6EC4D; Fri, 15 May 2020 09:54:40 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 395816EC42 for ; Fri, 15 May 2020 09:54:38 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id w64so1948885wmg.4 for ; Fri, 15 May 2020 02:54:38 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=pNLF3OezzIDx+6Z3gzM02gmKo66FU8kqpI8uLC6WUCE=; b=K5no6ytI+zaq7ed6Ziz2Zp/Tn/2PiZFYGy7KOG3EHrDLYWx8r0ExgW8Vg6rZ0fcEsQ eKPdU/eW7ZA2AJUuIw6SYICzAh1+H84B6+Aa9lldM9xRQK9LnGBpCT54F1WY0+ImbQ2k muWhZEKwltqL91T771UtGHFhrBXWj21Qva7vUjcCi0GHCduzBANLd9cUGS3PQZpHjyjF y7+VGaU1eOHbEuNjWSDRonSM/43A4pvUXqeN1m2bqYR/ASw1yUDjWqJHj/CEs6UWSrZH alRmOwlGB7Wp5tu5YIa5K2cfxhkuESrqS7YOpUTcO38uElVfOUpXXxSjvre4/Or2AMd7 TcTg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=pNLF3OezzIDx+6Z3gzM02gmKo66FU8kqpI8uLC6WUCE=; b=iEwdRGYUtqzGUb0u5fztYiY5YdUutG431IaIRpz579JiexvPjdovga0GUlig/lKjp8 uSTOkwFGI4Ob0oTe2yzL8Two5NfL+fZ3KT35rpbTzhxfbtRZ0JaEaa+khjSp0e3WVxGC nyVyDOAN9htle8K7R/UWbsGnWi9Jdh/MMzocyXQbtXdq6isCZqNLlbXRolotDd1GigDq X/8+VbTcZFCIr5E+r0D+34+mwrVWNw5BgAlXV4Fae1qtBKptpxmqqlNwBALs7EITSZHJ 4fK5bV62b4OtIuXU6ZjArkwcKpRllUpxGdrTgBIGHBSvIm3PU4vMU7ME6c7dr5AG/CJQ /7Eg== X-Gm-Message-State: AOAM5304bPh6ztV2g9tjagNyPlDAXBvn2vpQEcB9tJZl8R8rpYF/9TaR xnc0iSzXeHhnZocxlwNBJNkU1YPR X-Google-Smtp-Source: ABdhPJzeqijflI2tVTENtHMws/xjTVmY8yaUzbMFBT0wI74jlCYCx9MUFNaoqaaySXb7K6ib9jR6Ew== X-Received: by 2002:a7b:c7d5:: with SMTP id z21mr3024101wmk.112.1589536476602; Fri, 15 May 2020 02:54:36 -0700 (PDT) Received: from localhost.localdomain (cpc91192-cmbg18-2-0-cust374.5-4.cable.virginm.net. [80.6.113.119]) by smtp.gmail.com with ESMTPSA id s12sm2705817wmc.7.2020.05.15.02.54.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2020 02:54:36 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 30/38] drm/rockchip: remove _unlocked suffix in drm_object_put_unlocked Date: Fri, 15 May 2020 10:51:10 +0100 Message-Id: <20200515095118.2743122-31-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200515095118.2743122-1-emil.l.velikov@gmail.com> References: <20200515095118.2743122-1-emil.l.velikov@gmail.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , emil.l.velikov@gmail.com, Sandy Huang Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Emil Velikov Spelling out _unlocked for each and every driver is a annoying. Especially if we consider how many drivers, do not know (or need to) about the horror stories involving struct_mutex. Just drop the suffix. It makes the API cleaner. Done via the following script: __from=drm_gem_object_put_unlocked __to=drm_gem_object_put for __file in $(git grep --name-only $__from); do sed -i "s/$__from/$__to/g" $__file; done Cc: Sandy Huang Cc: "Heiko Stübner" Cc: David Airlie Signed-off-by: Emil Velikov Acked-by: Sam Ravnborg Acked-by: Heiko Stuebner --- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index 9b13c784b347..3aa37e177667 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -88,7 +88,7 @@ rockchip_fb_create(struct drm_device *dev, struct drm_file *file, struct drm_gem_object **obj = afbc_fb->base.obj; for (i = 0; i < info->num_planes; ++i) - drm_gem_object_put_unlocked(obj[i]); + drm_gem_object_put(obj[i]); kfree(afbc_fb); return ERR_PTR(ret); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c index 0d1884684dcb..b9275ba7c5a5 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -392,7 +392,7 @@ rockchip_gem_create_with_handle(struct drm_file *file_priv, goto err_handle_create; /* drop reference from allocate - handle holds it now. */ - drm_gem_object_put_unlocked(obj); + drm_gem_object_put(obj); return rk_obj;