From patchwork Thu May 7 15:08:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 11534281 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 25421139A for ; Thu, 7 May 2020 15:11:40 +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 03A622073A for ; Thu, 7 May 2020 15:11:40 +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="nodbBDvu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 03A622073A 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 ECBC46EA13; Thu, 7 May 2020 15:11:35 +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 36A996EA13 for ; Thu, 7 May 2020 15:11:33 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id z6so7251431wml.2 for ; Thu, 07 May 2020 08:11:33 -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=wVcIzZl/C4rP8Hgxo4JAutifjDeFEAztIdXfJngfWgA=; b=nodbBDvuzNsHGThc+tgqV2F6xQYredszArQNKqAnBlYc1PtmbPVTHXKKJ+dpH+XOm7 QCLeNUaqJOzMf1AoAM0wofVUJrPYUr0DHMwhKJiQl3hcVu+xognMacztyB+c4qnwv5ad IB8K1yOLQNMoEE824Tx+KVtecvJJmmFbC9FbMfx8V7HoqBf/312EMWPeTkBd/ZFZ2Vsb vK6jPtY1CtdTPO0Ee6zS+H6MNLEGqZhppEPwlLFrTpItvJFN2r9c/+xt1dxGe0ys7kz7 d86f46aO1GITXvMw3jlqesnM9yfpLjOCg8yUJJnnFaf3MwgO9kMeQc90eDd5DEPct6gk dFoA== 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=wVcIzZl/C4rP8Hgxo4JAutifjDeFEAztIdXfJngfWgA=; b=MzulIMGUO9LWHPjIuG6FviF0RNpPvV0shhD+xu6glwi/z6KroYQx4WtnCtH9YLAzKQ YNmS+ptDt/bn7L+iP688TWAE7INn+Nm5ych7TzKu7VVivhPocfadJ/CwS35kA3+IVzdp f5KtJlv57+SDgF6xwhKCGxyNJOZHFdhRLEQDcFAGEMyLRGnbdEUNmsX9sDW7IIN6hNX9 4/Uwx3wc1bwjNjbxy8pVP1a3z8daAwPeJ7ZA0N/vt+W5xjigsbYFt89okKAYNlDEeauK L6cRpiDzZBHX3ozn8El/WsVRXpfE30PKcZauhfpoPKVqlzuKaQL6xYLNWcpvb8SYjVMk G2XA== X-Gm-Message-State: AGi0PuYnJE82SJxZtNE9NfeP4JcENUL0FSNmn3W8ggPm18kQjeWsLPeg mzG9Hc5Bc1lur+v+q9WjsBvIbH7y X-Google-Smtp-Source: APiQypJJ929oq9zJ17YqnsEXgB5LocapEk/o7DpW7FBS/TybtvkRVe4ux3kV6BTEM72tqusQyWK+iQ== X-Received: by 2002:a1c:3182:: with SMTP id x124mr11704785wmx.54.1588864290627; Thu, 07 May 2020 08:11:30 -0700 (PDT) Received: from arch-x1c3.cbg.collabora.co.uk ([2a00:5f00:102:0:9665:9cff:feee:aa4d]) by smtp.gmail.com with ESMTPSA id b66sm8704247wmh.12.2020.05.07.08.11.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2020 08:11:30 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH 28/36] drm/rockchip: remove _unlocked suffix in drm_object_put_unlocked Date: Thu, 7 May 2020 16:08:14 +0100 Message-Id: <20200507150822.114464-29-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200507150822.114464-1-emil.l.velikov@gmail.com> References: <20200507150822.114464-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 --- 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;