From 906b9eae84dc953fa3c2496ac5d5d4d7966af7ef Mon Sep 17 00:00:00 2001 From: imp Date: Mon, 22 Oct 2018 02:36:31 +0000 Subject: [PATCH] Remove the long obsolete SYM_SETUP_LP_PROBE_MAP option. It's not been needed for almost 20 years, and is totally useless now that ncr(4) has been removed. Relnotes: yes --- sys/conf/options | 5 ----- sys/dev/sym/sym_hipd.c | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/conf/options b/sys/conf/options index 5e3f99fd52c..2519d17411e 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -374,11 +374,6 @@ SCSI_PT_DEFAULT_TIMEOUT opt_pt.h SES_ENABLE_PASSTHROUGH opt_ses.h # Options used in dev/sym/ (Symbios SCSI driver). -SYM_SETUP_LP_PROBE_MAP opt_sym.h #-Low Priority Probe Map (bits) - # Allows the ncr to take precedence - # 1 (1<<0) -> 810a, 860 - # 2 (1<<1) -> 825a, 875, 885, 895 - # 4 (1<<2) -> 895a, 896, 1510d SYM_SETUP_SCSI_DIFF opt_sym.h #-HVD support for 825a, 875, 885 # disabled:0 (default), enabled:1 SYM_SETUP_PCI_PARITY opt_sym.h #-PCI parity checking diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c index 5b9f9c85edd..c338053ad6f 100644 --- a/sys/dev/sym/sym_hipd.c +++ b/sys/dev/sym/sym_hipd.c @@ -8387,8 +8387,7 @@ sym_pci_probe(device_t dev) chip = sym_find_pci_chip(dev); if (chip && sym_find_firmware(chip)) { device_set_desc(dev, chip->name); - return (chip->lp_probe_bit & SYM_SETUP_LP_PROBE_MAP)? - BUS_PROBE_LOW_PRIORITY : BUS_PROBE_DEFAULT; + return BUS_PROBE_DEFAULT; } return ENXIO; } -- 2.45.0