Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 8 Jul 2018 20:40:10 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r336106 - head/sys/dev/ciss
Message-ID:  <201807082040.w68KeAOY090218@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: imp
Date: Sun Jul  8 20:40:10 2018
New Revision: 336106
URL: https://svnweb.freebsd.org/changeset/base/336106

Log:
  Add PNP info to PCI attachments of ciss driver
  
  Move the module declaration so that it's after the device table.
  The PNP_INFO must come after the module declaration.
  
  Reviewed by: imp, chuck
  Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com>
  Sponsored by: Google, Inc. (GSoC 2018)
  Differential Revision: https://reviews.freebsd.org/D15995

Modified:
  head/sys/dev/ciss/ciss.c

Modified: head/sys/dev/ciss/ciss.c
==============================================================================
--- head/sys/dev/ciss/ciss.c	Sun Jul  8 20:40:06 2018	(r336105)
+++ head/sys/dev/ciss/ciss.c	Sun Jul  8 20:40:10 2018	(r336106)
@@ -222,11 +222,6 @@ static driver_t ciss_pci_driver = {
     sizeof(struct ciss_softc)
 };
 
-static devclass_t	ciss_devclass;
-DRIVER_MODULE(ciss, pci, ciss_pci_driver, ciss_devclass, 0, 0);
-MODULE_DEPEND(ciss, cam, 1, 1, 1);
-MODULE_DEPEND(ciss, pci, 1, 1, 1);
-
 /*
  * Control device interface.
  */
@@ -271,6 +266,7 @@ TUNABLE_INT("hw.ciss.force_transport", &ciss_force_tra
 static int ciss_force_interrupt = 0;
 TUNABLE_INT("hw.ciss.force_interrupt", &ciss_force_interrupt);
 
+
 /************************************************************************
  * CISS adapters amazingly don't have a defined programming interface
  * value.  (One could say some very despairing things about PCI and
@@ -365,6 +361,13 @@ static struct
     { 0x103C, 0x21CE, CISS_BOARD_SA5,   "HP Smart Array H240nr" },
     { 0, 0, 0, NULL }
 };
+
+static devclass_t	ciss_devclass;
+DRIVER_MODULE(ciss, pci, ciss_pci_driver, ciss_devclass, 0, 0);
+MODULE_PNP_INFO("U16:vendor;U16:device;", pci, ciss, ciss_vendor_data,
+    sizeof(ciss_vendor_data[0]), nitems(ciss_vendor_data) - 1);
+MODULE_DEPEND(ciss, cam, 1, 1, 1);
+MODULE_DEPEND(ciss, pci, 1, 1, 1);
 
 /************************************************************************
  * Find a match for the device in our list of known adapters.

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807082040.w68KeAOY090218>