scsi: Fix "choir" and "beeing" malaprops

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt
index a0c85110a07ef7be95511ae13fa982b5692e1ca1..8638f61c8c9db70d767302497d417be6c9a0a030 100644 (file)
--- a/Documentation/scsi/scsi_eh.txt
+++ b/Documentation/scsi/scsi_eh.txt
@@ -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().
 

diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index e77b72f7800671539ddce4bf8dd5cb3b6efedf1f..ee2407b83afb2236f6b60dd12be82617f47d1ef0 100644 (file)
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -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 */ 

diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 6a039eb1cbce3e808533ec4dabf2041696aa5ed5..dccce08d0ad4633473fde206a2e1214c69bf6545 100644 (file)
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -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. 
 */
 

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index ba2034779961ae85fff76a46ffb8be75d7c38352..b286b5787c853d0a81c05ed19426d8052b7fc621 100644 (file)
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -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.
         */