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

Commit 542cb459 authored by Finn Thain's avatar Finn Thain Committed by Jiri Kosina
Browse files

scsi: Fix "choir" and "beeing" malaprops 



Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent de869917

Documentation/scsi/scsi_eh.txt

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ ways. 


 - eh_strategy_handler() callback

	This is one big callback which should perform whole error

	handling.  As such, it should do all choirs SCSI midlayer

	handling.  As such, it should do all chores the SCSI midlayer

	performs during recovery.  This will be discussed in [2-2].



 Once recovery is complete, SCSI EH resumes normal operation by
@@ -428,7 +428,7 @@ scmd->allowed. 
scsi_unjam_host() and it is responsible for whole recovery process.

On completion, the handler should have made lower layers forget about

all failed scmds and either ready for new commands or offline.  Also,

it should perform SCSI EH maintenance choirs to maintain integrity of

it should perform SCSI EH maintenance chores to maintain integrity of

SCSI midlayer.  IOW, of the steps described in [2-1-2], all steps

except for #1 must be implemented by eh_strategy_handler().

drivers/scsi/aha152x.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ CMD_INC_RESID(struct scsi_cmnd *cmd, int inc) 


enum {

	not_issued	= 0x0001,	/* command not yet issued */

	selecting	= 0x0002, 	/* target is beeing selected */

	selecting	= 0x0002,	/* target is being selected */

	identified	= 0x0004,	/* IDENTIFY was sent */

	disconnected	= 0x0008,	/* target disconnected */

	completed	= 0x0010,	/* target sent COMMAND COMPLETE */

drivers/scsi/mac_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ const char * macscsi_info (struct Scsi_Host *spnt) { 
   XXX: Since bus errors in the PDMA routines never happen on my 

   computer, the bus error code is untested. 

   If the code works as intended, a bus error results in Pseudo-DMA 

   beeing disabled, meaning that the driver switches to slow handshake. 

   being disabled, meaning that the driver switches to slow handshake.

   If bus errors are NOT extremely rare, this has to be changed. 

*/

include/scsi/scsi_host.h

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ struct Scsi_Host { 
	 * __devices is protected by the host_lock, but you should

	 * usually use scsi_device_lookup / shost_for_each_device

	 * to access it and don't care about locking yourself.

	 * In the rare case of beeing in irq context you can use

	 * In the rare case of being in irq context you can use

	 * their __ prefixed variants with the lock held. NEVER

	 * access this list directly from a driver.

	 */