From: Hsin-Yi Wang <hsinyi@chromium.org>
To: Wolfram Sang <wsa@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Cc: linux-i2c@vger.kernel.org, Qii Wang <qii.wang@mediatek.com>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Mark Brown <broonie@kernel.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Bibby Hsieh <bibby.hsieh@mediatek.com>,
Arnd Bergmann <arnd@arndb.de>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
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 [thread overview]
Message-ID: <20210414172916.2689361-7-hsinyi@chromium.org> (raw)
In-Reply-To: <20210414172916.2689361-1-hsinyi@chromium.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 <hsinyi@chromium.org>
Reported-by: kernel test robot <lkp@intel.com>
---
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:
--
2.31.1.295.g9ea45b61b8-goog
next prev parent reply other threads:[~2021-04-14 17:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 17:29 [PATCH v19 0/6] add power control in i2c Hsin-Yi Wang
2021-04-14 17:29 ` [PATCH v19 1/6] i2c: core: support bus regulator controlling in adapter Hsin-Yi Wang
2021-04-14 17:29 ` [PATCH v19 2/6] dt-binding: i2c: mt65xx: add vbus-supply property Hsin-Yi Wang
2021-04-14 22:19 ` [Intel-gfx] " Rob Herring
2021-04-14 17:29 ` [PATCH v19 3/6] i2c: mediatek: mt65xx: add optional vbus-supply Hsin-Yi Wang
2021-04-14 17:29 ` [PATCH v19 4/6] misc: eeprom: at24: check suspend status before disable regulator Hsin-Yi Wang
2021-04-16 14:09 ` Bartosz Golaszewski
2021-04-20 13:33 ` Hsin-Yi Wang
2021-04-14 17:29 ` [PATCH v19 5/6] arm64: dts: mt8183: add supply name for eeprom Hsin-Yi Wang
2021-04-14 17:29 ` Hsin-Yi Wang [this message]
2021-04-16 14:23 ` [PATCH v19 6/6] drm/i915/selftests: Rename functions names Jani Nikula
2021-04-16 14:42 ` Hsin-Yi Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210414172916.2689361-7-hsinyi@chromium.org \
--to=hsinyi@chromium.org \
--cc=arnd@arndb.de \
--cc=bgolaszewski@baylibre.com \
--cc=bibby.hsieh@mediatek.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=m.szyprowski@samsung.com \
--cc=matthias.bgg@gmail.com \
--cc=qii.wang@mediatek.com \
--cc=robh+dt@kernel.org \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).