From nobody Fri May 06 22:42:49 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 EE2C51AB7D1E; Fri, 6 May 2022 22:42:50 +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 4Kw5Dp1CnQz3vcS; Fri, 6 May 2022 22:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651876970; 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=4xSGj7bGnmcFqKkl3t2xPh2SJzF6fxkCBOLd86ugSqg=; b=j0/X9t5+xEcAqXP5yGTipkjMkXtK4U1n4p+rWS9S7x9IbJw2nRF23eva2KTAbu42Xqvhdz rzN1QPKWy7evE6IsiSmKpwCLxdgbbnzWCy5n6REks0fSg7qnW5VnvTQwm4wlhnmggwmVez z71kT9kdr7tyZbnED6YHXH4D3DkxlOjOU1lF5FA2FSHDf+mxO0WTk/Q4NV47Jy2tZ4GyeD hzeR11Ae9bimHQ5JY/zpMrNtlDRfm93OtnvbWuaW6IVNzM61TVVZvEUlZ3BxCtpJsRmDXW E5mSzVy1d1nSVbUxNGArm6axSb/wsS++55xIwRyMIoZP45o8XBT4T0ssCqd5kA== 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 D148F24AE5; Fri, 6 May 2022 22:42:49 +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 246Mgnna018879; Fri, 6 May 2022 22:42:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246MgnW0018878; Fri, 6 May 2022 22:42:49 GMT (envelope-from git) Date: Fri, 6 May 2022 22:42:49 GMT Message-Id: <202205062242.246MgnW0018878@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 09fd3b43ad11 - main - Remove isa_devclass from ISA bus drivers. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09fd3b43ad1156d157bc5bd6df270905a82b6094 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651876970; 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=4xSGj7bGnmcFqKkl3t2xPh2SJzF6fxkCBOLd86ugSqg=; b=tug2X95/BxGfDIIt3P1EmHUH05VagnKemQhFDlU7r+S6IsoO6EJvc6VRXr9fxOaKiz8PCc BLjPy5NxeqxBnXC6GOF/jSj3d0TIfieHb+eIlDx+Yrv8DcoqM01k7OQ7qJBaiTh/hofCEi eZVqFjnwbHmZRrReOWi9HhEIszWPNQwagyOxzs4tVV/A1LRcZAOJBvZwbwr5hUfDrmHWBg c9Drb/Z1HiF3n8A66I8yagP6QIaxixZ41bT61//r8G8L/7lp343cCEAtp4aVgnGL6g5ijd gNKkg0Ja0jJYlo5h5pZB3oKWH3sQtyH1CpXSjqNnS/9QB1HXJGi1xijMHwMM+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651876970; a=rsa-sha256; cv=none; b=xpY7emju0R2v4vn8hF5/0nVZUAiS0XhLnpEnFVJdUuhskSc6i5EBGWCScKJgLcKyrAg0fn 84UOBZ7VzpE/VF9v7ORG5L8WRyt209JOFmiX8Hzzny6/22sOsh1vsEwvS16dQuyH2nVEi1 pdbZWE8HEsku/RjV2BVRrfPXOgold0Ye5s0eG2mggzWAYLNLDMhJH1j/RqXkMGjMUh04c0 i8xsxpLzuAkPc/fpMoZpTMroP2yvM0dYxLZp8kxoxgiDezx4LM9lfPBQ8DZRRPyYAQ3MAf xzRohZfuhWrhiTMJkrYJ+uGGmKrpVOEH54ngtiFzWru//k0wVSGEq+C5yBUifg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=09fd3b43ad1156d157bc5bd6df270905a82b6094 commit 09fd3b43ad1156d157bc5bd6df270905a82b6094 Author: John Baldwin AuthorDate: 2022-04-19 18:58:35 +0000 Commit: John Baldwin CommitDate: 2022-05-06 22:39:28 +0000 Remove isa_devclass from ISA bus drivers. --- sys/dev/viapm/viapm.c | 4 ++-- sys/isa/isa_common.c | 6 ++---- sys/isa/isa_common.h | 1 - sys/x86/isa/isa.c | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sys/dev/viapm/viapm.c b/sys/dev/viapm/viapm.c index eda776e90f1c..4f3016eddc21 100644 --- a/sys/dev/viapm/viapm.c +++ b/sys/dev/viapm/viapm.c @@ -1015,8 +1015,8 @@ MODULE_DEPEND(viapropm, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER); MODULE_VERSION(viapm, 1); #ifdef DEV_ISA -DRIVER_MODULE(isa, viapm, isa_driver, isa_devclass, 0, 0); -DRIVER_MODULE(isa, viapropm, isa_driver, isa_devclass, 0, 0); +DRIVER_MODULE(isa, viapm, isa_driver, 0, 0); +DRIVER_MODULE(isa, viapropm, isa_driver, 0, 0); MODULE_DEPEND(viapm, isa, 1, 1, 1); MODULE_DEPEND(viapropm, isa, 1, 1, 1); #endif diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index 1fd3aa998ee4..ec3d01d547ed 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -1099,14 +1099,12 @@ static device_method_t isa_methods[] = { DEFINE_CLASS_0(isa, isa_driver, isa_methods, 0); -devclass_t isa_devclass; - /* * ISA can be attached to a PCI-ISA bridge, or other locations on some * platforms. */ -DRIVER_MODULE(isa, isab, isa_driver, isa_devclass, 0, 0); -DRIVER_MODULE(isa, eisab, isa_driver, isa_devclass, 0, 0); +DRIVER_MODULE(isa, isab, isa_driver, 0, 0); +DRIVER_MODULE(isa, eisab, isa_driver, 0, 0); MODULE_VERSION(isa, 1); /* diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h index 8bffbd8fea28..16113fb85a86 100644 --- a/sys/isa/isa_common.h +++ b/sys/isa/isa_common.h @@ -77,4 +77,3 @@ extern int isa_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r); extern driver_t isa_driver; -extern devclass_t isa_devclass; diff --git a/sys/x86/isa/isa.c b/sys/x86/isa/isa.c index 49402b44ffba..33722ca1f748 100644 --- a/sys/x86/isa/isa.c +++ b/sys/x86/isa/isa.c @@ -144,9 +144,9 @@ isa_release_resource(device_t bus, device_t child, int type, int rid, /* * On this platform, isa can also attach to the legacy bus. */ -DRIVER_MODULE(isa, legacy, isa_driver, isa_devclass, 0, 0); +DRIVER_MODULE(isa, legacy, isa_driver, 0, 0); /* * Attach the ISA bus to the xenpv bus in order to get syscons. */ -DRIVER_MODULE(isa, xenpv, isa_driver, isa_devclass, 0, 0); +DRIVER_MODULE(isa, xenpv, isa_driver, 0, 0);