From owner-svn-src-all@freebsd.org Sat Jun 15 21:36:16 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7BB8515D0622; Sat, 15 Jun 2019 21:36:16 +0000 (UTC) (envelope-from ian@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 216148D091; Sat, 15 Jun 2019 21:36:16 +0000 (UTC) (envelope-from ian@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 D1D2C5022; Sat, 15 Jun 2019 21:36:15 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5FLaFWi073798; Sat, 15 Jun 2019 21:36:15 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5FLaFCV073795; Sat, 15 Jun 2019 21:36:15 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201906152136.x5FLaFCV073795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sat, 15 Jun 2019 21:36:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r349084 - in head/sys: arm/allwinner dev/pwm X-SVN-Group: head X-SVN-Commit-Author: ian X-SVN-Commit-Paths: in head/sys: arm/allwinner dev/pwm X-SVN-Commit-Revision: 349084 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 216148D091 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Sat, 15 Jun 2019 21:36:16 -0000 Author: ian Date: Sat Jun 15 21:36:14 2019 New Revision: 349084 URL: https://svnweb.freebsd.org/changeset/base/349084 Log: Rename the channel_max method to channel_count, because that's what it's returning. (If the channel count is 2, then the max channel number is 1.) Modified: head/sys/arm/allwinner/aw_pwm.c head/sys/dev/pwm/pwm_if.m head/sys/dev/pwm/pwmbus.c head/sys/dev/pwm/pwmc.c Modified: head/sys/arm/allwinner/aw_pwm.c ============================================================================== --- head/sys/arm/allwinner/aw_pwm.c Sat Jun 15 21:31:04 2019 (r349083) +++ head/sys/arm/allwinner/aw_pwm.c Sat Jun 15 21:36:14 2019 (r349084) @@ -226,7 +226,7 @@ aw_pwm_detach(device_t dev) } static int -aw_pwm_channel_max(device_t dev, int *nchannel) +aw_pwm_channel_count(device_t dev, int *nchannel) { *nchannel = 1; @@ -363,7 +363,7 @@ static device_method_t aw_pwm_methods[] = { /* pwm interface */ DEVMETHOD(pwm_get_bus, aw_pwm_get_bus), - DEVMETHOD(pwm_channel_max, aw_pwm_channel_max), + DEVMETHOD(pwm_channel_count, aw_pwm_channel_count), DEVMETHOD(pwm_channel_config, aw_pwm_channel_config), DEVMETHOD(pwm_channel_get_config, aw_pwm_channel_get_config), DEVMETHOD(pwm_channel_enable, aw_pwm_channel_enable), Modified: head/sys/dev/pwm/pwm_if.m ============================================================================== --- head/sys/dev/pwm/pwm_if.m Sat Jun 15 21:31:04 2019 (r349083) +++ head/sys/dev/pwm/pwm_if.m Sat Jun 15 21:36:14 2019 (r349084) @@ -100,7 +100,7 @@ METHOD int channel_is_enabled { # # Get the number of channels # -METHOD int channel_max { +METHOD int channel_count { device_t dev; int *nchannel; }; Modified: head/sys/dev/pwm/pwmbus.c ============================================================================== --- head/sys/dev/pwm/pwmbus.c Sat Jun 15 21:31:04 2019 (r349083) +++ head/sys/dev/pwm/pwmbus.c Sat Jun 15 21:36:14 2019 (r349084) @@ -78,7 +78,7 @@ pwmbus_attach(device_t dev) sc->busdev = dev; sc->dev = device_get_parent(dev); - if (PWM_CHANNEL_MAX(sc->dev, &sc->nchannels) != 0 || + if (PWM_CHANNEL_COUNT(sc->dev, &sc->nchannels) != 0 || sc->nchannels == 0) return (ENXIO); Modified: head/sys/dev/pwm/pwmc.c ============================================================================== --- head/sys/dev/pwm/pwmc.c Sat Jun 15 21:31:04 2019 (r349083) +++ head/sys/dev/pwm/pwmc.c Sat Jun 15 21:36:14 2019 (r349084) @@ -67,7 +67,7 @@ pwm_ioctl(struct cdev *dev, u_long cmd, caddr_t data, switch (cmd) { case PWMMAXCHANNEL: nchannel = -1; - rv = PWM_CHANNEL_MAX(sc->pdev, &nchannel); + rv = PWM_CHANNEL_COUNT(sc->pdev, &nchannel); bcopy(&nchannel, data, sizeof(nchannel)); break; case PWMSETSTATE: