From owner-svn-src-all@freebsd.org Mon Sep 14 23:30:05 2020 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 62EE53E539B; Mon, 14 Sep 2020 23:30:05 +0000 (UTC) (envelope-from imp@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Br2dn2311z4Sx2; Mon, 14 Sep 2020 23:30:05 +0000 (UTC) (envelope-from imp@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 262CD1ED51; Mon, 14 Sep 2020 23:30:05 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08ENU4dn020675; Mon, 14 Sep 2020 23:30:04 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08ENU49Y020674; Mon, 14 Sep 2020 23:30:04 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009142330.08ENU49Y020674@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 14 Sep 2020 23:30:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365735 - head/sys/dev/iicbus X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/dev/iicbus X-SVN-Commit-Revision: 365735 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.33 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: Mon, 14 Sep 2020 23:30:05 -0000 Author: imp Date: Mon Sep 14 23:30:04 2020 New Revision: 365735 URL: https://svnweb.freebsd.org/changeset/base/365735 Log: Don't do the busy dance in icee_open/close We don't need to do the busy dance for this driver. It's handled by destroy_dev() entirely. Since all we did was busy/unbusy in open/close, just delete them. We therefore don't need to track closes either. Reviewed by: ian@ Differential Revision: https://reviews.freebsd.org/D26431 Modified: head/sys/dev/iicbus/icee.c Modified: head/sys/dev/iicbus/icee.c ============================================================================== --- head/sys/dev/iicbus/icee.c Mon Sep 14 23:27:51 2020 (r365734) +++ head/sys/dev/iicbus/icee.c Mon Sep 14 23:30:04 2020 (r365735) @@ -113,17 +113,12 @@ static struct ofw_compat_data compat_data[] = { #define CDEV2SOFTC(dev) ((dev)->si_drv1) /* cdev routines */ -static d_open_t icee_open; -static d_close_t icee_close; static d_read_t icee_read; static d_write_t icee_write; static struct cdevsw icee_cdevsw = { .d_version = D_VERSION, - .d_flags = D_TRACKCLOSE, - .d_open = icee_open, - .d_close = icee_close, .d_read = icee_read, .d_write = icee_write }; @@ -227,28 +222,6 @@ icee_detach(device_t dev) struct icee_softc *sc = device_get_softc(dev); destroy_dev(sc->cdev); - return (0); -} - -static int -icee_open(struct cdev *dev, int oflags, int devtype, struct thread *td) -{ - struct icee_softc *sc; - - sc = CDEV2SOFTC(dev); - if (device_get_state(sc->dev) < DS_BUSY) - device_busy(sc->dev); - - return (0); -} - -static int -icee_close(struct cdev *dev, int fflag, int devtype, struct thread *td) -{ - struct icee_softc *sc; - - sc = CDEV2SOFTC(dev); - device_unbusy(sc->dev); return (0); }