From nobody Tue Sep 13 03:10:52 2022 X-Original-To: dev-commits-src-main@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 4MRT4X2RJ0z4cBFW; Tue, 13 Sep 2022 03:10:52 +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 4MRT4X1vLQz4Hs9; Tue, 13 Sep 2022 03:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663038652; 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=7n61Z9OUlchke1Z1mWXdT5c3UgHyUjpjBjr0UXaAN8w=; b=eCqE/rpaJc2bvZvkKhvL+Og5XWI1mkq8oG07ak2mr9XARc4LYPXz3CRMBxNGksgSKX3CIM vleZODhuWl1e4ZYMMnETvM4JIuYtJMYzLH26K71FFF2Od/5DvK17yAC7N0aNjPAFC0CJ/A gdtK+BpvBAWJIgJ7wOWbh7+nWhy1isZG9WWMOGuBmNgnTrob3CZHgFzB4W0Ym6JfoH6mw9 ydSjMIRxZ8Qd+7M4ZkuIsi6iaSajUQO8QBffj04Ow9/blHh+UbJlgT1JPic5stR+PuoZSG /RA2Xt4awu9lZInr+jx+P8BbDCVD/Z61e03UYJtuuyM30jrecR3RMFAR97aW4Q== 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 4MRT4X0zNdz1BjD; Tue, 13 Sep 2022 03:10:52 +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 28D3AqZa069780; Tue, 13 Sep 2022 03:10:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28D3Aqbu069779; Tue, 13 Sep 2022 03:10:52 GMT (envelope-from git) Date: Tue, 13 Sep 2022 03:10:52 GMT Message-Id: <202209130310.28D3Aqbu069779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 3d9bd8252205 - main - qcom_clk: compilation fixes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d9bd8252205c5e4b02a68cf5345bcdc3cbb5239 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663038652; 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=7n61Z9OUlchke1Z1mWXdT5c3UgHyUjpjBjr0UXaAN8w=; b=borhBYGzIeC2ahCC6iOw/3emAZB2b4a99Sed4K7sqZ679aulXWhgH15LoO5nUA2cscFz8D 1peARwTDvPbUUH06TIxGre9LCRjkJja/WZIes5mM7RjEX+fThZlPQRKuEP5QnVrBdwmVqK I5Xfde3+ikKFdEaFh2Vg4bnI6shbmxUTbDBJGsr/fVuQ+nDtf8qToKZNVuezEUYf2VuEjn l+aVgRiN9FLydC1SKdPBr6M2f/XDZtSAozxUjM5H185ZxScJIqqypPQC6IzhAufCm2sAKN P7DvjG/fCy7lIoIsXrs3vwC9oJU0XrfHrQ2WDRDDRp5Mczfp+d064GFKndRbUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663038652; a=rsa-sha256; cv=none; b=NfRY00LZe0S05f2nDw9xYuhsKUUs5k2KXuA3lV5JHx6BMjfTLGRnfBFWMg6C/UWsc4wdM9 RcL3B/Rh3ytT71j6/T07HgwW4RwxTmjKzo7f/Jh//YXIBScoKg6KIuA/xxFCz/M4nmyxWD NWqppdeQ9yHPkfdvENuIQXJzscJIz069LLd6u8+91seUZMTmy3KjM/USd6EM44aw8v3JzE 9hLUEcwEAITSKvKeFbWqjJT5bGglN6Bevdypo3yo8bv/+5VmMIdpI0caq+RwimiIBUHfDR 8mKsT/0SlatPdmaO4hUK12cUO1weXC6LbrYmqfZ/24VI7vYnCQ+kTpRydex5eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=3d9bd8252205c5e4b02a68cf5345bcdc3cbb5239 commit 3d9bd8252205c5e4b02a68cf5345bcdc3cbb5239 Author: Adrian Chadd AuthorDate: 2022-09-12 02:33:18 +0000 Commit: Adrian Chadd CommitDate: 2022-09-13 03:10:25 +0000 qcom_clk: compilation fixes * remove dead code * mark enabled as unused, happens if debugging isn't enabled * log the enabled state if debugging is enabled Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D36533 --- sys/dev/qcom_clk/qcom_clk_apssdiv.c | 3 --- sys/dev/qcom_clk/qcom_clk_rcg2.c | 8 +++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/dev/qcom_clk/qcom_clk_apssdiv.c b/sys/dev/qcom_clk/qcom_clk_apssdiv.c index 75216ba60172..d76c5953f278 100644 --- a/sys/dev/qcom_clk/qcom_clk_apssdiv.c +++ b/sys/dev/qcom_clk/qcom_clk_apssdiv.c @@ -131,9 +131,6 @@ qcom_clk_apssdiv_get_gate_locked(struct qcom_clk_apssdiv_sc *sc) static int qcom_clk_apssdiv_init(struct clknode *clk, device_t dev) { - struct qcom_clk_apssdiv_sc *sc; - - sc = clknode_get_softc(clk); /* * There's only a single parent here for an fixed divisor, diff --git a/sys/dev/qcom_clk/qcom_clk_rcg2.c b/sys/dev/qcom_clk/qcom_clk_rcg2.c index 6257f79259fe..b6ae03e02ced 100644 --- a/sys/dev/qcom_clk/qcom_clk_rcg2.c +++ b/sys/dev/qcom_clk/qcom_clk_rcg2.c @@ -265,7 +265,7 @@ qcom_clk_rcg2_init(struct clknode *clk, device_t dev) struct qcom_clk_rcg2_sc *sc; uint32_t reg; uint32_t idx; - bool enabled; + bool enabled __unused; sc = clknode_get_softc(clk); @@ -282,6 +282,7 @@ qcom_clk_rcg2_init(struct clknode *clk, device_t dev) enabled = false; else enabled = true; + /* mux settings */ CLKDEV_READ_4(clknode_get_device(sc->clknode), QCOM_CLK_RCG2_CFG_OFFSET(sc), ®); @@ -289,8 +290,9 @@ qcom_clk_rcg2_init(struct clknode *clk, device_t dev) idx = (reg & QCOM_CLK_RCG2_CFG_SRC_SEL_MASK) >> QCOM_CLK_RCG2_CFG_SRC_SEL_SHIFT; - DPRINTF(clknode_get_device(sc->clknode), "%s: mux index %u\n", - __func__, idx); + DPRINTF(clknode_get_device(sc->clknode), + "%s: mux index %u, enabled=%d\n", + __func__, idx, enabled); clknode_init_parent_idx(clk, idx); /*