From nobody Wed Sep 21 10:00:02 2022 X-Original-To: dev-commits-src-all@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 4MXYmy2cq5z4cwN9; Wed, 21 Sep 2022 10:00:02 +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 4MXYmy1t9bz3jKT; Wed, 21 Sep 2022 10:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663754402; 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=ZDD+kUSIHmXLcoV599p6g2U2MSK0GZxFkHmg7xwNTMM=; b=i0B8enAbUGwkehcnvGUnW28SXbDEDlSJd8GJxKr+EA7XiqeZ7niyUofLPbk4wnM0pQOxRW i3KU8nNIAI+omPJjQAWcwRNPaTSTHlFTAMvjAVgnSug1Cjf66uPwaEZa5Nm/bBHo8K2jga 0qrGnQew9S3RQnS/bod9WQJHN3SWwywEaTWu4PSxf3+Mh1rnfKgHv11SQ+nSYkZQR3O8vr iWwfYsta1fRj5sS/86Uq4zdsno5nAVPz1pqYXmF6wWt0aq9IMwxkWCsMmjRNsMGPqhImRA bKh/oNrmp4kc/sDSBrMVOIBEVO7f4QYpohcV+HEJVpwFJAzTJ4XndAapsSqGew== 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 4MXYmy0xy2z1269; Wed, 21 Sep 2022 10:00:02 +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 28LA02K7092203; Wed, 21 Sep 2022 10:00:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28LA02oX092195; Wed, 21 Sep 2022 10:00:02 GMT (envelope-from git) Date: Wed, 21 Sep 2022 10:00:02 GMT Message-Id: <202209211000.28LA02oX092195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 42353d81e3a5 - main - Use DEFINE_CLASS_0 in the arm generic timer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42353d81e3a580442a70404a4fcfcbc16c36ef3f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663754402; 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=ZDD+kUSIHmXLcoV599p6g2U2MSK0GZxFkHmg7xwNTMM=; b=kw+ZylZor4R2OFVuBpS5lraczvGsf90RjcgwlsxvHz7zTUo/XtpTQr3Zxpo3JoYV3HdKaQ Kuss4Nezzc12qNiiuoN1bYed3EpIhbP7aWd1eTM/0dvRzMIv7Mdk7hcCQWgh97qjcqbb19 v9GrMUKFNBiJZv72ScNwM8M75d6gu2hZ0z1uulm23kHbpzUqxbOR6NIO52xlYOWwEYcfEG fER9jQCxt3S/1/UFlt96VX/Wc6wTCqZDLArkPVPaHNOdoDvjChRc7wcxfgvvhzXcBEWwlb NImwFP4MfYcE7i66whzbfhMJlFfsh00c4sDF7PsTta0cfc4hUUkP5Vxq1tcg6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663754402; a=rsa-sha256; cv=none; b=EQqDP/qnKtggpDPzG2dFPBqtvZRheM/2+Q2O0iRmqzbecjQYTyao5GN0enjtZRzaU53P+Y pR3wt2p3F0DKwQNkfuxQhL3il90fw86xW8DTV3QURe/yB8Tv3BSPZ4sMQJPDP5hR/nyuNN BhiGSJLm5t+q75iOQt67XGqydCHM53lD6Osu2HoBueXLcfHD2ZR0jpoRxNn4Ck0wuyCmbv eXKN91O7NExxlub+auRayH0ygwSaCssO5t9bkXpD44KCVL5d/qqEu9pxkyAkFDHQUVCzVr mxveX30oSW1rUqeDrZ89W8e6N3qPSuYosfNvJ+VIpKMT/U4QQyiB6WP6rq1J9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=42353d81e3a580442a70404a4fcfcbc16c36ef3f commit 42353d81e3a580442a70404a4fcfcbc16c36ef3f Author: Andrew Turner AuthorDate: 2022-09-20 16:07:27 +0000 Commit: Andrew Turner CommitDate: 2022-09-21 09:59:14 +0000 Use DEFINE_CLASS_0 in the arm generic timer Rather than defining the structure manually use the DEFINE_CLASS_0 macro. As we have both an ACPI and FDT attachment we need to use the _0 variant of the macro as DEFINE_CLASS would create two structures with the same name. Sponsored by: The FreeBSD Foundation --- sys/arm/arm/generic_timer.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c index aabcfd138012..2527af9b9068 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -553,11 +553,8 @@ static device_method_t arm_tmr_fdt_methods[] = { { 0, 0 } }; -static driver_t arm_tmr_fdt_driver = { - "generic_timer", - arm_tmr_fdt_methods, - sizeof(struct arm_tmr_softc), -}; +static DEFINE_CLASS_0(generic_timer, arm_tmr_fdt_driver, arm_tmr_fdt_methods, + sizeof(struct arm_tmr_softc)); EARLY_DRIVER_MODULE(timer, simplebus, arm_tmr_fdt_driver, 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); @@ -573,11 +570,8 @@ static device_method_t arm_tmr_acpi_methods[] = { { 0, 0 } }; -static driver_t arm_tmr_acpi_driver = { - "generic_timer", - arm_tmr_acpi_methods, - sizeof(struct arm_tmr_softc), -}; +static DEFINE_CLASS_0(generic_timer, arm_tmr_acpi_driver, arm_tmr_acpi_methods, + sizeof(struct arm_tmr_softc)); EARLY_DRIVER_MODULE(timer, acpi, arm_tmr_acpi_driver, 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE);