From owner-svn-src-head@freebsd.org Fri Apr 5 15:53:28 2019 Return-Path: Delivered-To: svn-src-head@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 79A2A157ADEB; Fri, 5 Apr 2019 15:53:28 +0000 (UTC) (envelope-from manu@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 14DC1976D7; Fri, 5 Apr 2019 15:53:28 +0000 (UTC) (envelope-from manu@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 F3DAFF4D4; Fri, 5 Apr 2019 15:53:27 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x35FrRTn074439; Fri, 5 Apr 2019 15:53:27 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x35FrRB2074437; Fri, 5 Apr 2019 15:53:27 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201904051553.x35FrRB2074437@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Fri, 5 Apr 2019 15:53:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345951 - head/sys/dev/iicbus/twsi X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/dev/iicbus/twsi X-SVN-Commit-Revision: 345951 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 14DC1976D7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 05 Apr 2019 15:53:28 -0000 Author: manu Date: Fri Apr 5 15:53:27 2019 New Revision: 345951 URL: https://svnweb.freebsd.org/changeset/base/345951 Log: twsi: Use config_intrhook_oneshot instead of config_intrhook_establish Suggested by: ian MFC after: 1 month X-MFC-With: 345948 Modified: head/sys/dev/iicbus/twsi/twsi.c head/sys/dev/iicbus/twsi/twsi.h Modified: head/sys/dev/iicbus/twsi/twsi.c ============================================================================== --- head/sys/dev/iicbus/twsi/twsi.c Fri Apr 5 15:33:43 2019 (r345950) +++ head/sys/dev/iicbus/twsi/twsi.c Fri Apr 5 15:53:27 2019 (r345951) @@ -621,7 +621,6 @@ twsi_intr_start(void *pdev) device_printf(pdev, "unable to register interrupt handler\n"); sc->have_intr = true; - config_intrhook_disestablish(&sc->intr_hook); } int @@ -648,11 +647,7 @@ twsi_attach(device_t dev) } bus_generic_attach(dev); - sc->intr_hook.ich_func = twsi_intr_start; - sc->intr_hook.ich_arg = dev; - - if (config_intrhook_establish(&sc->intr_hook) != 0) - return (ENOMEM); + config_intrhook_oneshot(twsi_intr_start, dev); return (0); } Modified: head/sys/dev/iicbus/twsi/twsi.h ============================================================================== --- head/sys/dev/iicbus/twsi/twsi.h Fri Apr 5 15:33:43 2019 (r345950) +++ head/sys/dev/iicbus/twsi/twsi.h Fri Apr 5 15:53:27 2019 (r345951) @@ -55,7 +55,6 @@ struct twsi_softc { clk_t clk_reg; #endif void * intrhand; - struct intr_config_hook intr_hook; bool have_intr; struct iic_msg *msg;