Commit a1914059 authored by Dave Jiang's avatar Dave Jiang Committed by Dan Williams
Browse files

isci: Change event notify calls from scic_cb_* to isci_event_* 



Renaming the callbacks to apparopriate event notify calls for the LLDD.

Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 6389a775

drivers/scsi/isci/core/scic_sds_controller.c

+12 −12
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static void scic_sds_controller_phy_startup_timeout_handler( 
void scic_sds_controller_initialize_phy_startup(

	struct scic_sds_controller *this_controller)

{

	this_controller->phy_startup_timer = scic_cb_timer_create(

	this_controller->phy_startup_timer = isci_event_timer_create(

		this_controller,

		scic_sds_controller_phy_startup_timeout_handler,

		this_controller
@@ -275,7 +275,7 @@ void scic_sds_controller_initialize_phy_startup( 
void scic_sds_controller_initialize_power_control(

	struct scic_sds_controller *this_controller)

{

	this_controller->power_control.timer = scic_cb_timer_create(

	this_controller->power_control.timer = isci_event_timer_create(

		this_controller,

		scic_sds_controller_power_control_timer_handler,

		this_controller
@@ -734,7 +734,7 @@ static void scic_sds_controller_transition_to_ready( 
			SCI_BASE_CONTROLLER_STATE_READY

			);



		scic_cb_controller_start_complete(this_controller, status);

		isci_event_controller_start_complete(this_controller, status);

	}

}
@@ -757,7 +757,7 @@ void scic_sds_controller_timeout_handler( 
		sci_base_state_machine_change_state(

			scic_sds_controller_get_base_state_machine(scic),

			SCI_BASE_CONTROLLER_STATE_FAILED);

		scic_cb_controller_stop_complete(scic, SCI_FAILURE_TIMEOUT);

		isci_event_controller_stop_complete(scic, SCI_FAILURE_TIMEOUT);

	} else	/* / @todo Now what do we want to do in this case? */

		dev_err(scic_to_dev(scic),

			"%s: Controller timer fired when controller was not "
@@ -823,7 +823,7 @@ enum sci_status scic_sds_controller_stop_ports(struct scic_sds_controller *scic) 
static void scic_sds_controller_phy_timer_start(

	struct scic_sds_controller *this_controller)

{

	scic_cb_timer_start(

	isci_event_timer_start(

		this_controller,

		this_controller->phy_startup_timer,

		SCIC_SDS_CONTROLLER_PHY_START_TIMEOUT
@@ -840,7 +840,7 @@ static void scic_sds_controller_phy_timer_start( 
void scic_sds_controller_phy_timer_stop(

	struct scic_sds_controller *this_controller)

{

	scic_cb_timer_stop(

	isci_event_timer_stop(

		this_controller,

		this_controller->phy_startup_timer

		);
@@ -1041,7 +1041,7 @@ enum sci_status scic_sds_controller_stop_devices( 
static void scic_sds_controller_power_control_timer_start(

	struct scic_sds_controller *this_controller)

{

	scic_cb_timer_start(

	isci_event_timer_start(

		this_controller, this_controller->power_control.timer,

		SCIC_SDS_CONTROLLER_POWER_CONTROL_INTERVAL

		);
@@ -2809,7 +2809,7 @@ static enum sci_status scic_sds_controller_reset_state_initialize_handler( 
		SCI_BASE_CONTROLLER_STATE_INITIALIZING

		);



	this_controller->timeout_timer = scic_cb_timer_create(

	this_controller->timeout_timer = isci_event_timer_create(

		this_controller,

		(void (*)(void *))scic_sds_controller_timeout_handler,

		(void (*)(void *))controller);
@@ -3040,7 +3040,7 @@ static enum sci_status scic_sds_controller_initialized_state_start_handler( 
	if (SCI_SUCCESS == result) {

		scic_sds_controller_start_next_phy(this_controller);



		scic_cb_timer_start(this_controller,

		isci_event_timer_start(this_controller,

				    this_controller->timeout_timer,

				    timeout);
@@ -3130,7 +3130,7 @@ static enum sci_status scic_sds_controller_ready_state_stop_handler( 


	this_controller = (struct scic_sds_controller *)controller;



	scic_cb_timer_start(this_controller,

	isci_event_timer_start(this_controller,

			    this_controller->timeout_timer,

			    timeout);
@@ -3578,7 +3578,7 @@ static void scic_sds_controller_starting_state_exit( 
{

	struct scic_sds_controller *scic = (struct scic_sds_controller *)object;



	scic_cb_timer_stop(scic, scic->timeout_timer);

	isci_event_timer_stop(scic, scic->timeout_timer);

}



/**
@@ -3660,7 +3660,7 @@ static void scic_sds_controller_stopping_state_exit( 


	this_controller = (struct scic_sds_controller *)object;



	scic_cb_timer_stop(this_controller, this_controller->timeout_timer);

	isci_event_timer_stop(this_controller, this_controller->timeout_timer);

}



/**

drivers/scsi/isci/core/scic_sds_phy.c

+7 −7
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ enum sci_status scic_sds_phy_initialize( 
	struct scu_link_layer_registers __iomem *link_layer_registers)

{

	/* Create the SIGNATURE FIS Timeout timer for this phy */

	sci_phy->sata_timeout_timer = scic_cb_timer_create(

	sci_phy->sata_timeout_timer = isci_event_timer_create(

		scic_sds_phy_get_controller(sci_phy),

		scic_sds_phy_sata_timeout,

		sci_phy
@@ -1746,7 +1746,7 @@ static void scic_sds_phy_starting_await_sata_phy_substate_enter( 
		this_phy, SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SATA_PHY_EN

		);



	scic_cb_timer_start(

	isci_event_timer_start(

		scic_sds_phy_get_controller(this_phy),

		this_phy->sata_timeout_timer,

		SCIC_SDS_SATA_LINK_TRAINING_TIMEOUT
@@ -1768,7 +1768,7 @@ static void scic_sds_phy_starting_await_sata_phy_substate_exit( 


	this_phy = (struct scic_sds_phy *)object;



	scic_cb_timer_stop(

	isci_event_timer_stop(

		scic_sds_phy_get_controller(this_phy),

		this_phy->sata_timeout_timer

		);
@@ -1793,7 +1793,7 @@ static void scic_sds_phy_starting_await_sata_speed_substate_enter( 
		this_phy, SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SATA_SPEED_EN

		);



	scic_cb_timer_start(

	isci_event_timer_start(

		scic_sds_phy_get_controller(this_phy),

		this_phy->sata_timeout_timer,

		SCIC_SDS_SATA_LINK_TRAINING_TIMEOUT
@@ -1815,7 +1815,7 @@ static void scic_sds_phy_starting_await_sata_speed_substate_exit( 


	this_phy = (struct scic_sds_phy *)object;



	scic_cb_timer_stop(

	isci_event_timer_stop(

		scic_sds_phy_get_controller(this_phy),

		this_phy->sata_timeout_timer

		);
@@ -1854,7 +1854,7 @@ static void scic_sds_phy_starting_await_sig_fis_uf_substate_enter( 
		 * condition is cleared. */

		scic_sds_phy_resume(this_phy);



		scic_cb_timer_start(

		isci_event_timer_start(

			scic_sds_phy_get_controller(this_phy),

			this_phy->sata_timeout_timer,

			SCIC_SDS_SIGNATURE_FIS_TIMEOUT
@@ -1879,7 +1879,7 @@ static void scic_sds_phy_starting_await_sig_fis_uf_substate_exit( 


	this_phy = (struct scic_sds_phy *)object;



	scic_cb_timer_stop(

	isci_event_timer_stop(

		scic_sds_phy_get_controller(this_phy),

		this_phy->sata_timeout_timer

		);

drivers/scsi/isci/core/scic_sds_port.c

+21 −16
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ enum sci_status scic_sds_port_initialize( 
	 * the timer and start the state machine */

	if (this_port->physical_port_index != SCI_MAX_PORTS) {

		/* / @todo should we create the timer at create time? */

		this_port->timer_handle = scic_cb_timer_create(

		this_port->timer_handle = isci_event_timer_create(

			scic_sds_port_get_controller(this_port),

			scic_sds_port_timeout_handler,

			this_port
@@ -727,7 +727,9 @@ void scic_sds_port_activate_phy( 
	scic_sds_controller_clear_invalid_phy(controller, the_phy);



	if (do_notify_user == true)

		scic_cb_port_link_up(this_port->owning_controller, this_port, the_phy);

		isci_event_port_link_up(this_port->owning_controller,

					this_port,

					the_phy);

}



/**
@@ -735,7 +737,8 @@ void scic_sds_port_activate_phy( 
 * @this_port: This is the port on which the phy should be deactivated.

 * @the_phy: This is the specific phy that is no longer active in the port.

 * @do_notify_user: This parameter specifies whether to inform the user (via

 *    scic_cb_port_link_down()) as to the fact that a new phy as become ready.

 *    isci_event_port_link_down()) as to the fact that a new phy as become

 *    ready.

 *

 * This method will deactivate the supplied phy in the port. none

 */
@@ -752,7 +755,9 @@ void scic_sds_port_deactivate_phy( 
	SCU_PCSPExCR_WRITE(this_port, the_phy->phy_index, the_phy->phy_index);



	if (do_notify_user == true)

		scic_cb_port_link_down(this_port->owning_controller, this_port, the_phy);

		isci_event_port_link_down(this_port->owning_controller,

					  this_port,

					  the_phy);

}



/**
@@ -775,7 +780,7 @@ static void scic_sds_port_invalid_link_up( 
	if ((controller->invalid_phy_mask & (1 << the_phy->phy_index)) == 0) {

		scic_sds_controller_set_invalid_phy(controller, the_phy);



		scic_cb_port_invalid_link_up(controller, this_port, the_phy);

		isci_event_port_invalid_link_up(controller, this_port, the_phy);

	}

}
@@ -933,7 +938,7 @@ static void scic_sds_port_timeout_handler(void *port) 
			this_port);

	} else if (current_state == SCI_BASE_PORT_STATE_STOPPING) {

		/* if the port is still stopping then the stop has not completed */

		scic_cb_port_stop_complete(

		isci_event_port_stop_complete(

			scic_sds_port_get_controller(this_port),

			port,

			SCI_FAILURE_TIMEOUT
@@ -1030,7 +1035,7 @@ void scic_sds_port_broadcast_change_received( 
	struct scic_sds_phy *this_phy)

{

	/* notify the user. */

	scic_cb_port_bc_change_primitive_received(

	isci_event_port_bc_change_primitive_received(

		this_port->owning_controller, this_port, this_phy

		);

}
@@ -1259,7 +1264,7 @@ static enum sci_status scic_sds_port_ready_operational_substate_reset_handler( 
		status = scic_sds_phy_reset(selected_phy);



		if (status == SCI_SUCCESS) {

			scic_cb_timer_start(

			isci_event_timer_start(

				scic_sds_port_get_controller(this_port),

				this_port->timer_handle,

				timeout
@@ -1610,7 +1615,7 @@ static void scic_sds_port_ready_substate_operational_enter( 
		this_port, SCIC_SDS_PORT_READY_SUBSTATE_OPERATIONAL

		);



	scic_cb_port_ready(

	isci_event_port_ready(

		scic_sds_port_get_controller(this_port), this_port

		);
@@ -1640,7 +1645,7 @@ static void scic_sds_port_ready_substate_operational_exit( 
{

	struct scic_sds_port *this_port = (struct scic_sds_port *)object;



	scic_cb_port_not_ready(

	isci_event_port_not_ready(

		scic_sds_port_get_controller(this_port),

		this_port,

		this_port->not_ready_reason
@@ -1670,7 +1675,7 @@ static void scic_sds_port_ready_substate_configuring_enter( 
		);



	if (this_port->active_phy_mask == 0) {

		scic_cb_port_not_ready(

		isci_event_port_not_ready(

			scic_sds_port_get_controller(this_port),

			this_port,

			SCIC_PORT_NOT_READY_NO_ACTIVE_PHYS
@@ -2544,14 +2549,14 @@ static void scic_sds_port_ready_state_enter( 
		SCI_BASE_PORT_STATE_RESETTING

		== this_port->parent.state_machine.previous_state_id

		) {

		scic_cb_port_hard_reset_complete(

		isci_event_port_hard_reset_complete(

			scic_sds_port_get_controller(this_port),

			this_port,

			SCI_SUCCESS

			);

	} else {

		/* Notify the caller that the port is not yet ready */

		scic_cb_port_not_ready(

		isci_event_port_not_ready(

			scic_sds_port_get_controller(this_port),

			this_port,

			SCIC_PORT_NOT_READY_NO_ACTIVE_PHYS
@@ -2615,7 +2620,7 @@ static void scic_sds_port_resetting_state_exit( 


	this_port = (struct scic_sds_port *)object;



	scic_cb_timer_stop(

	isci_event_timer_stop(

		scic_sds_port_get_controller(this_port),

		this_port->timer_handle

		);
@@ -2655,7 +2660,7 @@ static void scic_sds_port_stopping_state_exit( 


	this_port = (struct scic_sds_port *)object;



	scic_cb_timer_stop(

	isci_event_timer_stop(

		scic_sds_port_get_controller(this_port),

		this_port->timer_handle

		);
@@ -2681,7 +2686,7 @@ static void scic_sds_port_failed_state_enter( 
		SCI_BASE_PORT_STATE_FAILED

		);



	scic_cb_port_hard_reset_complete(

	isci_event_port_hard_reset_complete(

		scic_sds_port_get_controller(this_port),

		this_port,

		SCI_FAILURE_TIMEOUT

drivers/scsi/isci/core/scic_sds_port_configuration_agent.c

+5 −5
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static void scic_sds_mpc_agent_link_down( 
			) {

			port_agent->timer_pending = true;



			scic_cb_timer_start(

			isci_event_timer_start(

				controller,

				port_agent->timer,

				SCIC_SDS_MPC_RECONFIGURATION_TIMEOUT
@@ -542,12 +542,12 @@ static void scic_sds_apc_agent_start_timer( 
	u32 timeout)

{

	if (port_agent->timer_pending) {

		scic_cb_timer_stop(controller, port_agent->timer);

		isci_event_timer_stop(controller, port_agent->timer);

	}



	port_agent->timer_pending = true;



	scic_cb_timer_start(controller, port_agent->timer, timeout);

	isci_event_timer_start(controller, port_agent->timer, timeout);

}



/**
@@ -830,7 +830,7 @@ enum sci_status scic_sds_port_configuration_agent_initialize( 
		port_agent->link_up_handler = scic_sds_mpc_agent_link_up;

		port_agent->link_down_handler = scic_sds_mpc_agent_link_down;



		port_agent->timer = scic_cb_timer_create(

		port_agent->timer = isci_event_timer_create(

			controller,

			scic_sds_mpc_agent_timeout_handler,

			controller
@@ -841,7 +841,7 @@ enum sci_status scic_sds_port_configuration_agent_initialize( 
		port_agent->link_up_handler = scic_sds_apc_agent_link_up;

		port_agent->link_down_handler = scic_sds_apc_agent_link_down;



		port_agent->timer = scic_cb_timer_create(

		port_agent->timer = isci_event_timer_create(

			controller,

			scic_sds_apc_agent_timeout_handler,

			controller

drivers/scsi/isci/core/scic_sds_remote_device.c

+5 −5
Original line number Diff line number Diff line
@@ -1817,7 +1817,7 @@ static void scic_sds_remote_device_stopped_state_enter( 
	 * the stop operation has completed. */

	if (this_device->parent.state_machine.previous_state_id

	    == SCI_BASE_REMOTE_DEVICE_STATE_STOPPING) {

		scic_cb_remote_device_stop_complete(

		isci_event_remote_device_stop_complete(

			scic_sds_remote_device_get_controller(this_device),

			this_device,

			SCI_SUCCESS
@@ -1848,7 +1848,7 @@ static void scic_sds_remote_device_starting_state_enter( 
		SCI_BASE_REMOTE_DEVICE_STATE_STARTING

		);



	scic_cb_remote_device_not_ready(

	isci_event_remote_device_not_ready(

		the_controller,

		this_device,

		SCIC_REMOTE_DEVICE_NOT_READY_START_REQUESTED
@@ -1871,7 +1871,7 @@ static void scic_sds_remote_device_starting_state_exit( 
	/*

	 * / @todo Check the device object for the proper return code for this

	 * /       callback */

	scic_cb_remote_device_start_complete(

	isci_event_remote_device_start_complete(

		scic_sds_remote_device_get_controller(this_device),

		this_device,

		SCI_SUCCESS
@@ -1905,7 +1905,7 @@ static void scic_sds_remote_device_ready_state_enter( 
	if (this_device->has_ready_substate_machine) {

		sci_base_state_machine_start(&this_device->ready_substate_machine);

	} else {

		scic_cb_remote_device_ready(the_controller, this_device);

		isci_event_remote_device_ready(the_controller, this_device);

	}

}
@@ -1928,7 +1928,7 @@ static void scic_sds_remote_device_ready_state_exit( 
	if (this_device->has_ready_substate_machine) {

		sci_base_state_machine_stop(&this_device->ready_substate_machine);

	} else {

		scic_cb_remote_device_not_ready(

		isci_event_remote_device_not_ready(

			the_controller,

			this_device,

			SCIC_REMOTE_DEVICE_NOT_READY_STOP_REQUESTED