Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Sep 2023 21:15:49 GMT
From:      Mateusz Guzik <mjg@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: be6f70428d6c - stable/14 - drm2: whack set-but-not-used warns
Message-ID:  <202309182115.38ILFnP4079185@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=be6f70428d6c918998e5430d2b60b9a8897ea9d8

commit be6f70428d6c918998e5430d2b60b9a8897ea9d8
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2023-09-18 21:11:26 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2023-09-18 21:14:19 +0000

    drm2: whack set-but-not-used warns
    
    immediate MFC to unbreak the build
    
    (cherry picked from commit c9130a46bca272492b4f29429ed340504b8eced7)
---
 sys/dev/drm2/drm_fops.c     | 2 +-
 sys/dev/drm2/ttm/ttm_lock.c | 2 +-
 sys/dev/drm2/ttm/ttm_tt.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/dev/drm2/drm_fops.c b/sys/dev/drm2/drm_fops.c
index 5d040e92ed12..316d21a8e731 100644
--- a/sys/dev/drm2/drm_fops.c
+++ b/sys/dev/drm2/drm_fops.c
@@ -536,7 +536,7 @@ void
 drm_event_wakeup(struct drm_pending_event *e)
 {
 	struct drm_file *file_priv;
-	struct drm_device *dev;
+	struct drm_device *dev __diagused;
 
 	file_priv = e->file_priv;
 	dev = file_priv->minor->dev;
diff --git a/sys/dev/drm2/ttm/ttm_lock.c b/sys/dev/drm2/ttm/ttm_lock.c
index 9a8cafbf2abc..1884acb12118 100644
--- a/sys/dev/drm2/ttm/ttm_lock.c
+++ b/sys/dev/drm2/ttm/ttm_lock.c
@@ -245,7 +245,7 @@ static void ttm_vt_lock_remove(struct ttm_base_object **p_base)
 {
 	struct ttm_base_object *base = *p_base;
 	struct ttm_lock *lock = container_of(base, struct ttm_lock, base);
-	int ret;
+	int ret __diagused;
 
 	*p_base = NULL;
 	ret = __ttm_vt_unlock(lock);
diff --git a/sys/dev/drm2/ttm/ttm_tt.c b/sys/dev/drm2/ttm/ttm_tt.c
index 55131c73bdc3..d52df50adeb3 100644
--- a/sys/dev/drm2/ttm/ttm_tt.c
+++ b/sys/dev/drm2/ttm/ttm_tt.c
@@ -243,7 +243,7 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma)
 
 void ttm_tt_unbind(struct ttm_tt *ttm)
 {
-	int ret;
+	int ret __diagused;
 
 	if (ttm->state == tt_bound) {
 		ret = ttm->func->unbind(ttm);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309182115.38ILFnP4079185>