From owner-svn-src-all@freebsd.org  Fri Dec 20 15:28:41 2019
Return-Path: <owner-svn-src-all@freebsd.org>
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 4CB8B1DC398;
 Fri, 20 Dec 2019 15:28:41 +0000 (UTC)
 (envelope-from kevans@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 47fXhT1Hrrz44h6;
 Fri, 20 Dec 2019 15:28:41 +0000 (UTC)
 (envelope-from kevans@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 2342CBB0;
 Fri, 20 Dec 2019 15:28:41 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBKFSe9a084512;
 Fri, 20 Dec 2019 15:28:40 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBKFSevD084511;
 Fri, 20 Dec 2019 15:28:40 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201912201528.xBKFSevD084511@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Fri, 20 Dec 2019 15:28:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r355932 - head/sys/arm/versatile
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/sys/arm/versatile
X-SVN-Commit-Revision: 355932
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.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Dec 2019 15:28:41 -0000

Author: kevans
Date: Fri Dec 20 15:28:40 2019
New Revision: 355932
URL: https://svnweb.freebsd.org/changeset/base/355932

Log:
  VERSATILEPB: Unbreak after r355796
  
  r355796 provided genkbd_get_fkeystr/genkbd_diag private and the default for
  get_fkeystr/diag if these members are NULL. Follow suit here.

Modified:
  head/sys/arm/versatile/pl050.c

Modified: head/sys/arm/versatile/pl050.c
==============================================================================
--- head/sys/arm/versatile/pl050.c	Fri Dec 20 15:25:08 2019	(r355931)
+++ head/sys/arm/versatile/pl050.c	Fri Dec 20 15:28:40 2019	(r355932)
@@ -578,9 +578,7 @@ static keyboard_switch_t kmisw = {
 	.clear_state = &kmi_clear_state,
 	.get_state = &kmi_get_state,
 	.set_state = &kmi_set_state,
-	.get_fkeystr = &genkbd_get_fkeystr,
 	.poll = &kmi_poll,
-	.diag = &genkbd_diag,
 };
 
 KEYBOARD_DRIVER(kmi, kmisw, kmi_configure);