[src/trunk]: src/sys/external/bsd/drm2/linux Let's try spelling the member th...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b29fd9c44689
branches:  trunk
changeset: 1027973:b29fd9c44689
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 01:23:38 2021 +0000

description:
Let's try spelling the member the same way Linux does.

diffstat:

 sys/external/bsd/drm2/include/linux/reservation.h |   4 ++--
 sys/external/bsd/drm2/linux/linux_reservation.c   |  14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r 5f13d58f2948 -r b29fd9c44689 sys/external/bsd/drm2/include/linux/reservation.h
--- a/sys/external/bsd/drm2/include/linux/reservation.h Sun Dec 19 01:23:30 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/reservation.h Sun Dec 19 01:23:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: reservation.h,v 1.13 2021/12/19 01:21:37 riastradh Exp $       */
+/*     $NetBSD: reservation.h,v 1.14 2021/12/19 01:23:38 riastradh Exp $       */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 struct reservation_object {
        struct ww_mutex         lock;
-       struct seqcount         count;
+       struct seqcount         seq;
 
        struct dma_fence __rcu                  *robj_fence;
        struct reservation_object_list __rcu    *robj_list;
diff -r 5f13d58f2948 -r b29fd9c44689 sys/external/bsd/drm2/linux/linux_reservation.c
--- a/sys/external/bsd/drm2/linux/linux_reservation.c   Sun Dec 19 01:23:30 2021 +0000
+++ b/sys/external/bsd/drm2/linux/linux_reservation.c   Sun Dec 19 01:23:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_reservation.c,v 1.18 2021/12/19 01:21:38 riastradh Exp $ */
+/*     $NetBSD: linux_reservation.c,v 1.19 2021/12/19 01:23:38 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.18 2021/12/19 01:21:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.19 2021/12/19 01:23:38 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/poll.h>
@@ -91,7 +91,7 @@
 {
 
        ww_mutex_init(&robj->lock, &reservation_ww_class);
-       seqcount_init(&robj->count);
+       seqcount_init(&robj->seq);
        robj->robj_fence = NULL;
        robj->robj_list = NULL;
        robj->robj_prealloc = NULL;
@@ -308,7 +308,7 @@
 
        KASSERT(reservation_object_held(robj));
 
-       write_seqcount_begin(&robj->count);
+       write_seqcount_begin(&robj->seq);
 }
 
 /*
@@ -326,7 +326,7 @@
 
        KASSERT(reservation_object_held(robj));
 
-       write_seqcount_end(&robj->count);
+       write_seqcount_end(&robj->seq);
 }
 
 struct reservation_object_read_ticket {
@@ -345,7 +345,7 @@
     struct reservation_object_read_ticket *ticket)
 {
 
-       ticket->version = read_seqcount_begin(&robj->count);
+       ticket->version = read_seqcount_begin(&robj->seq);
 }
 
 /*
@@ -360,7 +360,7 @@
     struct reservation_object_read_ticket *ticket)
 {
 
-       return !read_seqcount_retry(&robj->count, ticket->version);
+       return !read_seqcount_retry(&robj->seq, ticket->version);
 }
 
 /*