diff options
Diffstat (limited to 'sys/dev/isci')
| -rw-r--r-- | sys/dev/isci/isci.c | 2 | ||||
| -rw-r--r-- | sys/dev/isci/isci_logger.c | 2 | ||||
| -rw-r--r-- | sys/dev/isci/scil/sati_util.c | 2 | ||||
| -rw-r--r-- | sys/dev/isci/scil/sci_abstract_list.c | 7 | ||||
| -rw-r--r-- | sys/dev/isci/scil/scif_sas_smp_remote_device.c | 2 |
5 files changed, 4 insertions, 11 deletions
diff --git a/sys/dev/isci/isci.c b/sys/dev/isci/isci.c index 2b5d4301f6b2..1dede4e45b4c 100644 --- a/sys/dev/isci/isci.c +++ b/sys/dev/isci/isci.c @@ -235,7 +235,7 @@ isci_detach(device_t device) sci_pool_get(controller->unmap_buffer_pool, unmap_buffer); if (unmap_buffer == NULL) break; - contigfree(unmap_buffer, PAGE_SIZE, M_ISCI); + free(unmap_buffer, M_ISCI); } } diff --git a/sys/dev/isci/isci_logger.c b/sys/dev/isci/isci_logger.c index 62685d52faf9..b5653603a04e 100644 --- a/sys/dev/isci/isci_logger.c +++ b/sys/dev/isci/isci_logger.c @@ -37,7 +37,7 @@ #include <dev/isci/scil/scic_user_callback.h> #include <dev/isci/scil/sci_logger.h> -#include <machine/stdarg.h> +#include <sys/stdarg.h> #include <sys/time.h> #define ERROR_LEVEL 0 diff --git a/sys/dev/isci/scil/sati_util.c b/sys/dev/isci/scil/sati_util.c index 22c3111fe9ca..300ecbd5367b 100644 --- a/sys/dev/isci/scil/sati_util.c +++ b/sys/dev/isci/scil/sati_util.c @@ -70,7 +70,7 @@ /** * @brief This method will set the data direction, protocol, and transfer - * kength for an ATA non-data command. + * length for an ATA non-data command. * * @pre It is expected that the user will use this method for setting these * values in a non-data ATA command constuct. diff --git a/sys/dev/isci/scil/sci_abstract_list.c b/sys/dev/isci/scil/sci_abstract_list.c index 7c02e0b17156..1948043e2aed 100644 --- a/sys/dev/isci/scil/sci_abstract_list.c +++ b/sys/dev/isci/scil/sci_abstract_list.c @@ -230,13 +230,6 @@ void sci_abstract_list_print( while (alElement_p != NULL) { -#ifdef UNIT_TEST_DEBUG - /* Check to see if we found the object for which we are searching. */ - printf("ITEM next_p 0x%x prev_p 0x%x obj_p 0x%x, 0x%x\n", - alElement_p->next_p, - alElement_p->previous_p, - (U32*) (alElement_p->object_p)); -#endif alElement_p = alElement_p->next_p; } } diff --git a/sys/dev/isci/scil/scif_sas_smp_remote_device.c b/sys/dev/isci/scil/scif_sas_smp_remote_device.c index d6055adc13f9..c72402f66889 100644 --- a/sys/dev/isci/scil/scif_sas_smp_remote_device.c +++ b/sys/dev/isci/scil/scif_sas_smp_remote_device.c @@ -194,7 +194,7 @@ SCI_STATUS scif_sas_smp_remote_device_decode_smp_response( //if Core set the status of this io to be RETRY_REQUIRED, we should //retry the IO without even decode the response. - if (completion_status == SCI_FAILURE_RETRY_REQUIRED) + if (completion_status == SCI_IO_FAILURE_RETRY_REQUIRED) { scif_sas_smp_remote_device_continue_current_activity( fw_device, fw_request, SCI_FAILURE_RETRY_REQUIRED |