From nobody Wed Nov 02 17:03:08 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N2Y9n278yz4gNxL; Wed, 2 Nov 2022 17:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N2Y9m6Kfvz3q4S; Wed, 2 Nov 2022 17:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667408588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbBAtcsAHtmipjOpHmeK0wfu8HZagitbaANC/eb1i2I=; b=UcXuvSo4YfRYeo+QmYlFRzGSvr3zh4IyhKuQDd73PtTfpMj3YyBCp3+M0279iWZt9ns6Yo C6R6wwR8Ri//tje1bhGyfjWGXefrrgjA78HodfQC27exCCCfG12AFxD9qOPglCA+AE+Evc q4aEmpojbweGBQzEUyl4uIA+JSkLjENgkgQczvATbSY3q9do2pKFNq+0byk6dWi4H2tYga atwnlIe/QjpzaTbWiUTX0q3QaXWGjicyln2Ycg3I6bZ8V34MLiDhzcllS7agXhj8KbYCRK NbUdTmnumZatkzD80ZfkbVnp9STqNv5nGVPKY761vPWmqywkISATk2bGSJ1z5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N2Y9m5RYHz13wZ; Wed, 2 Nov 2022 17:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A2H38wp065005; Wed, 2 Nov 2022 17:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A2H38r7065004; Wed, 2 Nov 2022 17:03:08 GMT (envelope-from git) Date: Wed, 2 Nov 2022 17:03:08 GMT Message-Id: <202211021703.2A2H38r7065004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 501f7030231b - stable/13 - usb: musb_otg_allwinner: de-constify bus_space_tags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 501f7030231b50ec1d451122dc9d22989e3cdb4a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667408588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbBAtcsAHtmipjOpHmeK0wfu8HZagitbaANC/eb1i2I=; b=senV9SQQ800zHXEUsscNZB/G7Y5ogBOhhTgttI48IjPot0h1niVva3JUpcqag1Appaktwu KfrBxWX/YwxTQLlCHOEsKQkXYYtqY8oDsqHcCpSlfyssjHEFrT2q+m6jX8yR7YhCWfqxzb PgRQanBmCJUjrFOW6CYT0RijEcpcP8TmFRk6jUa1YUHdHHJBahDAtMzA5utJ8VaE5v93SX fVO7hAkb09Y6Vx35HFojUaxU7EP4UBvxkEsoOWu+396yY58hQP6qp2EYX5RgVhpU2J+v/A rBpLOPb+84CIG5UM93hOr1q+VFP5dQJpNk2sl4cA+tkgEDY/yxQmWtQTtNiI5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667408588; a=rsa-sha256; cv=none; b=WrnnqV8E7KfVnz40g1f8j7TxHE6q64WfLcOouphBffunwD6npMoEKmjWwq6Eg1tGd61zai 2dQnMKIr6tvdvYk0smu6BYu5ee3A6P5RkRVW2v+c4LZ8p59Y+khx6n2C1ID2KtHnaulFL6 FpEo9oGmbKp8Y3Z/Cz+scKtzINJsQP7eiiSB6RXsuk6TizOkq+PaLZSPeb/zueIlvhCSQl XAxIpzx1KcmxCXEBvyEt3DImSEuLjQw+FQXMqSBj/rzvFQ1flQAfFpcfYlnlcBLcJoJD+Q 4zKpdcTIZs2/7iO7y6GPw3eNc+SKNjcn1V5q6wOrNwSD2pjH9E3n9mQcYegdpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=501f7030231b50ec1d451122dc9d22989e3cdb4a commit 501f7030231b50ec1d451122dc9d22989e3cdb4a Author: Mitchell Horne AuthorDate: 2022-09-27 16:18:42 +0000 Commit: Kyle Evans 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 #include #include + #include #include @@ -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;