From owner-svn-src-all@freebsd.org Thu Oct 17 06:21:09 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B4FCC16F8C4; Thu, 17 Oct 2019 06:21:09 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46tzZF4NKTz3MFF; Thu, 17 Oct 2019 06:21:09 +0000 (UTC) (envelope-from avg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7AF041C5C7; Thu, 17 Oct 2019 06:21:09 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9H6L9wU029753; Thu, 17 Oct 2019 06:21:09 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9H6L9Ge029752; Thu, 17 Oct 2019 06:21:09 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201910170621.x9H6L9Ge029752@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 17 Oct 2019 06:21:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353677 - head/sys/dev/wbwd X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/sys/dev/wbwd X-SVN-Commit-Revision: 353677 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2019 06:21:09 -0000 Author: avg Date: Thu Oct 17 06:21:09 2019 New Revision: 353677 URL: https://svnweb.freebsd.org/changeset/base/353677 Log: wbwd: small clean-ups and improvements This change applies some suggestions by delphij from D21979. A write-only variable is removed. There is a diagnostic message if the driver does not recognize the chip. A chained if-statement is converted to a switch. MFC after: 3 weeks Modified: head/sys/dev/wbwd/wbwd.c Modified: head/sys/dev/wbwd/wbwd.c ============================================================================== --- head/sys/dev/wbwd/wbwd.c Thu Oct 17 05:50:57 2019 (r353676) +++ head/sys/dev/wbwd/wbwd.c Thu Oct 17 06:21:09 2019 (r353677) @@ -466,7 +466,7 @@ wb_probe(device_t dev) { char buf[128]; struct wb_softc *sc; - int found, j; + int j; uint8_t devid; uint8_t revid; @@ -478,7 +478,6 @@ wb_probe(device_t dev) sc = device_get_softc(dev); devid = superio_devid(dev) >> 8; revid = superio_revid(dev); - found = 0; for (j = 0; j < nitems(wb_devs); j++) { if (wb_devs[j].device_id == devid) { sc->chip = wb_devs[j].chip; @@ -489,6 +488,11 @@ wb_probe(device_t dev) return (BUS_PROBE_SPECIFIC); } } + if (bootverbose) { + device_printf(dev, + "unrecognized chip: devid 0x%02x, revid 0x%02x\n", + devid, revid); + } return (ENXIO); } @@ -504,20 +508,27 @@ wb_attach(device_t dev) sc = device_get_softc(dev); sc->dev = dev; - sc->ctl_reg = 0xf5; - sc->time_reg = 0xf6; - sc->csr_reg = 0xf7; - if (sc->chip == w83697hf || sc->chip == w83697ug) { + /* Make sure WDT is enabled. */ + superio_dev_enable(dev, WB_LDN8_CR30_ACTIVE); + + switch (sc->chip) { + case w83697hf: + case w83697ug: sc->ctl_reg = 0xf3; sc->time_reg = 0xf4; - } else if (sc->chip == nct6102) { + sc->csr_reg = 0xf7; + break; + case nct6102: sc->ctl_reg = 0xf0; sc->time_reg = 0xf1; sc->csr_reg = 0xf2; + break; + default: + sc->ctl_reg = 0xf5; + sc->time_reg = 0xf6; + sc->csr_reg = 0xf7; + break; } - - /* Make sure WDT is enabled. */ - superio_dev_enable(dev, WB_LDN8_CR30_ACTIVE); switch (sc->chip) { case w83627hf: