Skip to content

Commit

Permalink
[SCSI] sym2: Use scsi_print_msg
Browse files Browse the repository at this point in the history
sym_show_msg was almost a duplicate of scsi_print_msg, except not as
featureful.  So use the common code instead.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
  • Loading branch information
Matthew Wilcox authored and James Bottomley committed Dec 14, 2005
1 parent 1e8eb21 commit 33333ba
Showing 1 changed file with 5 additions and 24 deletions.
29 changes: 5 additions & 24 deletions drivers/scsi/sym53c8xx_2/sym_hipd.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

#include <linux/slab.h>
#include <asm/param.h> /* for timeouts in units of HZ */
#include <scsi/scsi_dbg.h>

#include "sym_glue.h"
#include "sym_nvram.h"
Expand Down Expand Up @@ -70,41 +71,21 @@ static void sym_printl_hex(u_char *p, int n)
printf (".\n");
}

/*
* Print out the content of a SCSI message.
*/
static int sym_show_msg (u_char * msg)
{
u_char i;
printf ("%x",*msg);
if (*msg==M_EXTENDED) {
for (i=1;i<8;i++) {
if (i-1>msg[1]) break;
printf ("-%x",msg[i]);
}
return (i+1);
} else if ((*msg & 0xf0) == 0x20) {
printf ("-%x",msg[1]);
return (2);
}
return (1);
}

static void sym_print_msg(struct sym_ccb *cp, char *label, u_char *msg)
{
sym_print_addr(cp->cmd, "%s: ", label);

sym_show_msg(msg);
printf(".\n");
scsi_print_msg(msg);
printf("\n");
}

static void sym_print_nego_msg(struct sym_hcb *np, int target, char *label, u_char *msg)
{
struct sym_tcb *tp = &np->target[target];
dev_info(&tp->starget->dev, "%s: ", label);

sym_show_msg(msg);
printf(".\n");
scsi_print_msg(msg);
printf("\n");
}

/*
Expand Down

0 comments on commit 33333ba

Please sign in to comment.