From owner-svn-src-all@FreeBSD.ORG Tue Sep 18 18:23:22 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4C120106566C; Tue, 18 Sep 2012 18:23:22 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 379238FC0A; Tue, 18 Sep 2012 18:23:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8IINM2h039789; Tue, 18 Sep 2012 18:23:22 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8IINMMp039787; Tue, 18 Sep 2012 18:23:22 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201209181823.q8IINMMp039787@svn.freebsd.org> From: Jim Harris Date: Tue, 18 Sep 2012 18:23:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240672 - head/sys/dev/nvme X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 18 Sep 2012 18:23:22 -0000 Author: jimharris Date: Tue Sep 18 18:23:21 2012 New Revision: 240672 URL: http://svn.freebsd.org/changeset/base/240672 Log: Add #if 0 around nvme_async_event_cb() until NVMe AER functionality can be tested. This fixes a build warning found only with clang. Modified: head/sys/dev/nvme/nvme_ctrlr.c Modified: head/sys/dev/nvme/nvme_ctrlr.c ============================================================================== --- head/sys/dev/nvme/nvme_ctrlr.c Tue Sep 18 18:16:52 2012 (r240671) +++ head/sys/dev/nvme/nvme_ctrlr.c Tue Sep 18 18:23:21 2012 (r240672) @@ -381,6 +381,11 @@ nvme_ctrlr_reset(struct nvme_controller return (nvme_ctrlr_enable(ctrlr)); } +/* + * Disable this code for now, since Chatham doesn't support + * AERs so I have no good way to test them. + */ +#if 0 static void nvme_async_event_cb(void *arg, const struct nvme_completion *status) { @@ -398,6 +403,7 @@ nvme_async_event_cb(void *arg, const str nvme_ctrlr_cmd_asynchronous_event_request(ctrlr, nvme_async_event_cb, ctrlr); } +#endif static int nvme_ctrlr_identify(struct nvme_controller *ctrlr)