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

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

scsi: print single-character strings with seq_putc 



Using seq_putc to print a single character saves at least a strlen()
call and a memory access, and may also give a small .text reduction.

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 3d30079c

drivers/scsi/NCR5380.c

+1 −1
Original line number Diff line number Diff line
@@ -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_puts(m, "\n");

	seq_putc(m, '\n');

}



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

drivers/scsi/advansys.c

+17 −17
Original line number Diff line number Diff line
@@ -3088,7 +3088,7 @@ static void asc_prt_asc_board_eeprom(struct seq_file *m, struct Scsi_Host *shost 
	for (i = 0; i <= ASC_MAX_TID; i++)

		seq_printf(m, " %c",

			   (ep->init_sdtr & ADV_TID_TO_TIDMASK(i)) ? 'Y' : 'N');

	seq_puts(m, "\n");

	seq_putc(m, '\n');



#ifdef CONFIG_ISA

	if (asc_dvc_varp->bus_type & ASC_IS_ISA) {
@@ -3203,7 +3203,7 @@ static void asc_prt_adv_board_eeprom(struct seq_file *m, struct Scsi_Host *shost 
	seq_puts(m, " Target ID:           ");

	for (i = 0; i <= ADV_MAX_TID; i++)

		seq_printf(m, " %X", i);

	seq_puts(m, "\n");

	seq_putc(m, '\n');



	if (adv_dvc_varp->chip_type == ADV_CHIP_ASC3550) {

		word = ep_3550->disc_enable;
@@ -3216,7 +3216,7 @@ static void asc_prt_adv_board_eeprom(struct seq_file *m, struct Scsi_Host *shost 
	for (i = 0; i <= ADV_MAX_TID; i++)

		seq_printf(m, " %c",

			   (word & ADV_TID_TO_TIDMASK(i)) ? 'Y' : 'N');

	seq_puts(m, "\n");

	seq_putc(m, '\n');



	if (adv_dvc_varp->chip_type == ADV_CHIP_ASC3550) {

		word = ep_3550->tagqng_able;
@@ -3229,7 +3229,7 @@ static void asc_prt_adv_board_eeprom(struct seq_file *m, struct Scsi_Host *shost 
	for (i = 0; i <= ADV_MAX_TID; i++)

		seq_printf(m, " %c",

			   (word & ADV_TID_TO_TIDMASK(i)) ? 'Y' : 'N');

	seq_puts(m, "\n");

	seq_putc(m, '\n');



	if (adv_dvc_varp->chip_type == ADV_CHIP_ASC3550) {

		word = ep_3550->start_motor;
@@ -3242,7 +3242,7 @@ static void asc_prt_adv_board_eeprom(struct seq_file *m, struct Scsi_Host *shost 
	for (i = 0; i <= ADV_MAX_TID; i++)

		seq_printf(m, " %c",

			   (word & ADV_TID_TO_TIDMASK(i)) ? 'Y' : 'N');

	seq_puts(m, "\n");

	seq_putc(m, '\n');



	if (adv_dvc_varp->chip_type == ADV_CHIP_ASC3550) {

		seq_puts(m, " Synchronous Transfer:");
@@ -3250,7 +3250,7 @@ static void asc_prt_adv_board_eeprom(struct seq_file *m, struct Scsi_Host *shost 
			seq_printf(m, " %c",

				   (ep_3550->sdtr_able & ADV_TID_TO_TIDMASK(i)) ?

				   'Y' : 'N');

		seq_puts(m, "\n");

		seq_putc(m, '\n');

	}



	if (adv_dvc_varp->chip_type == ADV_CHIP_ASC3550) {
@@ -3259,7 +3259,7 @@ static void asc_prt_adv_board_eeprom(struct seq_file *m, struct Scsi_Host *shost 
			seq_printf(m, " %c",

				   (ep_3550->ultra_able & ADV_TID_TO_TIDMASK(i))

				   ? 'Y' : 'N');

		seq_puts(m, "\n");

		seq_putc(m, '\n');

	}



	if (adv_dvc_varp->chip_type == ADV_CHIP_ASC3550) {
@@ -3273,7 +3273,7 @@ static void asc_prt_adv_board_eeprom(struct seq_file *m, struct Scsi_Host *shost 
	for (i = 0; i <= ADV_MAX_TID; i++)

		seq_printf(m, " %c",

			   (word & ADV_TID_TO_TIDMASK(i)) ? 'Y' : 'N');

	seq_puts(m, "\n");

	seq_putc(m, '\n');



	if (adv_dvc_varp->chip_type == ADV_CHIP_ASC38C0800 ||

	    adv_dvc_varp->chip_type == ADV_CHIP_ASC38C1600) {
@@ -3318,7 +3318,7 @@ static void asc_prt_adv_board_eeprom(struct seq_file *m, struct Scsi_Host *shost 
				seq_puts(m, "\n  ");

			sdtr_speed >>= 4;

		}

		seq_puts(m, "\n");

		seq_putc(m, '\n');

	}

}
@@ -3448,7 +3448,7 @@ static void asc_prt_asc_board_info(struct seq_file *m, struct Scsi_Host *shost) 
			   i,

			   (v->sdtr_done & ADV_TID_TO_TIDMASK(i)) ? 'Y' : 'N');

	}

	seq_puts(m, "\n");

	seq_putc(m, '\n');



	for (i = 0; i <= ASC_MAX_TID; i++) {

		uchar syn_period_ix;
@@ -3483,7 +3483,7 @@ static void asc_prt_asc_board_info(struct seq_file *m, struct Scsi_Host *shost) 
			seq_puts(m, "*\n");

			renegotiate = 1;

		} else {

			seq_puts(m, "\n");

			seq_putc(m, '\n');

		}

	}
@@ -3570,7 +3570,7 @@ static void asc_prt_adv_board_info(struct seq_file *m, struct Scsi_Host *shost) 


		seq_printf(m, " %X:%d", i, lrambyte);

	}

	seq_puts(m, "\n");

	seq_putc(m, '\n');



	AdvReadWordLram(iop_base, ASC_MC_WDTR_ABLE, wdtr_able);

	seq_puts(m, " Wide Enabled:");
@@ -3584,7 +3584,7 @@ static void asc_prt_adv_board_info(struct seq_file *m, struct Scsi_Host *shost) 
			   i,

			   (wdtr_able & ADV_TID_TO_TIDMASK(i)) ? 'Y' : 'N');

	}

	seq_puts(m, "\n");

	seq_putc(m, '\n');



	AdvReadWordLram(iop_base, ASC_MC_WDTR_DONE, wdtr_done);

	seq_puts(m, " Transfer Bit Width:");
@@ -3603,11 +3603,11 @@ static void asc_prt_adv_board_info(struct seq_file *m, struct Scsi_Host *shost) 


		if ((wdtr_able & ADV_TID_TO_TIDMASK(i)) &&

		    (wdtr_done & ADV_TID_TO_TIDMASK(i)) == 0) {

			seq_puts(m, "*");

			seq_putc(m, '*');

			renegotiate = 1;

		}

	}

	seq_puts(m, "\n");

	seq_putc(m, '\n');



	AdvReadWordLram(iop_base, ASC_MC_SDTR_ABLE, sdtr_able);

	seq_puts(m, " Synchronous Enabled:");
@@ -3621,7 +3621,7 @@ static void asc_prt_adv_board_info(struct seq_file *m, struct Scsi_Host *shost) 
			   i,

			   (sdtr_able & ADV_TID_TO_TIDMASK(i)) ? 'Y' : 'N');

	}

	seq_puts(m, "\n");

	seq_putc(m, '\n');



	AdvReadWordLram(iop_base, ASC_MC_SDTR_DONE, sdtr_done);

	for (i = 0; i <= ADV_MAX_TID; i++) {
@@ -3670,7 +3670,7 @@ static void asc_prt_adv_board_info(struct seq_file *m, struct Scsi_Host *shost) 
			seq_puts(m, "*\n");

			renegotiate = 1;

		} else {

			seq_puts(m, "\n");

			seq_putc(m, '\n');

		}

	}

drivers/scsi/aic7xxx/aic79xx_proc.c

+5 −5
Original line number Diff line number Diff line
@@ -148,9 +148,9 @@ ahd_format_transinfo(struct seq_file *m, struct ahd_transinfo *tinfo) 
		}

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

	} else if (freq != 0) {

		seq_puts(m, ")");

		seq_putc(m, ')');

	}

	seq_puts(m, "\n");

	seq_putc(m, '\n');

}



static void
@@ -294,14 +294,14 @@ ahd_linux_show_info(struct seq_file *m, struct Scsi_Host *shost) 
		seq_puts(m, "Serial EEPROM:\n");

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

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

				seq_puts(m, "\n");

				seq_putc(m, '\n');

			}

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

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

		}

		seq_puts(m, "\n");

		seq_putc(m, '\n');

	}

	seq_puts(m, "\n");

	seq_putc(m, '\n');



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

		max_targ = 8;

drivers/scsi/aic7xxx/aic7xxx_proc.c

+5 −5
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ ahc_format_transinfo(struct seq_file *m, struct ahc_transinfo *tinfo) 
		}

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

	} else if (freq != 0) {

		seq_puts(m, ")");

		seq_putc(m, ')');

	}

	seq_puts(m, "\n");

	seq_putc(m, '\n');

}



static void
@@ -308,14 +308,14 @@ ahc_linux_show_info(struct seq_file *m, struct Scsi_Host *shost) 
		seq_puts(m, "Serial EEPROM:\n");

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

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

				seq_puts(m, "\n");

				seq_putc(m, '\n');

			}

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

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

		}

		seq_puts(m, "\n");

		seq_putc(m, '\n');

	}

	seq_puts(m, "\n");

	seq_putc(m, '\n');



	max_targ = 16;

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

drivers/scsi/atari_NCR5380.c

+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static void show_Scsi_Cmnd(struct scsi_cmnd *cmd, struct seq_file *m) 
	seq_printf(m, "%2d (0x%02x)", command[0], command[0]);

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

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

	seq_puts(m, "\n");

	seq_putc(m, '\n');

}



static int __maybe_unused NCR5380_show_info(struct seq_file *m,