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

Commit 91c40f24 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by James Bottomley
Browse files

scsi: replace seq_printf with seq_puts 



Using seq_printf to print a simple string is a lot more expensive than
it needs to be, since seq_puts exists. Replace seq_printf with
seq_puts when possible.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent ee7c7277

drivers/scsi/BusLogic.c

+5 −5
Original line number Diff line number Diff line
@@ -3485,7 +3485,7 @@ static int blogic_show_info(struct seq_file *m, struct Scsi_Host *shost) 
	seq_printf(m, "\n\

Current Driver Queue Depth:	%d\n\

Currently Allocated CCBs:	%d\n", adapter->drvr_qdepth, adapter->alloc_ccbs);

	seq_printf(m, "\n\n\

	seq_puts(m, "\n\n\

			   DATA TRANSFER STATISTICS\n\

\n\

Target	Tagged Queuing	Queue Depth  Active  Attempted	Completed\n\
@@ -3500,7 +3500,7 @@ Target Tagged Queuing Queue Depth Active Attempted Completed\n\ 
		seq_printf(m,

				  "	    %3d       %3u    %9u	%9u\n", adapter->qdepth[tgt], adapter->active_cmds[tgt], tgt_stats[tgt].cmds_tried, tgt_stats[tgt].cmds_complete);

	}

	seq_printf(m, "\n\

	seq_puts(m, "\n\

Target  Read Commands  Write Commands   Total Bytes Read    Total Bytes Written\n\

======  =============  ==============  ===================  ===================\n");

	for (tgt = 0; tgt < adapter->maxdev; tgt++) {
@@ -3517,7 +3517,7 @@ Target Read Commands Write Commands Total Bytes Read Total Bytes Written\ 
		else

			seq_printf(m, "	     %9u\n", tgt_stats[tgt].byteswritten.units);

	}

	seq_printf(m, "\n\

	seq_puts(m, "\n\

Target  Command    0-1KB      1-2KB      2-4KB      4-8KB     8-16KB\n\

======  =======  =========  =========  =========  =========  =========\n");

	for (tgt = 0; tgt < adapter->maxdev; tgt++) {
@@ -3533,7 +3533,7 @@ Target Command 0-1KB 1-2KB 2-4KB 4-8KB 8-16KB\n\ 
			    tgt_stats[tgt].write_sz_buckets[0],

			    tgt_stats[tgt].write_sz_buckets[1], tgt_stats[tgt].write_sz_buckets[2], tgt_stats[tgt].write_sz_buckets[3], tgt_stats[tgt].write_sz_buckets[4]);

	}

	seq_printf(m, "\n\

	seq_puts(m, "\n\

Target  Command   16-32KB    32-64KB   64-128KB   128-256KB   256KB+\n\

======  =======  =========  =========  =========  =========  =========\n");

	for (tgt = 0; tgt < adapter->maxdev; tgt++) {
@@ -3549,7 +3549,7 @@ Target Command 16-32KB 32-64KB 64-128KB 128-256KB 256KB+\n\ 
			    tgt_stats[tgt].write_sz_buckets[5],

			    tgt_stats[tgt].write_sz_buckets[6], tgt_stats[tgt].write_sz_buckets[7], tgt_stats[tgt].write_sz_buckets[8], tgt_stats[tgt].write_sz_buckets[9]);

	}

	seq_printf(m, "\n\n\

	seq_puts(m, "\n\n\

			   ERROR RECOVERY STATISTICS\n\

\n\

	  Command Aborts      Bus Device Resets	  Host Adapter Resets\n\

drivers/scsi/NCR5380.c

+2 −2
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ static int __maybe_unused NCR5380_show_info(struct seq_file *m, 
static void lprint_Scsi_Cmnd(struct scsi_cmnd *cmd, struct seq_file *m)

{

	seq_printf(m, "scsi%d : destination target %d, lun %llu\n", cmd->device->host->host_no, cmd->device->id, cmd->device->lun);

	seq_printf(m, "        command = ");

	seq_puts(m, "        command = ");

	lprint_command(cmd->cmnd, m);

}
@@ -764,7 +764,7 @@ static void lprint_command(unsigned char *command, struct seq_file *m) 
	lprint_opcode(command[0], m);

	for (i = 1, s = COMMAND_SIZE(command[0]); i < s; ++i)

		seq_printf(m, "%02x ", command[i]);

	seq_printf(m, "\n");

	seq_puts(m, "\n");

}



static void lprint_opcode(int opcode, struct seq_file *m)

drivers/scsi/aic7xxx/aic79xx_proc.c

+18 −20
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ ahd_format_transinfo(struct seq_file *m, struct ahd_transinfo *tinfo) 
	u_int mb;



	if (tinfo->period == AHD_PERIOD_UNKNOWN) {

		seq_printf(m, "Renegotiation Pending\n");

		seq_puts(m, "Renegotiation Pending\n");

		return;

	}

        speed = 3300;
@@ -119,40 +119,38 @@ ahd_format_transinfo(struct seq_file *m, struct ahd_transinfo *tinfo) 
		printed_options = 0;

		seq_printf(m, " (%d.%03dMHz", freq / 1000, freq % 1000);

		if ((tinfo->ppr_options & MSG_EXT_PPR_RD_STRM) != 0) {

			seq_printf(m, " RDSTRM");

			seq_puts(m, " RDSTRM");

			printed_options++;

		}

		if ((tinfo->ppr_options & MSG_EXT_PPR_DT_REQ) != 0) {

			seq_printf(m, "%s", printed_options ? "|DT" : " DT");

			seq_puts(m, printed_options ? "|DT" : " DT");

			printed_options++;

		}

		if ((tinfo->ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {

			seq_printf(m, "%s", printed_options ? "|IU" : " IU");

			seq_puts(m, printed_options ? "|IU" : " IU");

			printed_options++;

		}

		if ((tinfo->ppr_options & MSG_EXT_PPR_RTI) != 0) {

			seq_printf(m, "%s",

				  printed_options ? "|RTI" : " RTI");

			seq_puts(m, printed_options ? "|RTI" : " RTI");

			printed_options++;

		}

		if ((tinfo->ppr_options & MSG_EXT_PPR_QAS_REQ) != 0) {

			seq_printf(m, "%s",

				  printed_options ? "|QAS" : " QAS");

			seq_puts(m, printed_options ? "|QAS" : " QAS");

			printed_options++;

		}

	}



	if (tinfo->width > 0) {

		if (freq != 0) {

			seq_printf(m, ", ");

			seq_puts(m, ", ");

		} else {

			seq_printf(m, " (");

			seq_puts(m, " (");

		}

		seq_printf(m, "%dbit)", 8 * (0x01 << tinfo->width));

	} else if (freq != 0) {

		seq_printf(m, ")");

		seq_puts(m, ")");

	}

	seq_printf(m, "\n");

	seq_puts(m, "\n");

}



static void
@@ -167,15 +165,15 @@ ahd_dump_target_state(struct ahd_softc *ahd, struct seq_file *m, 
	tinfo = ahd_fetch_transinfo(ahd, channel, our_id,

				    target_id, &tstate);

	seq_printf(m, "Target %d Negotiation Settings\n", target_id);

	seq_printf(m, "\tUser: ");

	seq_puts(m, "\tUser: ");

	ahd_format_transinfo(m, &tinfo->user);

	starget = ahd->platform_data->starget[target_id];

	if (starget == NULL)

		return;



	seq_printf(m, "\tGoal: ");

	seq_puts(m, "\tGoal: ");

	ahd_format_transinfo(m, &tinfo->goal);

	seq_printf(m, "\tCurr: ");

	seq_puts(m, "\tCurr: ");

	ahd_format_transinfo(m, &tinfo->curr);



	for (lun = 0; lun < AHD_NUM_LUNS; lun++) {
@@ -291,19 +289,19 @@ ahd_linux_show_info(struct seq_file *m, struct Scsi_Host *shost) 
	max_targ = 16;



	if (ahd->seep_config == NULL)

		seq_printf(m, "No Serial EEPROM\n");

		seq_puts(m, "No Serial EEPROM\n");

	else {

		seq_printf(m, "Serial EEPROM:\n");

		seq_puts(m, "Serial EEPROM:\n");

		for (i = 0; i < sizeof(*ahd->seep_config)/2; i++) {

			if (((i % 8) == 0) && (i != 0)) {

				seq_printf(m, "\n");

				seq_puts(m, "\n");

			}

			seq_printf(m, "0x%.4x ",

				  ((uint16_t*)ahd->seep_config)[i]);

		}

		seq_printf(m, "\n");

		seq_puts(m, "\n");

	}

	seq_printf(m, "\n");

	seq_puts(m, "\n");



	if ((ahd->features & AHD_WIDE) == 0)

		max_targ = 8;

drivers/scsi/aic7xxx/aic7xxx_proc.c

+12 −12
Original line number Diff line number Diff line
@@ -119,15 +119,15 @@ ahc_format_transinfo(struct seq_file *m, struct ahc_transinfo *tinfo) 


	if (tinfo->width > 0) {

		if (freq != 0) {

			seq_printf(m, ", ");

			seq_puts(m, ", ");

		} else {

			seq_printf(m, " (");

			seq_puts(m, " (");

		}

		seq_printf(m, "%dbit)", 8 * (0x01 << tinfo->width));

	} else if (freq != 0) {

		seq_printf(m, ")");

		seq_puts(m, ")");

	}

	seq_printf(m, "\n");

	seq_puts(m, "\n");

}



static void
@@ -145,15 +145,15 @@ ahc_dump_target_state(struct ahc_softc *ahc, struct seq_file *m, 
	if ((ahc->features & AHC_TWIN) != 0)

		seq_printf(m, "Channel %c ", channel);

	seq_printf(m, "Target %d Negotiation Settings\n", target_id);

	seq_printf(m, "\tUser: ");

	seq_puts(m, "\tUser: ");

	ahc_format_transinfo(m, &tinfo->user);

	starget = ahc->platform_data->starget[target_offset];

	if (!starget)

		return;



	seq_printf(m, "\tGoal: ");

	seq_puts(m, "\tGoal: ");

	ahc_format_transinfo(m, &tinfo->goal);

	seq_printf(m, "\tCurr: ");

	seq_puts(m, "\tCurr: ");

	ahc_format_transinfo(m, &tinfo->curr);



	for (lun = 0; lun < AHC_NUM_LUNS; lun++) {
@@ -303,19 +303,19 @@ ahc_linux_show_info(struct seq_file *m, struct Scsi_Host *shost) 




	if (ahc->seep_config == NULL)

		seq_printf(m, "No Serial EEPROM\n");

		seq_puts(m, "No Serial EEPROM\n");

	else {

		seq_printf(m, "Serial EEPROM:\n");

		seq_puts(m, "Serial EEPROM:\n");

		for (i = 0; i < sizeof(*ahc->seep_config)/2; i++) {

			if (((i % 8) == 0) && (i != 0)) {

				seq_printf(m, "\n");

				seq_puts(m, "\n");

			}

			seq_printf(m, "0x%.4x ",

				  ((uint16_t*)ahc->seep_config)[i]);

		}

		seq_printf(m, "\n");

		seq_puts(m, "\n");

	}

	seq_printf(m, "\n");

	seq_puts(m, "\n");



	max_targ = 16;

	if ((ahc->features & (AHC_WIDE|AHC_TWIN)) == 0)

drivers/scsi/arm/fas216.c

+3 −3
Original line number Diff line number Diff line
@@ -2990,7 +2990,7 @@ void fas216_print_devices(FAS216_Info *info, struct seq_file *m) 
	struct fas216_device *dev;

	struct scsi_device *scd;



	seq_printf(m, "Device/Lun TaggedQ       Parity   Sync\n");

	seq_puts(m, "Device/Lun TaggedQ       Parity   Sync\n");



	shost_for_each_device(scd, info->host) {

		dev = &info->device[scd->id];
@@ -3000,7 +3000,7 @@ void fas216_print_devices(FAS216_Info *info, struct seq_file *m) 
				     scd->simple_tags ? "en" : "dis",

				     scd->current_tag);

		else

			seq_printf(m, "unsupported   ");

			seq_puts(m, "unsupported   ");



		seq_printf(m, "%3sabled ", dev->parity_enabled ? "en" : "dis");
@@ -3008,7 +3008,7 @@ void fas216_print_devices(FAS216_Info *info, struct seq_file *m) 
			seq_printf(m, "offset %d, %d ns\n",

				     dev->sof, dev->period * 4);

		else

			seq_printf(m, "async\n");

			seq_puts(m, "async\n");

	}

}