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

Commit 6413f086 authored by Denis Cheng's avatar Denis Cheng Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-scsi: use print_hex_dump from <linux/kernel.h> 



these utilities implemented in lib/hexdump.c are more handy, please use this.

Bart:
- s/KERN_DEBUG/KERN_CONT/ as pointed out by Randy
- s/DUMP_PREFIX_OFFSET/DUMP_PREFIX_NONE/
- don't include ASCII dump
- respect 80-columns limit

Signed-off-by: default avatarDenis Cheng <crquan@gmail.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent e97564f3

drivers/scsi/ide-scsi.c

+8 −14
Original line number Diff line number Diff line
@@ -242,16 +242,6 @@ static void idescsi_output_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsign 
	}

}



static void hexdump(u8 *x, int len)

{

	int i;



	printk("[ ");

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

		printk("%x ", x[i]);

	printk("]\n");

}



static int idescsi_check_condition(ide_drive_t *drive, struct request *failed_command)

{

	idescsi_scsi_t *scsi = drive_to_idescsi(drive);
@@ -282,7 +272,8 @@ static int idescsi_check_condition(ide_drive_t *drive, struct request *failed_co 
	pc->scsi_cmd = ((idescsi_pc_t *) failed_command->special)->scsi_cmd;

	if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) {

		printk ("ide-scsi: %s: queue cmd = ", drive->name);

		hexdump(pc->c, 6);

		print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1, pc->c,

			       6, 0);

	}

	rq->rq_disk = scsi->disk;

	return ide_do_drive_cmd(drive, rq, ide_preempt);
@@ -337,7 +328,8 @@ static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs) 
		idescsi_pc_t *opc = (idescsi_pc_t *) rq->buffer;

		if (log) {

			printk ("ide-scsi: %s: wrap up check %lu, rst = ", drive->name, opc->scsi_cmd->serial_number);

			hexdump(pc->buffer,16);

			print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1,

				       pc->buffer, 16, 0);

		}

		memcpy((void *) opc->scsi_cmd->sense_buffer, pc->buffer, SCSI_SENSE_BUFFERSIZE);

		kfree(pc->buffer);
@@ -816,10 +808,12 @@ static int idescsi_queue (struct scsi_cmnd *cmd, 


	if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) {

		printk ("ide-scsi: %s: que %lu, cmd = ", drive->name, cmd->serial_number);

		hexdump(cmd->cmnd, cmd->cmd_len);

		print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1,

			       cmd->cmnd, cmd->cmd_len, 0);

		if (memcmp(pc->c, cmd->cmnd, cmd->cmd_len)) {

			printk ("ide-scsi: %s: que %lu, tsl = ", drive->name, cmd->serial_number);

			hexdump(pc->c, 12);

			print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1,

				       pc->c, 12, 0);

		}

	}