From owner-svn-src-projects@freebsd.org Sun May 22 07:15:00 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6256EB445BD for ; Sun, 22 May 2016 07:15:00 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 1A3B11D46; Sun, 22 May 2016 07:15:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4M7ExxP074728; Sun, 22 May 2016 07:14:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4M7ExwO074727; Sun, 22 May 2016 07:14:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201605220714.u4M7ExwO074727@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 22 May 2016 07:14:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r300400 - projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 May 2016 07:15:00 -0000 Author: ngie Date: Sun May 22 07:14:59 2016 New Revision: 300400 URL: https://svnweb.freebsd.org/changeset/base/300400 Log: Apply some of the review feedback from https://reviews.freebsd.org/D4112 Modified: projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/vmw_pvscsi.c Modified: projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/vmw_pvscsi.c ============================================================================== --- projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/vmw_pvscsi.c Sun May 22 07:05:35 2016 (r300399) +++ projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/vmw_pvscsi.c Sun May 22 07:14:59 2016 (r300400) @@ -1163,7 +1163,7 @@ static int pvscsi_queue_locked(struct sc adapter->pvs_reset_target_on_timeout ? pvscsi_abort_timeout: pvscsi_scsiio_timeout, ctx); - cmd->qsc_csio->ccb_h.status |= CAM_SIM_QUEUED; + cmd->qsc_csio->ccb_h.status |= CAM_SIM_QUEUED; #endif /* __FreeBSD__ */ @@ -1578,7 +1578,7 @@ static void pvscsi_msg_workqueue_handler static int pvscsi_setup_msg_workqueue(struct pvscsi_adapter *adapter) { - char name[32]; + char name[32]; /* XXX: magic number */ if (!pvscsi_use_msg) return 0; @@ -1816,8 +1816,6 @@ static void pvscsi_release_resources(str pci_free_consistent(adapter->dev, adapter->msg_pages * PAGE_SIZE, adapter->msg_ring, adapter->msgRingPA); - if (adapter->cmd_map) { - } #ifdef __FreeBSD__ /* Undo the memory-mapped register mapping */ @@ -2319,7 +2317,6 @@ pvscsi_action(struct cam_sim *psim, unio break; } } - return; } @@ -2547,7 +2544,7 @@ out_release_resources: out_disable_device: pci_disable_io(device, SYS_RES_MEMORY); pci_disable_busmaster(device); - return -ENXIO; + return ENXIO; } static int @@ -2569,7 +2566,7 @@ pvscsi_pci_methods[] = { DEVMETHOD(device_probe, pvscsi_pci_probe), DEVMETHOD(device_attach, pvscsi_pci_attach), DEVMETHOD(device_detach, pvscsi_pci_detach), - { 0, 0 } + DEVMETHOD_END, }; static driver_t pvscsi_pci_driver = {