Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 556e26a7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: remove tsk_mgmt_response and it_nexus_response transport methods 



They are never called and just dispatch to methods of the same names in
the FC and SRP transport classes that are never implemented.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b6a05c82

drivers/scsi/scsi_transport_fc.c

+0 −17
Original line number Diff line number Diff line
@@ -2160,19 +2160,6 @@ fc_user_scan(struct Scsi_Host *shost, uint channel, uint id, u64 lun) 
	return 0;

}



static int fc_tsk_mgmt_response(struct Scsi_Host *shost, u64 nexus, u64 tm_id,

				int result)

{

	struct fc_internal *i = to_fc_internal(shost->transportt);

	return i->f->tsk_mgmt_response(shost, nexus, tm_id, result);

}



static int fc_it_nexus_response(struct Scsi_Host *shost, u64 nexus, int result)

{

	struct fc_internal *i = to_fc_internal(shost->transportt);

	return i->f->it_nexus_response(shost, nexus, result);

}



struct scsi_transport_template *

fc_attach_transport(struct fc_function_template *ft)

{
@@ -2214,10 +2201,6 @@ fc_attach_transport(struct fc_function_template *ft) 


	i->t.user_scan = fc_user_scan;



	/* target-mode drivers' functions */

	i->t.tsk_mgmt_response = fc_tsk_mgmt_response;

	i->t.it_nexus_response = fc_it_nexus_response;



	/*

	 * Setup SCSI Target Attributes.

	 */

drivers/scsi/scsi_transport_srp.c

+0 −16
Original line number Diff line number Diff line
@@ -794,19 +794,6 @@ void srp_stop_rport_timers(struct srp_rport *rport) 
}

EXPORT_SYMBOL_GPL(srp_stop_rport_timers);



static int srp_tsk_mgmt_response(struct Scsi_Host *shost, u64 nexus, u64 tm_id,

				 int result)

{

	struct srp_internal *i = to_srp_internal(shost->transportt);

	return i->f->tsk_mgmt_response(shost, nexus, tm_id, result);

}



static int srp_it_nexus_response(struct Scsi_Host *shost, u64 nexus, int result)

{

	struct srp_internal *i = to_srp_internal(shost->transportt);

	return i->f->it_nexus_response(shost, nexus, result);

}



/**

 * srp_attach_transport  -  instantiate SRP transport template

 * @ft:		SRP transport class function template
@@ -821,9 +808,6 @@ srp_attach_transport(struct srp_function_template *ft) 
	if (!i)

		return NULL;



	i->t.tsk_mgmt_response = srp_tsk_mgmt_response;

	i->t.it_nexus_response = srp_it_nexus_response;



	i->t.host_size = sizeof(struct srp_host_attrs);

	i->t.host_attrs.ac.attrs = &i->host_attrs[0];

	i->t.host_attrs.ac.class = &srp_host_class.class;

include/scsi/scsi_transport.h

+0 −12
Original line number Diff line number Diff line
@@ -56,18 +56,6 @@ struct scsi_transport_template { 
	 * Allows a transport to override the default error handler.

	 */

	void (* eh_strategy_handler)(struct Scsi_Host *);



	/*

	 * Used as callback for the completion of i_t_nexus request

	 * for target drivers.

	 */

	int (* it_nexus_response)(struct Scsi_Host *, u64, int);



	/*

	 * Used as callback for the completion of task management

	 * request for target drivers.

	 */

	int (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64, int);

};



#define transport_class_to_shost(tc) \

include/scsi/scsi_transport_srp.h

+0 −7
Original line number Diff line number Diff line
@@ -88,10 +88,6 @@ struct srp_rport { 
 * @terminate_rport_io: Callback function for terminating all outstanding I/O

 *     requests for an rport.

 * @rport_delete: Callback function that deletes an rport.

 *

 * Fields that are only relevant for SRP target drivers:

 * @tsk_mgmt_response: Callback function for sending a task management response.

 * @it_nexus_response: Callback function for processing an IT nexus response.

 */

struct srp_function_template {

	/* for initiator drivers */
@@ -103,9 +99,6 @@ struct srp_function_template { 
	int (*reconnect)(struct srp_rport *rport);

	void (*terminate_rport_io)(struct srp_rport *rport);

	void (*rport_delete)(struct srp_rport *rport);

	/* for target drivers */

	int (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64, int);

	int (* it_nexus_response)(struct Scsi_Host *, u64, int);

};



extern struct scsi_transport_template *