From nobody Sat Feb 4 16:20:34 2023 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 4P8HnH20H4z3nZ9q; Sat, 4 Feb 2023 16:20:35 +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 4P8HnH1DK9z44jw; Sat, 4 Feb 2023 16:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527635; 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=VQ8cIdh/Gl31lDaYiyl0UhX5JAyVZwO+e07Miv0pnGk=; b=QPOA0wBYns3H90Tm6kmrWUipLGWX6Tb3B8Ex8hJoWp15TwRTGJY/rY55RK7NLkp500nxsS dPofMQuwoABgiSXb3xrGxKyfwRAHdn5gz2GGLdjkwIf/kjPQonH/q5q+scn0EIk6naIWVx IQw3sAOFcOJgnEC980ggE9AtsefGbTN0v207f+TWx184+FvQ769mKqka1qEHt9hoj5JL1j A012MLYcdbuK6uqiiaTPy3WzfWuIofYSzEzLq4kZyC3/KHnV8QaVo1/tECZH1uXnZwL2Wp YmwI90bAy0biC/dhkx4LG4wfKcyPSnmZr+kXnkEGEi4iYa0jdFEIiKdrwWvITQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527635; 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=VQ8cIdh/Gl31lDaYiyl0UhX5JAyVZwO+e07Miv0pnGk=; b=SYyHysY2eQA6dBt/kq/+OGArksJ8X7XOpBiUixOtE7UAoVUxxtJXH36DONuM+tRcqp7W1Y UV/lgCoL1emRPh+1TbvYDvJbfRJdmIjB6zUd5OQtyTah4v1WneIWOmTm5u+gIuD1QC7963 WcASJbddjXTtFqmcEv9yXKEU+CWMeyVrFoytz86fQhoD+hefaOceWWuZg1dADq/IOmnXGP Dip1t05OYEQ0GurPxDHiF9ovY1xmwezl25aeWvp3/m+pwag0T+9wRiAPw6sNNsOFt1QCDJ hS9YK6BAGLQKsoBfo8ooZqE3O7yQhzfeQYy9j9IjyGPgiX97SnbQftC6nVAnRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675527635; a=rsa-sha256; cv=none; b=WYvmZX+jXiGQu8Kyyf/b0flkOSDJRMRGMd7gEAPiE88oPsOnORylR8J/hFpWJ0ZQ7vQAhd bplzYl9XfmwH8ygT/2tC7udknsRbfXGhyvYv5nrTNVi7soWa3Iv9pjrGRt+pTybyU+1ERG uiepXGlhiFDkylxPN8CZmyYOkPb2V+jxnEcAnSwpARRTB5VKF6GjX2eKEqQZ/od5mykx0d dBPkmaAYkSPAjdL1qKNsZsSUUqblyu3e0nZmrAKYAlQ+g7EmburaGX/FhyUY6DSpSMdne5 wqc94dds2YWbv8Y8kbkbfORJ2Cg4KZb2aDXmgz8HpXUZ/Umr5Cbbk8cDFqAu6Q== 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 4P8HnH03JCzLkL; Sat, 4 Feb 2023 16:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 314GKYnQ013794; Sat, 4 Feb 2023 16:20:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314GKYb7013793; Sat, 4 Feb 2023 16:20:34 GMT (envelope-from git) Date: Sat, 4 Feb 2023 16:20:34 GMT Message-Id: <202302041620.314GKYb7013793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5fa183351459 - main - wmt: purge EOL release compatibility 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fa183351459996cfb86f8621de1a0e1bf985d67 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5fa183351459996cfb86f8621de1a0e1bf985d67 commit 5fa183351459996cfb86f8621de1a0e1bf985d67 Author: Elliott Mitchell AuthorDate: 2022-06-23 00:53:47 +0000 Commit: Warner Losh CommitDate: 2023-02-04 16:13:10 +0000 wmt: purge EOL release compatibility Remove FreeBSD 11 support Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/603 Differential Revision: https://reviews.freebsd.org/D35560 --- sys/dev/usb/input/wmt.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sys/dev/usb/input/wmt.c b/sys/dev/usb/input/wmt.c index 5fedd846d258..ac4bf5ca695b 100644 --- a/sys/dev/usb/input/wmt.c +++ b/sys/dev/usb/input/wmt.c @@ -261,22 +261,12 @@ static device_probe_t wmt_probe; static device_attach_t wmt_attach; static device_detach_t wmt_detach; -#if __FreeBSD_version >= 1200077 static evdev_open_t wmt_ev_open; static evdev_close_t wmt_ev_close; -#else -static evdev_open_t wmt_ev_open_11; -static evdev_close_t wmt_ev_close_11; -#endif static const struct evdev_methods wmt_evdev_methods = { -#if __FreeBSD_version >= 1200077 .ev_open = &wmt_ev_open, .ev_close = &wmt_ev_close, -#else - .ev_open = &wmt_ev_open_11, - .ev_close = &wmt_ev_close_11, -#endif }; static const struct usb_config wmt_config[WMT_N_TRANSFER] = { @@ -719,7 +709,6 @@ wmt_ev_open_11(struct evdev_dev *evdev, void *ev_softc) return (0); } -#if __FreeBSD_version >= 1200077 static int wmt_ev_close(struct evdev_dev *evdev) { @@ -738,7 +727,6 @@ wmt_ev_open(struct evdev_dev *evdev) return (wmt_ev_open_11(evdev, sc)); } -#endif static enum wmt_type wmt_hid_parse(struct wmt_softc *sc, const void *d_ptr, uint16_t d_len)