d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "disable" hint, which duplicates system-wide "disabled".

Browse Source
This commit is contained in:
Alexander Motin 2015-11-23 20:44:49 +00:00
parent ba23388ab8
commit e3a0bc583b
4 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/man/man4/isp.4
View File

@ -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 .

1
sys/dev/isp/isp_freebsd.h
View File

@ -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,

20
sys/dev/isp/isp_pci.c
View File

@ -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;
@ -709,16 +699,6 @@ isp_pci_attach(device_t dev)
isp_nvports = 0;
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.
*/

13
sys/dev/isp/isp_sbus.c
View File

@ -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 &&