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

Commit 1abfd370 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by James Bottomley
Browse files

[SCSI] Rename scsi_print_msg to spi_print_msg 



Rename scsi_print_msg to spi_print_msg and move its prototype from
scsi_dbg.h to scsi_transport_spi.h

Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 410ca5c7

drivers/scsi/53c700.c

+3 −3
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ process_extended_message(struct Scsi_Host *host, 
		printk(KERN_INFO "scsi%d (%d:%d): Unexpected message %s: ",

		       host->host_no, pun, lun,

		       NCR_700_phase[(dsps & 0xf00) >> 8]);

		scsi_print_msg(hostdata->msgin);

		spi_print_msg(hostdata->msgin);

		printk("\n");

		/* just reject it */

		hostdata->msgout[0] = A_REJECT_MSG;
@@ -887,7 +887,7 @@ process_message(struct Scsi_Host *host, struct NCR_700_Host_Parameters *hostdata 
#ifdef NCR_700_DEBUG

	printk("scsi%d (%d:%d): message %s: ", host->host_no, pun, lun,

	       NCR_700_phase[(dsps & 0xf00) >> 8]);

	scsi_print_msg(hostdata->msgin);

	spi_print_msg(hostdata->msgin);

	printk("\n");

#endif
@@ -939,7 +939,7 @@ process_message(struct Scsi_Host *host, struct NCR_700_Host_Parameters *hostdata 
		       host->host_no, pun, lun,

		       NCR_700_phase[(dsps & 0xf00) >> 8]);



		scsi_print_msg(hostdata->msgin);

		spi_print_msg(hostdata->msgin);

		printk("\n");

		/* just reject it */

		hostdata->msgout[0] = A_REJECT_MSG;

drivers/scsi/53c7xx.c

+4 −3
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ 
#include "scsi.h"

#include <scsi/scsi_dbg.h>

#include <scsi/scsi_host.h>

#include <scsi/scsi_transport_spi.h>

#include "53c7xx.h"

#include <linux/stat.h>

#include <linux/stddef.h>
@@ -1724,7 +1725,7 @@ NCR53c7xx_run_tests (struct Scsi_Host *host) { 
		printk ("scsi%d : status ", host->host_no);

		scsi_print_status (status);

		printk ("\nscsi%d : message ", host->host_no);

		scsi_print_msg (&msg);

		spi_print_msg(&msg);

		printk ("\n");

	    } else if (hostdata->test_completed == 3) {

		printk("scsi%d : test 2 no connection with target %d\n",
@@ -2313,7 +2314,7 @@ NCR53c7x0_dstat_sir_intr (struct Scsi_Host *host, struct 
	    printk ("scsi%d : received message", host->host_no);

	    if (c) 

	    	printk (" from target %d lun %d ", c->device->id, c->device->lun);

	    scsi_print_msg ((unsigned char *) hostdata->msg_buf);

	    spi_print_msg((unsigned char *) hostdata->msg_buf);

	    printk("\n");

	}
@@ -5540,7 +5541,7 @@ print_dsa (struct Scsi_Host *host, u32 *dsa, const char *prefix) { 
	    i > 0 && !check_address ((unsigned long) ptr, 1);

	    ptr += len, i -= len) {

	    printk("               ");

	    len = scsi_print_msg (ptr);

	    len = spi_print_msg(ptr);

	    printk("\n");

	    if (!len)

		break;

drivers/scsi/NCR5380.c

+4 −3
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 
 *      the high level code.

 */

#include <scsi/scsi_dbg.h>

#include <scsi/scsi_transport_spi.h>



#ifndef NDEBUG

#define NDEBUG 0
@@ -2377,7 +2378,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { 
 * 3..length+1  arguments

 *

 * Start the extended message buffer with the EXTENDED_MESSAGE

 * byte, since scsi_print_msg() wants the whole thing.  

 * byte, since spi_print_msg() wants the whole thing.  

 */

					extended_msg[0] = EXTENDED_MESSAGE;

					/* Accept first byte by clearing ACK */
@@ -2424,7 +2425,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { 
				default:

					if (!tmp) {

						printk("scsi%d: rejecting message ", instance->host_no);

						scsi_print_msg(extended_msg);

						spi_print_msg(extended_msg);

						printk("\n");

					} else if (tmp != EXTENDED_MESSAGE)

						scmd_printk(KERN_INFO, cmd,
@@ -2560,7 +2561,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) { 


	if (!(msg[0] & 0x80)) {

		printk(KERN_ERR "scsi%d : expecting IDENTIFY message, got ", instance->host_no);

		scsi_print_msg(msg);

		spi_print_msg(msg);

		abort = 1;

	} else {

		/* Accept message by clearing ACK */

drivers/scsi/aha152x.c

+4 −3
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ 
#include "scsi.h"

#include <scsi/scsi_dbg.h>

#include <scsi/scsi_host.h>

#include <scsi/scsi_transport_spi.h>

#include "aha152x.h"
@@ -1845,7 +1846,7 @@ static void msgi_run(struct Scsi_Host *shpnt) 
#if defined(AHA152X_DEBUG)

		if (HOSTDATA(shpnt)->debug & debug_msgi) {

			printk(INFO_LEAD "inbound message %02x ", CMDINFO(CURRENT_SC), MSGI(0));

			scsi_print_msg(&MSGI(0));

			spi_print_msg(&MSGI(0));

			printk("\n");

		}

#endif
@@ -1933,7 +1934,7 @@ static void msgi_run(struct Scsi_Host *shpnt) 
						break;



					printk(INFO_LEAD, CMDINFO(CURRENT_SC));

					scsi_print_msg(&MSGI(0));

					spi_print_msg(&MSGI(0));

					printk("\n");



					ticks = (MSGI(3) * 4 + 49) / 50;
@@ -2031,7 +2032,7 @@ static void msgo_init(struct Scsi_Host *shpnt) 
		int i;



		printk(DEBUG_LEAD "messages( ", CMDINFO(CURRENT_SC));

		for (i=0; i<MSGOLEN; i+=scsi_print_msg(&MSGO(i)), printk(" "))

		for (i=0; i<MSGOLEN; i+=spi_print_msg(&MSGO(i)), printk(" "))

			;

		printk(")\n");

	}

drivers/scsi/arm/acornscsi.c

+4 −3
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ 
#include "../scsi.h"

#include <scsi/scsi_dbg.h>

#include <scsi/scsi_host.h>

#include <scsi/scsi_transport_spi.h>

#include "acornscsi.h"

#include "msgqueue.h"

#include "scsi.h"
@@ -1370,7 +1371,7 @@ void acornscsi_sendmessage(AS_Host *host) 


	host->scsi.last_message = msg->msg[0];

#if (DEBUG & DEBUG_MESSAGES)

	scsi_print_msg(msg->msg);

	spi_print_msg(msg->msg);

#endif

	break;
@@ -1392,7 +1393,7 @@ void acornscsi_sendmessage(AS_Host *host) 
	while ((msg = msgqueue_getmsg(&host->scsi.msgs, msgnr++)) != NULL) {

	    unsigned int i;

#if (DEBUG & DEBUG_MESSAGES)

	    scsi_print_msg(msg);

	    spi_print_msg(msg);

#endif

	    i = 0;

	    if (acornscsi_write_pio(host, msg->msg, &i, msg->length, 1000000))
@@ -1488,7 +1489,7 @@ void acornscsi_message(AS_Host *host) 
#if (DEBUG & DEBUG_MESSAGES)

    printk("scsi%d.%c: message in: ",

	    host->host->host_no, acornscsi_target(host));

    scsi_print_msg(message);

    spi_print_msg(message);

    printk("\n");

#endif