From owner-svn-src-head@freebsd.org Sun Jul 8 20:39:24 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69A2F102E167; Sun, 8 Jul 2018 20:39:24 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1CEA988B0A; Sun, 8 Jul 2018 20:39:24 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F25CC2F91; Sun, 8 Jul 2018 20:39:23 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w68KdNnb089754; Sun, 8 Jul 2018 20:39:23 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w68KdNtQ089753; Sun, 8 Jul 2018 20:39:23 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201807082039.w68KdNtQ089753@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 8 Jul 2018 20:39:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336098 - head/sys/dev/cas X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/dev/cas X-SVN-Commit-Revision: 336098 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2018 20:39:24 -0000 Author: imp Date: Sun Jul 8 20:39:23 2018 New Revision: 336098 URL: https://svnweb.freebsd.org/changeset/base/336098 Log: Add PNP info to PCI attachment of cas driver Move module delcaration to be after device table. The PNP_INFO must follow the module declaration. Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy Sponsored by: Google, Inc. (GSoC 2018) Pull Request: https://github.com/bsdimp/freebsd/pull/5 Modified: head/sys/dev/cas/if_cas.c Modified: head/sys/dev/cas/if_cas.c ============================================================================== --- head/sys/dev/cas/if_cas.c Sun Jul 8 20:38:46 2018 (r336097) +++ head/sys/dev/cas/if_cas.c Sun Jul 8 20:39:23 2018 (r336098) @@ -2603,10 +2603,6 @@ static driver_t cas_pci_driver = { sizeof(struct cas_softc) }; -DRIVER_MODULE(cas, pci, cas_pci_driver, cas_devclass, 0, 0); -DRIVER_MODULE(miibus, cas, miibus_driver, miibus_devclass, 0, 0); -MODULE_DEPEND(cas, pci, 1, 1, 1); - static const struct cas_pci_dev { uint32_t cpd_devid; uint8_t cpd_revid; @@ -2618,6 +2614,12 @@ static const struct cas_pci_dev { { 0xabba108e, 0x0, CAS_CAS, "Sun Cassini Gigabit Ethernet" }, { 0, 0, 0, NULL } }; + +DRIVER_MODULE(cas, pci, cas_pci_driver, cas_devclass, 0, 0); +MODULE_PNP_INFO("W32:vendor/device", pci, cas, cas_pci_devlist, + sizeof(cas_pci_devlist[0]), nitems(cas_pci_devlist) - 1); +DRIVER_MODULE(miibus, cas, miibus_driver, miibus_devclass, 0, 0); +MODULE_DEPEND(cas, pci, 1, 1, 1); static int cas_pci_probe(device_t dev)