diff options
author | mav <mav@FreeBSD.org> | 2015-11-30 21:57:16 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2015-11-30 21:57:16 +0000 |
commit | b7a97f633885df312d545c6aef705d33bc34b9b0 (patch) | |
tree | cfb99da43af0b35150d0f28d3fdcd6ddb4b09c83 | |
parent | 4cf0c712d6689f77afd96295f5f093f4b2f0dc76 (diff) | |
download | FreeBSD-src-b7a97f633885df312d545c6aef705d33bc34b9b0.zip FreeBSD-src-b7a97f633885df312d545c6aef705d33bc34b9b0.tar.gz |
MFC r291221: Remove "disable" hint, which duplicates system-wide "disabled".
-rw-r--r-- | share/man/man4/isp.4 | 2 | ||||
-rw-r--r-- | sys/dev/isp/isp_freebsd.h | 1 | ||||
-rw-r--r-- | sys/dev/isp/isp_pci.c | 20 | ||||
-rw-r--r-- | sys/dev/isp/isp_sbus.c | 13 |
4 files changed, 0 insertions, 36 deletions
diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4 index 7a39d92..71050a2 100644 --- a/share/man/man4/isp.4 +++ b/share/man/man4/isp.4 @@ -124,8 +124,6 @@ The following options are switchable by setting values in .Pp They are: .Bl -tag -width indent -.It Va hint.isp.0.disable -A hint value to disable driver in kernel. .It Va hint.isp.0.fwload_disable A hint value to disable loading of firmware .Xr ispfw 4 . diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 1a74024..8712cec 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -311,7 +311,6 @@ struct isposinfo { timer_active : 1, autoconf : 1, ehook_active : 1, - disabled : 1, mbox_sleeping : 1, mbox_sleep_ok : 1, mboxcmd_done : 1, diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index b5b8636..26fae24 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -456,16 +456,6 @@ isp_get_generic_options(device_t dev, ispsoftc_t *isp) { int tval; - /* - * Figure out if we're supposed to skip this one. - */ - tval = 0; - if (resource_int_value(device_get_name(dev), device_get_unit(dev), "disable", &tval) == 0 && tval) { - device_printf(dev, "disabled at user request\n"); - isp->isp_osinfo.disabled = 1; - return; - } - tval = 0; if (resource_int_value(device_get_name(dev), device_get_unit(dev), "fwload_disable", &tval) == 0 && tval != 0) { isp->isp_confopts |= ISP_CFG_NORELOAD; @@ -710,16 +700,6 @@ isp_pci_attach(device_t dev) isp_get_generic_options(dev, isp); /* - * Check to see if options have us disabled - */ - if (isp->isp_osinfo.disabled) { - /* - * But return zero to preserve unit numbering - */ - return (0); - } - - /* * Get PCI options- which in this case are just mapping preferences. */ isp_get_pci_options(dev, &m1, &m2); diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c index 4ef6da4..cb8f169 100644 --- a/sys/dev/isp/isp_sbus.c +++ b/sys/dev/isp/isp_sbus.c @@ -155,19 +155,6 @@ isp_sbus_attach(device_t dev) sbs->sbus_dev = dev; sbs->sbus_mdvec = mdvec; - /* - * Figure out if we're supposed to skip this one. - * If we are, we actually go to ISP_ROLE_NONE. - */ - - tval = 0; - if (resource_int_value(device_get_name(dev), device_get_unit(dev), - "disable", &tval) == 0 && tval) { - device_printf(dev, "device is disabled\n"); - /* but return 0 so the !$)$)*!$*) unit isn't reused */ - return (0); - } - role = 0; if (resource_int_value(device_get_name(dev), device_get_unit(dev), "role", &role) == 0 && |