Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Finn Thain and committed by
Jiri Kosina
542cb459 de869917

+5 -5
+2 -2
Documentation/scsi/scsi_eh.txt
··· 172 172 173 173 - eh_strategy_handler() callback 174 174 This is one big callback which should perform whole error 175 - handling. As such, it should do all choirs SCSI midlayer 175 + handling. As such, it should do all chores the SCSI midlayer 176 176 performs during recovery. This will be discussed in [2-2]. 177 177 178 178 Once recovery is complete, SCSI EH resumes normal operation by ··· 428 428 scsi_unjam_host() and it is responsible for whole recovery process. 429 429 On completion, the handler should have made lower layers forget about 430 430 all failed scmds and either ready for new commands or offline. Also, 431 - it should perform SCSI EH maintenance choirs to maintain integrity of 431 + it should perform SCSI EH maintenance chores to maintain integrity of 432 432 SCSI midlayer. IOW, of the steps described in [2-1-2], all steps 433 433 except for #1 must be implemented by eh_strategy_handler(). 434 434
+1 -1
drivers/scsi/aha152x.c
··· 345 345 346 346 enum { 347 347 not_issued = 0x0001, /* command not yet issued */ 348 - selecting = 0x0002, /* target is beeing selected */ 348 + selecting = 0x0002, /* target is being selected */ 349 349 identified = 0x0004, /* IDENTIFY was sent */ 350 350 disconnected = 0x0008, /* target disconnected */ 351 351 completed = 0x0010, /* target sent COMMAND COMPLETE */
+1 -1
drivers/scsi/mac_scsi.c
··· 360 360 XXX: Since bus errors in the PDMA routines never happen on my 361 361 computer, the bus error code is untested. 362 362 If the code works as intended, a bus error results in Pseudo-DMA 363 - beeing disabled, meaning that the driver switches to slow handshake. 363 + being disabled, meaning that the driver switches to slow handshake. 364 364 If bus errors are NOT extremely rare, this has to be changed. 365 365 */ 366 366
+1 -1
include/scsi/scsi_host.h
··· 555 555 * __devices is protected by the host_lock, but you should 556 556 * usually use scsi_device_lookup / shost_for_each_device 557 557 * to access it and don't care about locking yourself. 558 - * In the rare case of beeing in irq context you can use 558 + * In the rare case of being in irq context you can use 559 559 * their __ prefixed variants with the lock held. NEVER 560 560 * access this list directly from a driver. 561 561 */