---

yaml
---
r: 254394
b: refs/heads/master
c: de728b7
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2828dc0b55da8937439121eaa82e9ee80c520f53
+refs/heads/master: de728b7d72089330603819a74255a0469780fd0e

trunk/drivers/scsi/isci/core/sati_translator_sequence.h

@@ -67,7 +67,7 @@
 #include "sati_device.h"
 
 /**
- * enum _SATI_TRANSLATOR_SEQUENCE_TYPE - This enumeration defines the possible
+ * enum _sati_translator_sequence_type - This enumeration defines the possible
  *    sequence types for the translator.
  *
  *
@@ -172,19 +172,18 @@ enum sati_translator_sequence_type {
  *
  *
  */
-typedef  struct SATI_MODE_SELECT_PROCESSING_STATE {
+struct sati_mode_select_processing_state {
 	u8 *mode_pages;
 	u32 mode_page_offset;
 	u32 mode_pages_size;
 	u32 size_of_data_processed;
 	u32 total_ata_command_sent;
 	u32 ata_command_sent_for_cmp; /* cmp: current mode page */
 	bool current_mode_page_processed;
-
-} SATI_MODE_SELECT_PROCESSING_STATE_T;
+};
 
 
-enum SATI_REASSIGN_BLOCKS_ATA_COMMAND_STATUS {
+enum sati_reassign_blocks_ata_command_status {
 	SATI_REASSIGN_BLOCKS_READY_TO_SEND,
 	SATI_REASSIGN_BLOCKS_COMMAND_FAIL,
 	SATI_REASSIGN_BLOCKS_COMMAND_SUCCESS,
@@ -204,7 +203,7 @@ struct sati_reassign_blocks_processing_state {
 	u32 size_of_data_processed;
 	u32 ata_command_sent_for_current_lba;
 	bool current_lba_processed;
-	enum     SATI_REASSIGN_BLOCKS_ATA_COMMAND_STATUS ata_command_status;
+	enum  sati_reassign_blocks_ata_command_status ata_command_status;
 
 };
 
@@ -291,8 +290,9 @@ struct sati_translator_sequence {
 		u32 translated_command;
 		u32 move_sector_count;
 		u32 scratch;
-		struct sati_reassign_blocks_processing_state reassign_blocks_process_state;
-		SATI_MODE_SELECT_PROCESSING_STATE_T process_state;
+		struct sati_reassign_blocks_processing_state
+			reassign_blocks_process_state;
+		struct sati_mode_select_processing_state process_state;
 		struct sati_atapi_data sati_atapi_data;
 	} command_specific_data;
 

trunk/drivers/scsi/isci/core/sci_base_port.h

@@ -128,19 +128,16 @@ struct sci_base_port {
 
 struct sci_base_phy;
 
-typedef enum sci_status (*SCI_BASE_PORT_HANDLER_T)(
-	struct sci_base_port *
-	);
+typedef enum sci_status (*sci_base_port_handler_t) (
+	struct sci_base_port *);
 
-typedef enum sci_status (*SCI_BASE_PORT_PHY_HANDLER_T)(
+typedef enum sci_status (*sci_base_port_phy_handler_t) (
 	struct sci_base_port *,
-	struct sci_base_phy *
-	);
+	struct sci_base_phy *);
 
-typedef enum sci_status (*SCI_BASE_PORT_RESET_HANDLER_T)(
+typedef enum sci_status (*sci_base_port_reset_handler_t) (
 	struct sci_base_port *,
-	u32 timeout
-	);
+	u32 timeout);
 
 /**
  * struct sci_base_port_state_handler - This structure contains all of the
@@ -152,40 +149,39 @@ typedef enum sci_status (*SCI_BASE_PORT_RESET_HANDLER_T)(
  */
 struct sci_base_port_state_handler {
 	/**
-	 * The start_handler specifies the method invoked when a user attempts to
-	 * start a port.
+	 * The start_handler specifies the method invoked when a user
+	 * attempts to start a port.
 	 */
-	SCI_BASE_PORT_HANDLER_T start_handler;
+	sci_base_port_handler_t start_handler;
 
 	/**
-	 * The stop_handler specifies the method invoked when a user attempts to
-	 * stop a port.
+	 * The stop_handler specifies the method invoked when a user
+	 * attempts to stop a port.
 	 */
-	SCI_BASE_PORT_HANDLER_T stop_handler;
+	sci_base_port_handler_t stop_handler;
 
 	/**
 	 * The destruct_handler specifies the method invoked when attempting to
 	 * destruct a port.
 	 */
-	SCI_BASE_PORT_HANDLER_T destruct_handler;
+	sci_base_port_handler_t destruct_handler;
 
 	/**
-	 * The reset_handler specifies the method invoked when a user attempts to
-	 * hard reset a port.
+	 * The reset_handler specifies the method invoked when a user
+	 * attempts to hard reset a port.
 	 */
-	SCI_BASE_PORT_RESET_HANDLER_T reset_handler;
+	sci_base_port_reset_handler_t reset_handler;
 
 	/**
-	 * The add_phy_handler specifies the method invoked when a user attempts to
-	 * add another phy into the port.
+	 * The add_phy_handler specifies the method invoked when a user
+	 * attempts to add another phy into the port.
 	 */
-	SCI_BASE_PORT_PHY_HANDLER_T add_phy_handler;
+	sci_base_port_phy_handler_t add_phy_handler;
 
 	/**
 	 * The remove_phy_handler specifies the method invoked when a user
 	 * attempts to remove a phy from the port.
 	 */
-	SCI_BASE_PORT_PHY_HANDLER_T remove_phy_handler;
-
+	sci_base_port_phy_handler_t remove_phy_handler;
 };
 #endif /* _SCI_BASE_PORT_H_ */

trunk/drivers/scsi/isci/core/sci_base_request.h

@@ -129,7 +129,7 @@ struct sci_base_request {
 	struct sci_base_state_machine state_machine;
 };
 
-typedef enum sci_status (*SCI_BASE_REQUEST_HANDLER_T)(
+typedef enum sci_status (*sci_base_request_handler_t)(
 	struct sci_base_request *this_request
 	);
 
@@ -146,25 +146,25 @@ struct sci_base_request_state_handler {
 	 * The start_handler specifies the method invoked when a user attempts to
 	 * start a request.
 	 */
-	SCI_BASE_REQUEST_HANDLER_T start_handler;
+	sci_base_request_handler_t start_handler;
 
 	/**
 	 * The abort_handler specifies the method invoked when a user attempts to
 	 * abort a request.
 	 */
-	SCI_BASE_REQUEST_HANDLER_T abort_handler;
+	sci_base_request_handler_t abort_handler;
 
 	/**
 	 * The complete_handler specifies the method invoked when a user attempts to
 	 * complete a request.
 	 */
-	SCI_BASE_REQUEST_HANDLER_T complete_handler;
+	sci_base_request_handler_t complete_handler;
 
 	/**
 	 * The destruct_handler specifies the method invoked when a user attempts to
 	 * destruct a request.
 	 */
-	SCI_BASE_REQUEST_HANDLER_T destruct_handler;
+	sci_base_request_handler_t destruct_handler;
 
 };
 

trunk/drivers/scsi/isci/core/sci_base_state.h

@@ -58,11 +58,11 @@
 
 #include "sci_object.h"
 
-typedef void (*SCI_BASE_STATE_HANDLER_T)(
+typedef void (*sci_base_state_handler_t)(
 	void
 	);
 
-typedef void (*SCI_STATE_TRANSITION_T)(
+typedef void (*sci_state_transition_t)(
 	struct sci_base_object *base_object
 	);
 
@@ -77,13 +77,13 @@ struct sci_base_state {
 	 * This field is a function pointer that defines the method to be
 	 * invoked when the state is entered.
 	 */
-	SCI_STATE_TRANSITION_T enter_state;
+	sci_state_transition_t enter_state;
 
 	/**
 	 * This field is a function pointer that defines the method to be
 	 * invoked when the state is exited.
 	 */
-	SCI_STATE_TRANSITION_T exit_state;
+	sci_state_transition_t exit_state;
 
 };
 

trunk/drivers/scsi/isci/core/sci_base_state_machine.c

@@ -65,7 +65,7 @@
 static void sci_state_machine_exit_state(struct sci_base_state_machine *sm)
 {
 	u32 state = sm->current_state_id;
-	SCI_STATE_TRANSITION_T exit = sm->state_table[state].exit_state;
+	sci_state_transition_t exit = sm->state_table[state].exit_state;
 
 	if (exit)
 		exit(sm->state_machine_owner);
@@ -74,7 +74,7 @@ static void sci_state_machine_exit_state(struct sci_base_state_machine *sm)
 static void sci_state_machine_enter_state(struct sci_base_state_machine *sm)
 {
 	u32 state = sm->current_state_id;
-	SCI_STATE_TRANSITION_T enter = sm->state_table[state].enter_state;
+	sci_state_transition_t enter = sm->state_table[state].enter_state;
 
 	if (enter)
 		enter(sm->state_machine_owner);

trunk/drivers/scsi/isci/core/sci_status.h

@@ -65,7 +65,7 @@
 
 
 /**
- * enum _SCI_STATUS - This is the general return status enumeration for non-IO,
+ * enum sci_status - This is the general return status enumeration for non-IO,
  *    non-task management related SCI interface methods.
  *
  *
@@ -347,7 +347,7 @@ enum sci_status {
 };
 
 /**
- * enum _SCI_IO_STATUS - This enumeration depicts all of the possible IO
+ * enum sci_io_status - This enumeration depicts all of the possible IO
  *    completion status values.  Each value in this enumeration maps directly
  *    to a value in the enum sci_status enumeration.  Please refer to that
  *    enumeration for detailed comments concerning what the status represents.
@@ -380,7 +380,7 @@ enum sci_io_status {
 };
 
 /**
- * enum _SCI_TASK_STATUS - This enumeration depicts all of the possible task
+ * enum sci_task_status - This enumeration depicts all of the possible task
  *    completion status values.  Each value in this enumeration maps directly
  *    to a value in the enum sci_status enumeration.  Please refer to that
  *    enumeration for detailed comments concerning what the status represents.

trunk/drivers/scsi/isci/core/scic_port.h

@@ -61,7 +61,7 @@
 
 struct scic_sds_port;
 
-enum SCIC_PORT_NOT_READY_REASON_CODE {
+enum scic_port_not_ready_reason_code {
 	SCIC_PORT_NOT_READY_NO_ACTIVE_PHYS,
 	SCIC_PORT_NOT_READY_HARD_RESET_REQUESTED,
 	SCIC_PORT_NOT_READY_INVALID_PORT_CONFIGURATION,

trunk/drivers/scsi/isci/core/scic_sds_controller.c

@@ -705,7 +705,7 @@ static enum sci_status scic_sds_controller_stop_ports(struct scic_sds_controller
 
 	for (index = 0; index < scic->logical_port_entries; index++) {
 		struct scic_sds_port *sci_port = &scic->port_table[index];
-		SCI_BASE_PORT_HANDLER_T stop;
+		sci_base_port_handler_t stop;
 
 		stop = sci_port->state_handlers->parent.stop_handler;
 		port_status = stop(&sci_port->parent);

trunk/drivers/scsi/isci/core/scic_sds_controller.h

@@ -90,12 +90,12 @@ struct scic_sds_controller;
 #define SCU_COMPLETION_RAM_ALIGNMENT            (64)
 
 /**
- * enum SCIC_SDS_CONTROLLER_MEMORY_DESCRIPTORS -
+ * enum scic_sds_controller_memory_descriptors -
  *
  * This enumeration depects the types of MDEs that are going to be created for
  * the controller object.
  */
-enum SCIC_SDS_CONTROLLER_MEMORY_DESCRIPTORS {
+enum scic_sds_controller_memory_descriptors {
 	/**
 	 * Completion queue MDE entry
 	 */

trunk/drivers/scsi/isci/core/scic_sds_phy.h

@@ -92,11 +92,11 @@ struct scic_sds_port;
 #define SCIC_SDS_SATA_LINK_TRAINING_TIMEOUT  250
 
 /**
- * enum SCIC_SDS_PHY_STARTING_SUBSTATES -
+ * enum scic_sds_phy_starting_substates -
  *
  *
  */
-enum SCIC_SDS_PHY_STARTING_SUBSTATES {
+enum scic_sds_phy_starting_substates {
 	/**
 	 * Initial state
 	 */
@@ -156,7 +156,7 @@ struct scic_sds_controller;
  *
  *
  */
-enum SCIC_SDS_PHY_PROTOCOL {
+enum scic_sds_phy_protocol {
 	/**
 	 * This is an unknown phy type since there is either nothing on the other
 	 * end or we have not detected the phy type as yet.
@@ -202,7 +202,7 @@ struct scic_sds_phy {
 	 * field contains a legitamite value once the PHY has link trained with
 	 * a remote phy.
 	 */
-	enum SCIC_SDS_PHY_PROTOCOL protocol;
+	enum scic_sds_phy_protocol protocol;
 
 	/**
 	 * This field specifies the index with which this phy is associated (0-3).

trunk/drivers/scsi/isci/core/scic_sds_port.c

@@ -620,15 +620,12 @@ enum sci_status scic_port_get_properties(
 }
 
 /**
- * scic_port_hard_reset() - This method will request the SCI implementation to
- *    perform a HARD RESET on the SAS Port.  If/When the HARD RESET completes
- *    the SCI user will be notified via an SCI OS callback indicating a direct
- *    attached device was found.
+ * scic_port_hard_reset() - perform port hard reset
  * @port: a handle corresponding to the SAS port to be hard reset.
  * @reset_timeout: This parameter specifies the number of milliseconds in which
  *    the port reset operation should complete.
  *
- * The SCI User callback in SCIC_USER_CALLBACKS_T will only be called once for
+ * The SCI User callback in scic_user_callbacks_t will only be called once for
  * each phy in the SAS Port at completion of the hard reset sequence. Return a
  * status indicating whether the hard reset started successfully. SCI_SUCCESS
  * This value is returned if the hard reset operation started successfully.