Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Nov 2022 17:03:08 GMT
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 501f7030231b - stable/13 - usb: musb_otg_allwinner: de-constify bus_space_tags
Message-ID:  <202211021703.2A2H38r7065004@gitrepo.freebsd.org>

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

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

commit 501f7030231b50ec1d451122dc9d22989e3cdb4a
Author:     Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2022-09-27 16:18:42 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2022-11-02 17:02:24 +0000

    usb: musb_otg_allwinner: de-constify bus_space_tags
    
    The SAN interceptors simply take a bus_space_tag_t, so we're
    dropping qualifiers here.  const semantics with a ptr typedef mean we'd
    have to drop or change the bus_space_tag_t abstraction used in the SAN
    sanitizers in order to make a compatible change there, which likely
    isn't worth it.
    
    Reviewed by:    andrew, markj
    Sponsored by:   Juniper Networks, Inc.
    Sponsored by:   Klara, Inc.
    
    (cherry picked from commit 26d786331bf85c172318badf28b0a5094ad25022)
---
 sys/dev/usb/controller/musb_otg_allwinner.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/sys/dev/usb/controller/musb_otg_allwinner.c b/sys/dev/usb/controller/musb_otg_allwinner.c
index bd23b23fb036..9d85c03bb951 100644
--- a/sys/dev/usb/controller/musb_otg_allwinner.c
+++ b/sys/dev/usb/controller/musb_otg_allwinner.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/condvar.h>
 #include <sys/module.h>
+
 #include <machine/bus.h>
 
 #include <dev/ofw/ofw_bus.h>
@@ -245,7 +246,7 @@ awusbdrd_filt(bus_size_t o)
 static uint8_t
 awusbdrd_bs_r_1(awusb_bs_tag t, bus_space_handle_t h, bus_size_t o)
 {
-	const struct bus_space *bs = t;
+	struct bus_space *bs = t;
 
 	switch (o) {
 	case MUSB2_REG_HWVERS:
@@ -273,7 +274,7 @@ awusbdrd_bs_r_1_noconf(awusb_bs_tag t, bus_space_handle_t h, bus_size_t o)
 static uint16_t
 awusbdrd_bs_r_2(awusb_bs_tag t, bus_space_handle_t h, bus_size_t o)
 {
-	const struct bus_space *bs = t;
+	struct bus_space *bs = t;
 
 	if (awusbdrd_filt(o) != 0)
 		return (0);
@@ -284,7 +285,7 @@ static void
 awusbdrd_bs_w_1(awusb_bs_tag t, bus_space_handle_t h, bus_size_t o,
     uint8_t v)
 {
-	const struct bus_space *bs = t;
+	struct bus_space *bs = t;
 
 	if (awusbdrd_filt(o) != 0)
 		return;
@@ -296,7 +297,7 @@ static void
 awusbdrd_bs_w_2(awusb_bs_tag t, bus_space_handle_t h, bus_size_t o,
     uint16_t v)
 {
-	const struct bus_space *bs = t;
+	struct bus_space *bs = t;
 
 	if (awusbdrd_filt(o) != 0)
 		return;
@@ -308,7 +309,7 @@ static void
 awusbdrd_bs_rm_1(awusb_bs_tag t, bus_space_handle_t h, bus_size_t o,
     uint8_t *d, bus_size_t c)
 {
-	const struct bus_space *bs = t;
+	struct bus_space *bs = t;
 
 	bus_space_read_multi_1(bs_parent_space(bs), h, awusbdrd_reg(o), d, c);
 }
@@ -317,7 +318,7 @@ static void
 awusbdrd_bs_rm_4(awusb_bs_tag t, bus_space_handle_t h, bus_size_t o,
     uint32_t *d, bus_size_t c)
 {
-	const struct bus_space *bs = t;
+	struct bus_space *bs = t;
 
 	bus_space_read_multi_4(bs_parent_space(bs), h, awusbdrd_reg(o), d, c);
 }
@@ -326,7 +327,7 @@ static void
 awusbdrd_bs_wm_1(awusb_bs_tag t, bus_space_handle_t h, bus_size_t o,
     const uint8_t *d, bus_size_t c)
 {
-	const struct bus_space *bs = t;
+	struct bus_space *bs = t;
 
 	if (awusbdrd_filt(o) != 0)
 		return;
@@ -338,7 +339,7 @@ static void
 awusbdrd_bs_wm_4(awusb_bs_tag t, bus_space_handle_t h, bus_size_t o,
     const uint32_t *d, bus_size_t c)
 {
-	const struct bus_space *bs = t;
+	struct bus_space *bs = t;
 
 	if (awusbdrd_filt(o) != 0)
 		return;



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