From nobody Tue May 10 17:36:26 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 08E8E1AD06B5; Tue, 10 May 2022 17:36:28 +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 4KyQFQ6cfRz4hft; Tue, 10 May 2022 17:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652204188; 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=bx9zM6HEBdQveGVRMzqM+EIH0gHqvRORGGW7Uh/tSG8=; b=o8TU2jEQnajv9g6aoIzUZQKuwOTH4CNZ3LjgDuNbobFFUA/JDLcvACAG9FrSgSAsieHfsX 5NLsb/937eLzojHoncT4d+RxDNq7QimvwxEynFWMcCKJvoivQXQzAGQCSx3oPHH1ZqggoM 3XeS3UhQEZ5hMMiiyLbC1RkqVk7YttXNpAcNREEuT2OeDCu8PLD7bAZ83TGjQYvZ4Cbg4g d9PwgC3TaREHvso/5NI+ZyF6B6WXH1wUCPmtWqJYrSRvTXd3l/YYwLi/GT64S/IKxL/Sj6 073b+eU2wzCd69el5ZBhU6rCmY1PnQGb8j52TskS4td2GPTnMGwma5yUKRfWjg== 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 BCF3B1939; Tue, 10 May 2022 17:36:26 +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 24AHaQ9C099106; Tue, 10 May 2022 17:36:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24AHaQ4f099105; Tue, 10 May 2022 17:36:26 GMT (envelope-from git) Date: Tue, 10 May 2022 17:36:26 GMT Message-Id: <202205101736.24AHaQ4f099105@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: 9b9a5327820d - main - powerpc pseries: Remove unused devclass arguments to DRIVER_MODULE. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b9a5327820d336b36126db7b3252100ef57ee50 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652204188; 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=bx9zM6HEBdQveGVRMzqM+EIH0gHqvRORGGW7Uh/tSG8=; b=aynIpsObBMI6/h5vypBukySPP85qBjbgjA+laE7uR0VcNt0czo6Y1bjJu02MGdWsEmNVbl pYGEjzTjwK9hOcuGuacI+Kq5EW3b5z0JLN+35ZD5oenYJFJgw8pukRrJ5oKkbetRQSM4N4 4cGRP49EUpqMAhIr4hNFecs3MNSvS/bfuUOAX2GU/QfnUSPD6JiP3puzxFmmt8pe2EhP1t mq4feRS+quOTJGdCuC7wTCvHf/JK23DPlkYHE8HWX2EYSE8Jb2/pszp1olYBR8nZPezA1G HmHCMYBm+zOFsZkW8x2yAXIQ+OkoCEGjVqPbBdXt26lb+n04CA243ObEmXQB0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652204188; a=rsa-sha256; cv=none; b=aJkDkBDo1qAPg/DiiiMTC9hUava58UG4nRDjNog42CE377L4Zr6WiZEWQ2pxnGAeYLj2al oVv8HFDSk+2o135jNLIp1QrfACWb8yxcRoM+HiisvjYfd4FVrGKN59peONSRioNScoIxq1 YhN3A9ukI0Rwn1/SnlIf/QlCufZ4+l4rixF4LTkLsnHyyoNFZD4aKzfLDM3GEdFzeJn2NQ 1kQtEoKvdSmlR77nVkzWZth8viAknPH6sKYS4iIuNcFlFfoZf8vr3kw4nykXMWbJFooaFL vBQTX4rZeAH7IogqbjR18o4hcM/zm4ndOXlqGP1XbLB+IbhUizMCf9Z8WzO9/w== 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=9b9a5327820d336b36126db7b3252100ef57ee50 commit 9b9a5327820d336b36126db7b3252100ef57ee50 Author: John Baldwin AuthorDate: 2022-05-10 17:21:38 +0000 Commit: John Baldwin CommitDate: 2022-05-10 17:21:38 +0000 powerpc pseries: Remove unused devclass arguments to DRIVER_MODULE. --- sys/powerpc/pseries/phyp_llan.c | 5 +++-- sys/powerpc/pseries/phyp_vscsi.c | 5 +++-- sys/powerpc/pseries/plpar_pcibus.c | 3 +-- sys/powerpc/pseries/rtas_dev.c | 4 +--- sys/powerpc/pseries/rtas_pci.c | 3 +-- sys/powerpc/pseries/vdevice.c | 4 +--- sys/powerpc/pseries/xics.c | 9 ++------- 7 files changed, 12 insertions(+), 21 deletions(-) diff --git a/sys/powerpc/pseries/phyp_llan.c b/sys/powerpc/pseries/phyp_llan.c index 1edc342ceb44..accb8406f043 100644 --- a/sys/powerpc/pseries/phyp_llan.c +++ b/sys/powerpc/pseries/phyp_llan.c @@ -127,19 +127,20 @@ static void llan_rx_load_cb(void *xsc, bus_dma_segment_t *segs, int nsegs, static int llan_add_rxbuf(struct llan_softc *sc, struct llan_xfer *rx); static int llan_set_multicast(struct llan_softc *sc); -static devclass_t llan_devclass; static device_method_t llan_methods[] = { DEVMETHOD(device_probe, llan_probe), DEVMETHOD(device_attach, llan_attach), DEVMETHOD_END }; + static driver_t llan_driver = { "llan", llan_methods, sizeof(struct llan_softc) }; -DRIVER_MODULE(llan, vdevice, llan_driver, llan_devclass, 0, 0); + +DRIVER_MODULE(llan, vdevice, llan_driver, 0, 0); static int llan_probe(device_t dev) diff --git a/sys/powerpc/pseries/phyp_vscsi.c b/sys/powerpc/pseries/phyp_vscsi.c index 5e72daa56dae..a5828be2aff1 100644 --- a/sys/powerpc/pseries/phyp_vscsi.c +++ b/sys/powerpc/pseries/phyp_vscsi.c @@ -250,7 +250,6 @@ static void vscsi_scsi_command(void *xxp, bus_dma_segment_t *segs, static void vscsi_task_management(struct vscsi_softc *sc, union ccb *ccb); static void vscsi_srp_response(struct vscsi_xfer *, struct vscsi_crq *); -static devclass_t vscsi_devclass; static device_method_t vscsi_methods[] = { DEVMETHOD(device_probe, vscsi_probe), DEVMETHOD(device_attach, vscsi_attach), @@ -258,12 +257,14 @@ static device_method_t vscsi_methods[] = { DEVMETHOD_END }; + static driver_t vscsi_driver = { "vscsi", vscsi_methods, sizeof(struct vscsi_softc) }; -DRIVER_MODULE(vscsi, vdevice, vscsi_driver, vscsi_devclass, 0, 0); + +DRIVER_MODULE(vscsi, vdevice, vscsi_driver, 0, 0); MALLOC_DEFINE(M_VSCSI, "vscsi", "CAM device queue for VSCSI"); static int diff --git a/sys/powerpc/pseries/plpar_pcibus.c b/sys/powerpc/pseries/plpar_pcibus.c index 23abb4acd53b..1c0786402ef7 100644 --- a/sys/powerpc/pseries/plpar_pcibus.c +++ b/sys/powerpc/pseries/plpar_pcibus.c @@ -69,10 +69,9 @@ static device_method_t plpar_pcibus_methods[] = { DEVMETHOD_END }; -static devclass_t pci_devclass; DEFINE_CLASS_1(pci, plpar_pcibus_driver, plpar_pcibus_methods, sizeof(struct pci_softc), ofw_pcibus_driver); -DRIVER_MODULE(plpar_pcibus, pcib, plpar_pcibus_driver, pci_devclass, 0, 0); +DRIVER_MODULE(plpar_pcibus, pcib, plpar_pcibus_driver, 0, 0); static int plpar_pcibus_probe(device_t dev) diff --git a/sys/powerpc/pseries/rtas_dev.c b/sys/powerpc/pseries/rtas_dev.c index 55d2b2d3a92f..4f3af890688a 100644 --- a/sys/powerpc/pseries/rtas_dev.c +++ b/sys/powerpc/pseries/rtas_dev.c @@ -74,9 +74,7 @@ static driver_t rtasdev_driver = { 0 }; -static devclass_t rtasdev_devclass; - -DRIVER_MODULE(rtasdev, ofwbus, rtasdev_driver, rtasdev_devclass, 0, 0); +DRIVER_MODULE(rtasdev, ofwbus, rtasdev_driver, 0, 0); static int rtasdev_probe(device_t dev) diff --git a/sys/powerpc/pseries/rtas_pci.c b/sys/powerpc/pseries/rtas_pci.c index 3c03724cf3d6..876eb24a592a 100644 --- a/sys/powerpc/pseries/rtas_pci.c +++ b/sys/powerpc/pseries/rtas_pci.c @@ -99,10 +99,9 @@ struct rtaspci_softc { int sc_extended_config; }; -static devclass_t rtaspci_devclass; DEFINE_CLASS_1(pcib, rtaspci_driver, rtaspci_methods, sizeof(struct rtaspci_softc), ofw_pcib_driver); -DRIVER_MODULE(rtaspci, ofwbus, rtaspci_driver, rtaspci_devclass, 0, 0); +DRIVER_MODULE(rtaspci, ofwbus, rtaspci_driver, 0, 0); static int rtaspci_probe(device_t dev) diff --git a/sys/powerpc/pseries/vdevice.c b/sys/powerpc/pseries/vdevice.c index fa0fafb2d67d..dcc79b5ad903 100644 --- a/sys/powerpc/pseries/vdevice.c +++ b/sys/powerpc/pseries/vdevice.c @@ -103,9 +103,7 @@ static driver_t vdevice_driver = { 0 }; -static devclass_t vdevice_devclass; - -DRIVER_MODULE(vdevice, ofwbus, vdevice_driver, vdevice_devclass, 0, 0); +DRIVER_MODULE(vdevice, ofwbus, vdevice_driver, 0, 0); static int vdevice_probe(device_t dev) diff --git a/sys/powerpc/pseries/xics.c b/sys/powerpc/pseries/xics.c index b3ddf3f0bf15..7fd68baf2205 100644 --- a/sys/powerpc/pseries/xics.c +++ b/sys/powerpc/pseries/xics.c @@ -155,13 +155,8 @@ static driver_t xics_driver = { static uint32_t cpu_xirr[MAXCPU]; #endif -static devclass_t xicp_devclass; -static devclass_t xics_devclass; - -EARLY_DRIVER_MODULE(xicp, ofwbus, xicp_driver, xicp_devclass, 0, 0, - BUS_PASS_INTERRUPT-1); -EARLY_DRIVER_MODULE(xics, ofwbus, xics_driver, xics_devclass, 0, 0, - BUS_PASS_INTERRUPT); +EARLY_DRIVER_MODULE(xicp, ofwbus, xicp_driver, 0, 0, BUS_PASS_INTERRUPT - 1); +EARLY_DRIVER_MODULE(xics, ofwbus, xics_driver, 0, 0, BUS_PASS_INTERRUPT); #ifdef POWERNV static struct resource *