git: d0822dee1dfb - stable/12 - devd: remove pccard entries

[Warner Losh]

The branch stable/12 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=d0822dee1dfbe2fd1ceee64d6f7932a3be7d3ae7

commit d0822dee1dfbe2fd1ceee64d6f7932a3be7d3ae7
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-07-15 22:17:33 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-07-21 16:16:33 +0000

    devd: remove pccard entries
    
    The pccard entries are now obsolete, remove them.
    
    Sponsored by:           Netflix
    Differential Revision:  https://reviews.freebsd.org/D31184
    
    (cherry picked from commit a53541355645080cb6d94466f5363db0941da4fa)
---
 sbin/devd/devd.conf | 37 +------------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/sbin/devd/devd.conf b/sbin/devd/devd.conf
index 99acaf6f30bc..430bf868a677 100644
--- a/sbin/devd/devd.conf
+++ b/sbin/devd/devd.conf
@@ -191,23 +191,8 @@ nomatch 10 {
 		bus $bus";
 };
 
-# Some PC-CARDs don't offer numerical manufacturer/product IDs, just
+# Some Cardbus cards don't offer numerical manufacturer/product IDs, just
 # show the CIS info there.
-nomatch 20 {
-	match "bus" "pccard[0-9]+";
-	match "manufacturer" "0xffffffff";
-	match "product" "0xffffffff";
-	action "logger Unknown PCCARD device: CISproduct $cisproduct \
-		CIS-vendor $cisvendor bus $bus";
-};
-
-nomatch 10 {
-	match "bus" "pccard[0-9]+";
-	action "logger Unknown PCCARD device: manufacturer $manufacturer \
-		product $product CISproduct $cisproduct CIS-vendor \
-		$cisvendor bus $bus";
-};
-
 nomatch 10 {
 	match "bus" "cardbus[0-9]+";
 	action "logger Unknown Cardbus device: device $device class $class \
@@ -246,26 +231,6 @@ notify 10 {
 
 /* EXAMPLES TO END OF FILE
 
-# An example of something that a vendor might install if you were to
-# add their device.  This might reside in /usr/local/etc/devd/deqna.conf.
-# A deqna is, in this hypothetical example, a pccard ethernet-like device.
-# Students of history may know other devices by this name, and will get
-# the in-jokes in this entry.
-nomatch 10 {
-	match "bus" "pccard[0-9]+";
-	match "manufacturer" "0x1234";
-	match "product" "0x2323";
-	action "kldload -n if_deqna";
-};
-attach 10 {
-	device-name "deqna[0-9]+";
-	action "/etc/pccard_ether $device-name start";
-};
-detach 10 {
-	device-name "deqna[0-9]+";
-	action "/etc/pccard_ether $device-name stop";
-};
-
 # Examples of notify hooks.  A notify is a generic way for a kernel
 # subsystem to send event notification to userland.