From nobody Mon Oct 17 10:39:10 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 4MrYQ64jHKz4fWmh; Mon, 17 Oct 2022 10:39:10 +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 4MrYQ645wFz3X7W; Mon, 17 Oct 2022 10:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666003150; 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=wI8pXEAuSdh6awvWMsDnaSFdenqBsHjXsjXW2efBCP4=; b=kVE9Cvuv/4G8S+0xCGFotn4XJu2XmhzXCK5Tlg+08OHzQwg30ozJ+alh93Ll1wNkkmuOdZ nDADnXrp1sgxMkBrjQ9UpS6Dz7BzL4iGSqQefHP7CaAW5oW4UyKSzcTcqlVoSZCN6y4Ldo +NdYatqD2fTb+1ob6ysTVv9+93c/cB9GE/Hd4TCw5X+HqwuSnHr0imKf3JeeV0uVfmQemx Z2L0clskSzys5cmMxPzKsGxYy7Ep4YGr4Jt6LI8Gb5BPlJimFMHe/05jyWHgAFaKylPMdn HNOLfj9f/ppExJCAlknegBtlRE1byhwZWN1ftwwYtkGmAfsQJFqe+ctFDMJOrw== 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 4MrYQ62KJyzn2m; Mon, 17 Oct 2022 10:39:10 +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 29HAdAKh032740; Mon, 17 Oct 2022 10:39:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29HAdA29032739; Mon, 17 Oct 2022 10:39:10 GMT (envelope-from git) Date: Mon, 17 Oct 2022 10:39:10 GMT Message-Id: <202210171039.29HAdA29032739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 69474c060d7c - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 69474c060d7c19c7df9f8ec07cf5b04e5b355190 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666003150; 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=wI8pXEAuSdh6awvWMsDnaSFdenqBsHjXsjXW2efBCP4=; b=iZY6Zxg/CwowFTJxh4HZjYsrEnQkDb8PIzb47g1Hn+ia7PrPKkZx0JqvYVwJ/laHMSNo7s 0hRAerPVx0IBOht5FoKZF6ILfRaWbrYOEIJuBj2EWyNqGh0LSb2uN3tk/g26DH2c7tyK6P 789sOFkIe2J1Cj1V9GjHfF8ncWDor9ummwfB0fj9qMFZsWqPzmYxI3+6YgZSyulG2cmwUX 1PgXm8SJDFsapaZwVuCd3teydTjmX4OjH04twncZPIZv9pJM2m8c9jWdJ8wZGNN4NpE9+s nAA6yviWluXTkpt9XXPZT+2T0cpxF0JY1iXAHtltlaDh62NNR9MntKC2ocqOqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666003150; a=rsa-sha256; cv=none; b=e78dAx7RhQ4P9fYYhSd9IMju4yJd077ZUREJROp9VSyTn0kAR/ZnDGODUhqy0sOdPr6vIK cSwN3PxB0QaOJb22+61ZxV4b9HF3oJCKc3HwORp6YCWvfI4/W3cfRb88A6jtY+aIiav2TP 8i2tseSTrrZ8qWOX2ABASGeLmaqfNgITOUkSFHoPH2g2g6qPsZdB98ehwRHSCvIYCyje+O VGiJaTAq58UfJQd0mlG4IJDzgFFOWBDpTRjB5a+rDqB7Ya7Bnv0ZoOWG2v1wwZsaJRHwbu UHnfgmj3tftkbrzCuQZjtr96klSDn4mBhKZs9Sd/fuTyQ3k0iGH6TFYvs3tvjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=69474c060d7c19c7df9f8ec07cf5b04e5b355190 commit 69474c060d7c19c7df9f8ec07cf5b04e5b355190 Author: Andrew Turner AuthorDate: 2022-09-20 16:07:27 +0000 Commit: Andrew Turner CommitDate: 2022-10-17 08:41:54 +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 (cherry picked from commit 42353d81e3a580442a70404a4fcfcbc16c36ef3f) --- 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 e465d1afbb3d..3f5f65439ddc 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -507,11 +507,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)); static devclass_t arm_tmr_fdt_devclass; @@ -529,11 +526,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)); static devclass_t arm_tmr_acpi_devclass;