From patchwork Wed Apr 14 17:29:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 12203463 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE893C433B4 for ; Wed, 14 Apr 2021 17:33:56 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 5297B61164 for ; Wed, 14 Apr 2021 17:33:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5297B61164 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VjImr12khr2zeieTo47eL/f4lR9O5wT4QCu9g/t+dmc=; b=o1McX2rX0m8zVzyfjOP/bw3fN TfmD5//dtEYVGyTRbyAYJZBKwqA1pAkEUfmyf2wKDad3XW4SqV3L3MmJQYKd/qn6SPRBBYyaJMsW8 zHVCQn6EGu+46lVVKAKB2gxrhYuS0S+Hn/J8CW2vEDE9JDAYMohAWkMiIDpJA+av/Vpb4CmVYMIbt b+IMEayDlBl5qzrAAL9MRs4bGgiFjt0RdfqHtZph0Yqy5+gqKHcwQjj4j30CEabdAsJAh4jWMOyKN oVNdAuzm3pGqBGLbWRKYln2OJg0h5qL+BHnIKxPyqGvY6po0zIUCoF3S2ZdhaOp4+LuIcvZsVFb9F WG5Xt6y2w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lWjMl-00DGyH-9T; Wed, 14 Apr 2021 17:31:51 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lWjKh-00DGSS-53 for linux-arm-kernel@desiato.infradead.org; Wed, 14 Apr 2021 17:29:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=70dSAhdvNf9rW7naVyB8FacZo/tKpmgYTIzZpzN71Cs=; b=ytwyHyPrUWfnOmxzSCuYUYsr1I 0qUAlDQH0jToA1NiIc8etpQb/cAfIwE0qUfKMts6BEMe+H28WVqv4fcHPq5QRhNZeZ6wQs+lgUi6b oT3I/ig4A4UG5bWi3HM+PQxhJjVQqIDC3G8Sk57+RyMSP38gpbbgCRmtQ1MOW8SRIIyO51rp6+yrC fs6zwRBGRKlo8lRGXEy9AbqaueauDRe5RcYydWaOeQyOANAgbWdDXMlI7iz9aE0MxL2F+onjZptkM 8pdKbFUGvrX5TIw2hSrfF1GuJliU0/NW2RiTDj79fUWJt2+7wrxYZexPWyi8LYf4ckYRI/gfOgVX4 lRiSbtmw==; Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lWjKe-007ydl-Nb for linux-arm-kernel@lists.infradead.org; Wed, 14 Apr 2021 17:29:41 +0000 Received: by mail-pl1-x62b.google.com with SMTP id h20so10528557plr.4 for ; Wed, 14 Apr 2021 10:29:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=70dSAhdvNf9rW7naVyB8FacZo/tKpmgYTIzZpzN71Cs=; b=LsiMLszNVSqTMFSOmT7Vt7BL2HWjYpQnn9/Ah8Ahmt14VXi38iwnxuRRnAMd7nV+F4 L8OiYKIW4vYpw8N0fUeTwgUCiDMq5+HbPF+3sOym2H36ZFwtvq4PnCKSeplaTzdczwh+ M1/M+ijlrnFtXNjeEsgG7aN63y8Ce7LLt8uSE= 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=70dSAhdvNf9rW7naVyB8FacZo/tKpmgYTIzZpzN71Cs=; b=T9F4gVwHeCv4NzZJISPbX5X1n2kgFMSaWr3mGUZRCPxT3io2VdXEvnSpu/s40eTZWs PXTnCUHSsQODh5ZFfopOHGa263i33vbpNCuWPJRuY4/+TYF0T7aHkyBfR4uEL931JVB1 2DjRKaNMckczEuRnx3Uw1dUb/XFT7TFeBTKnCHZHpR8PgdeJ0PYpSlr4uWOawIEBJxVu f1Ddh3szUYHXaATA/vuUGnEgeEXz+rxT8VQABRwf3jJLmdgN8CsBBP9pIYDByZCWc/en yetSyjZamUgDPmCk5z/5sqvvxjLKUL0NtoJzvll3kBsgDWHgIBUrDE+FguJpPKDjlkEs Nyxg== X-Gm-Message-State: AOAM532kOztkwHxtVopKYbnBjhzu4zz3ylyLXyON8e7gBEsvqQqCnZdm 1N1Ttg+gomdtQ88B3SVc+cmSYA== X-Google-Smtp-Source: ABdhPJwqy6xfsxSkXZwh4yhPlR+yx5Kxrr/lleQqawAAaqaYA9AZc2k7rgE80MSaJDQAOD1ejSDS8w== X-Received: by 2002:a17:90a:ca83:: with SMTP id y3mr4896192pjt.191.1618421380273; Wed, 14 Apr 2021 10:29:40 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:bae3:4af0:9792:1539]) by smtp.gmail.com with ESMTPSA id e31sm63460pjk.4.2021.04.14.10.29.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Apr 2021 10:29:39 -0700 (PDT) From: Hsin-Yi Wang To: Wolfram Sang , Matthias Brugger , Rob Herring , Bartosz Golaszewski Cc: linux-i2c@vger.kernel.org, Qii Wang , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Mark Brown , Marek Szyprowski , Bibby Hsieh , Arnd Bergmann , Jani Nikula , Joonas Lahtinen , intel-gfx@lists.freedesktop.org Subject: [PATCH v19 6/6] drm/i915/selftests: Rename functions names Date: Thu, 15 Apr 2021 01:29:16 +0800 Message-Id: <20210414172916.2689361-7-hsinyi@chromium.org> X-Mailer: git-send-email 2.31.1.295.g9ea45b61b8-goog In-Reply-To: <20210414172916.2689361-1-hsinyi@chromium.org> References: <20210414172916.2689361-1-hsinyi@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210414_102940_789891_C5F2C81D X-CRM114-Status: GOOD ( 14.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org pm_resume and pm_suspend might be conflict with the ones defined in include/linux/suspend.h. Rename pm_resume{suspend} to i915_pm_resume{suspend} since they are only used here. Signed-off-by: Hsin-Yi Wang Reported-by: kernel test robot --- drivers/gpu/drm/i915/selftests/i915_gem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c index dc394fb7ccfa..525afda9d31f 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c @@ -94,7 +94,7 @@ static int pm_prepare(struct drm_i915_private *i915) return 0; } -static void pm_suspend(struct drm_i915_private *i915) +static void i915_pm_suspend(struct drm_i915_private *i915) { intel_wakeref_t wakeref; @@ -116,7 +116,7 @@ static void pm_hibernate(struct drm_i915_private *i915) } } -static void pm_resume(struct drm_i915_private *i915) +static void i915_pm_resume(struct drm_i915_private *i915) { intel_wakeref_t wakeref; @@ -152,12 +152,12 @@ static int igt_gem_suspend(void *arg) if (err) goto out; - pm_suspend(i915); + i915_pm_suspend(i915); /* Here be dragons! Note that with S3RST any S3 may become S4! */ simulate_hibernate(i915); - pm_resume(i915); + i915_pm_resume(i915); err = switch_to_context(ctx); out: @@ -192,7 +192,7 @@ static int igt_gem_hibernate(void *arg) /* Here be dragons! */ simulate_hibernate(i915); - pm_resume(i915); + i915_pm_resume(i915); err = switch_to_context(ctx); out: