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

Commit 92c7a83f authored by Martin Peschke's avatar Martin Peschke Committed by James Bottomley
Browse files

[SCSI] zfcp: Cleanup line breaks in debug trace. 



Remove line breaks that do not conform to coding style.

Signed-off-by: default avatarMartin Peschke <mp3@de.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 6bc473dd

drivers/s390/scsi/zfcp_dbf.c

+55 −68
Original line number Diff line number Diff line
@@ -110,9 +110,8 @@ static void zfcp_dbf_outd(char **p, const char *label, char *buffer, 
		*p += sprintf(*p, "\n");

}



static int

zfcp_dbf_view_header(debug_info_t * id, struct debug_view *view, int area,

		     debug_entry_t * entry, char *out_buf)

static int zfcp_dbf_view_header(debug_info_t *id, struct debug_view *view,

				int area, debug_entry_t *entry, char *out_buf)

{

	struct zfcp_dbf_dump *dump = (struct zfcp_dbf_dump *)DEBUG_DATA(entry);

	struct timespec t;
@@ -248,8 +247,7 @@ void zfcp_hba_dbf_event_fsf_response(struct zfcp_fsf_req *fsf_req) 
	spin_unlock_irqrestore(&adapter->hba_dbf_lock, flags);

}



void

zfcp_hba_dbf_event_fsf_unsol(const char *tag, struct zfcp_adapter *adapter,

void zfcp_hba_dbf_event_fsf_unsol(const char *tag, struct zfcp_adapter *adapter,

				  struct fsf_status_read_buffer *status_buffer)

{

	struct zfcp_hba_dbf_record *rec = &adapter->hba_dbf_buf;
@@ -301,8 +299,7 @@ zfcp_hba_dbf_event_fsf_unsol(const char *tag, struct zfcp_adapter *adapter, 
	spin_unlock_irqrestore(&adapter->hba_dbf_lock, flags);

}



void

zfcp_hba_dbf_event_qdio(struct zfcp_adapter *adapter, unsigned int status,

void zfcp_hba_dbf_event_qdio(struct zfcp_adapter *adapter, unsigned int status,

			     unsigned int qdio_error, unsigned int siga_error,

			     int sbal_index, int sbal_count)

{
@@ -872,10 +869,10 @@ void zfcp_san_dbf_event_ct_response(struct zfcp_fsf_req *fsf_req) 
	spin_unlock_irqrestore(&adapter->san_dbf_lock, flags);

}



static void

_zfcp_san_dbf_event_common_els(const char *tag, int level,

static void zfcp_san_dbf_event_els(const char *tag, int level,

				   struct zfcp_fsf_req *fsf_req, u32 s_id,

			       u32 d_id, u8 ls_code, void *buffer, int buflen)

				   u32 d_id, u8 ls_code, void *buffer,

				   int buflen)

{

	struct zfcp_adapter *adapter = fsf_req->adapter;

	struct zfcp_san_dbf_record *rec = &adapter->san_dbf_buf;
@@ -899,19 +896,17 @@ void zfcp_san_dbf_event_els_request(struct zfcp_fsf_req *fsf_req) 
{

	struct zfcp_send_els *els = (struct zfcp_send_els *)fsf_req->data;



	_zfcp_san_dbf_event_common_els("oels", 2, fsf_req,

	zfcp_san_dbf_event_els("oels", 2, fsf_req,

			       fc_host_port_id(els->adapter->scsi_host),

				       els->d_id,

				       *(u8 *) zfcp_sg_to_address(els->req),

				       zfcp_sg_to_address(els->req),

				       els->req->length);

			       els->d_id, *(u8 *) zfcp_sg_to_address(els->req),

			       zfcp_sg_to_address(els->req), els->req->length);

}



void zfcp_san_dbf_event_els_response(struct zfcp_fsf_req *fsf_req)

{

	struct zfcp_send_els *els = (struct zfcp_send_els *)fsf_req->data;



	_zfcp_san_dbf_event_common_els("rels", 2, fsf_req, els->d_id,

	zfcp_san_dbf_event_els("rels", 2, fsf_req, els->d_id,

			       fc_host_port_id(els->adapter->scsi_host),

			       *(u8 *)zfcp_sg_to_address(els->req),

			       zfcp_sg_to_address(els->resp),
@@ -921,19 +916,18 @@ void zfcp_san_dbf_event_els_response(struct zfcp_fsf_req *fsf_req) 
void zfcp_san_dbf_event_incoming_els(struct zfcp_fsf_req *fsf_req)

{

	struct zfcp_adapter *adapter = fsf_req->adapter;

	struct fsf_status_read_buffer *status_buffer =

	struct fsf_status_read_buffer *buf =

			(struct fsf_status_read_buffer *)fsf_req->data;

	int length = (int)status_buffer->length -

	    (int)((void *)&status_buffer->payload - (void *)status_buffer);

	int length = (int)buf->length -

		     (int)((void *)&buf->payload - (void *)buf);



	_zfcp_san_dbf_event_common_els("iels", 1, fsf_req, status_buffer->d_id,

	zfcp_san_dbf_event_els("iels", 1, fsf_req, buf->d_id,

			       fc_host_port_id(adapter->scsi_host),

				       *(u8 *) status_buffer->payload,

				       (void *)status_buffer->payload, length);

			       *(u8 *)buf->payload, (void *)buf->payload,

			       length);

}



static int

zfcp_san_dbf_view_format(debug_info_t * id, struct debug_view *view,

static int zfcp_san_dbf_view_format(debug_info_t *id, struct debug_view *view,

				    char *out_buf, const char *in_buf)

{

	struct zfcp_san_dbf_record *r = (struct zfcp_san_dbf_record *)in_buf;
@@ -997,8 +991,7 @@ static struct debug_view zfcp_san_dbf_view = { 
	NULL

};



static void

_zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level,

static void zfcp_scsi_dbf_event(const char *tag, const char *tag2, int level,

				struct zfcp_adapter *adapter,

				struct scsi_cmnd *scsi_cmnd,

				struct zfcp_fsf_req *fsf_req,
@@ -1076,38 +1069,32 @@ _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level, 
	spin_unlock_irqrestore(&adapter->scsi_dbf_lock, flags);

}



void

zfcp_scsi_dbf_event_result(const char *tag, int level,

void zfcp_scsi_dbf_event_result(const char *tag, int level,

				struct zfcp_adapter *adapter,

				struct scsi_cmnd *scsi_cmnd,

				struct zfcp_fsf_req *fsf_req)

{

	_zfcp_scsi_dbf_event_common("rslt", tag, level,

			adapter, scsi_cmnd, fsf_req, 0);

	zfcp_scsi_dbf_event("rslt", tag, level, adapter, scsi_cmnd, fsf_req, 0);

}



void

zfcp_scsi_dbf_event_abort(const char *tag, struct zfcp_adapter *adapter,

void zfcp_scsi_dbf_event_abort(const char *tag, struct zfcp_adapter *adapter,

			       struct scsi_cmnd *scsi_cmnd,

			       struct zfcp_fsf_req *new_fsf_req,

			       unsigned long old_req_id)

{

	_zfcp_scsi_dbf_event_common("abrt", tag, 1,

			adapter, scsi_cmnd, new_fsf_req, old_req_id);

	zfcp_scsi_dbf_event("abrt", tag, 1, adapter, scsi_cmnd, new_fsf_req,

			    old_req_id);

}



void

zfcp_scsi_dbf_event_devreset(const char *tag, u8 flag, struct zfcp_unit *unit,

void zfcp_scsi_dbf_event_devreset(const char *tag, u8 flag,

				  struct zfcp_unit *unit,

				  struct scsi_cmnd *scsi_cmnd)

{

	struct zfcp_adapter *adapter = unit->port->adapter;



	_zfcp_scsi_dbf_event_common(flag == FCP_TARGET_RESET ? "trst" : "lrst",

			tag, 1, adapter, scsi_cmnd, NULL, 0);

	zfcp_scsi_dbf_event(flag == FCP_TARGET_RESET ? "trst" : "lrst", tag, 1,

			    unit->port->adapter, scsi_cmnd, NULL, 0);

}



static int

zfcp_scsi_dbf_view_format(debug_info_t * id, struct debug_view *view,

static int zfcp_scsi_dbf_view_format(debug_info_t *id, struct debug_view *view,

				     char *out_buf, const char *in_buf)

{

	struct zfcp_scsi_dbf_record *r = (struct zfcp_scsi_dbf_record *)in_buf;