Date: Sun, 22 May 2016 07:14:59 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r300400 - projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi Message-ID: <201605220714.u4M7ExwO074727@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 = {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605220714.u4M7ExwO074727>