From owner-svn-src-head@freebsd.org Mon Nov 23 20:44:51 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7C98FA366F8; Mon, 23 Nov 2015 20:44:51 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38C681B03; Mon, 23 Nov 2015 20:44:51 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tANKiosh012928; Mon, 23 Nov 2015 20:44:50 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tANKiohR012924; Mon, 23 Nov 2015 20:44:50 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201511232044.tANKiohR012924@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 23 Nov 2015 20:44:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291221 - in head: share/man/man4 sys/dev/isp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2015 20:44:51 -0000 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 &&