Author: mav
Date: Mon Nov 23 20:44:49 2015
New Revision: 291221
URL: https://svnweb.freebsd.org/changeset/base/291221
Log:
Remove "disable" hint, which duplicates system-wide "disabled".
Modified:
head/share/man/man4/isp.4
head/sys/dev/isp/isp_freebsd.h
head/sys/dev/isp/isp_pci.c
head/sys/dev/isp/isp_sbus.c
Modified: head/share/man/man4/isp.4
==============================================================================
--- head/share/man/man4/isp.4 Mon Nov 23 19:44:39 2015 (r291220)
+++ head/share/man/man4/isp.4 Mon Nov 23 20:44:49 2015 (r291221)
@@ -124,8 +124,6 @@ The following options are switchable by
.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 .
Modified: head/sys/dev/isp/isp_freebsd.h
==============================================================================
--- head/sys/dev/isp/isp_freebsd.h Mon Nov 23 19:44:39 2015
(r291220)
+++ head/sys/dev/isp/isp_freebsd.h Mon Nov 23 20:44:49 2015
(r291221)
@@ -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,
Modified: head/sys/dev/isp/isp_pci.c
==============================================================================
--- head/sys/dev/isp/isp_pci.c Mon Nov 23 19:44:39 2015 (r291220)
+++ head/sys/dev/isp/isp_pci.c Mon Nov 23 20:44:49 2015 (r291221)
@@ -456,16 +456,6 @@ isp_get_generic_options(device_t dev, is
{
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);
Modified: head/sys/dev/isp/isp_sbus.c
==============================================================================
--- head/sys/dev/isp/isp_sbus.c Mon Nov 23 19:44:39 2015 (r291220)
+++ head/sys/dev/isp/isp_sbus.c Mon Nov 23 20:44:49 2015 (r291221)
@@ -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 &&
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
