From nobody Mon Feb 12 11:08:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TYMCN38FNz59bDZ; Mon, 12 Feb 2024 11:08:48 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYMCN2WRFz4Xyk; Mon, 12 Feb 2024 11:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707736128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9B5EhbRzLOm+xGgZPwoQP5kadiPxpQNdQg9UCNwWDCA=; b=SPOEDoj3Or8F3SWc97fvBkrzmMfgq9IiZvprnLxXlIGNa01q/DFqVcFuMnOW7357y7Qnis p2AvDuYCeR6L0SrcayKkvAcgXvE/wHNuWEEwyPvgge8m/9hSJME3SlQfiPFHYXfoQr9x0u Q57VpcguIP7iGTBVAnESA6TSO/jBl2sADMGNqr4S1/tubm+Xxf0RqusanNnMmhG36Txako XMHHiEQFRyaTA/nGE/6IMfZJFaWlc4+xFsLsfBhQt+tCM0iarwxYXh/7+y1hXxkjI4XJ+o LluSUCaeypBw/edG4ckHCZMQP7QxZ7y1F4msAghgYdr93Sy5jpvOgp7LAINgcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707736128; a=rsa-sha256; cv=none; b=IVryrrpcan1uj67rKpcRNgPMyUkDD+FjYqPzPc0MR3e9i9berASWrwlLnKNhAlWL4t1QQ4 bzumGDmlYsO/cfYiB5b2NeqGSefFzVCq2m/PlBR16Ljj/aCZnMkN5i3gMo0GWQsTcylhOG xwWt9LuQPXsnpUaUDWpzzPMTnvTud1La6lLWSDyOU9tWCLKKt2ey4PGHmiUuyG6f6l1yXz wQBfD0+nMnY8Sh7Q3Kv7FspHqXG1fu7fCB3uI61BZSKxlg9/V2UYNp6e4HdkBTJZReD8kQ vlFERBXRM1uIS00ChCs6RAEgREuVqxo4ThUbqPNrViQRbJ9hbf+Fgprh1xk+4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707736128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9B5EhbRzLOm+xGgZPwoQP5kadiPxpQNdQg9UCNwWDCA=; b=xNB+XasVhp+FJSb9caXMuCI5xxwlFUKgw+2XXxzTW3LGP81ks3Aho4d5+L2sdixEWdP2NU 3hXDcAvrkg9hrEohAC4sv4GNgVUm5k2fOaRW8TBIWovwLhq1pkBTvK3vw7NrYhGwMb9xDi nh1/jTmW9HV6KfYC8+HTnV3k1RmXHdajjrFV5U/24ryxDbbhxQBxqs/niJnQdbcdkvzPOh HOe46LLmkJ3SShO+tVQRBQ1QbHDNzb4eYmkE1Z9t73vC11Foiy/yfhp0Oxr+50q3Uy1XGp 6iPhnTxHnTtPD/7bOzMRR81Qh3eoDJfSYfe/S5PdtCTcwLpet+60Ni9MpRVLxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYMCN1bn0zP21; Mon, 12 Feb 2024 11:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CB8mju041317; Mon, 12 Feb 2024 11:08:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB8mNm041314; Mon, 12 Feb 2024 11:08:48 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:08:48 GMT Message-Id: <202402121108.41CB8mNm041314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 883b8ed582eb - main - sound: remove snddev_info->inprog and pcm_inprog() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 883b8ed582eb3e9e98c62c471228ff3c3a25377d Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=883b8ed582eb3e9e98c62c471228ff3c3a25377d commit 883b8ed582eb3e9e98c62c471228ff3c3a25377d Author: Christos Margiolis AuthorDate: 2024-02-12 11:05:33 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:07:50 +0000 sound: remove snddev_info->inprog and pcm_inprog() No longer used. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43737 --- sys/dev/sound/pcm/sound.c | 17 ----------------- sys/dev/sound/pcm/sound.h | 2 -- 2 files changed, 19 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index b23a28d3af08..186e7b194f27 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -392,16 +392,6 @@ pcm_chnref(struct pcm_channel *c, int ref) return (c->refcount); } -int -pcm_inprog(struct snddev_info *d, int delta) -{ - PCM_LOCKASSERT(d); - - d->inprog += delta; - - return (d->inprog); -} - static void pcm_setmaxautovchans(struct snddev_info *d, int num) { @@ -1127,7 +1117,6 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) d->pvchanformat = 0; d->rvchanrate = 0; d->rvchanformat = 0; - d->inprog = 0; /* * Create clone manager, disabled by default. Cloning will be @@ -1182,12 +1171,6 @@ pcm_unregister(device_t dev) d->flags |= SD_F_DETACHING; - if (d->inprog != 0) { - device_printf(dev, "unregister: operation in progress\n"); - PCM_UNLOCK(d); - return (EBUSY); - } - PCM_ACQUIRE(d); PCM_UNLOCK(d); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 5b366a62630c..4af56a2c411a 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -320,7 +320,6 @@ int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, pid_t pid, char *comm, int devunit); int pcm_chnrelease(struct pcm_channel *c); int pcm_chnref(struct pcm_channel *c, int ref); -int pcm_inprog(struct snddev_info *d, int delta); struct pcm_channel *pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, int num, void *devinfo); int pcm_chn_destroy(struct pcm_channel *ch); @@ -379,7 +378,6 @@ struct snddev_info { struct snd_clone *clones; unsigned devcount, playcount, reccount, pvchancount, rvchancount ; unsigned flags; - int inprog; unsigned int bufsz; void *devinfo; device_t dev;