diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-06-30 12:23:04 -0400 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2006-06-30 12:23:04 -0400 |
commit | 0418726bb5c7b5a70c7e7e82e860d5979d0c78cf (patch) | |
tree | 6804c0ac8e4eff56803b6d1d6ce6fdb19a4bd5a4 | |
parent | b3c2ffd5343645fc9b46f67e8c0eaac1e2dde7b4 (diff) |
typo fixes: aquire -> acquire
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | Documentation/digiepca.txt | 2 | ||||
-rw-r--r-- | Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 2 | ||||
-rw-r--r-- | drivers/char/isicom.c | 4 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttvp.h | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_def.h | 2 | ||||
-rw-r--r-- | fs/befs/linuxvfs.c | 38 | ||||
-rw-r--r-- | fs/cifs/file.c | 2 | ||||
-rw-r--r-- | fs/jfs/jfs_txnmgr.c | 2 | ||||
-rw-r--r-- | sound/oss/dmabuf.c | 6 |
9 files changed, 30 insertions, 30 deletions
diff --git a/Documentation/digiepca.txt b/Documentation/digiepca.txt index 88820fe38dad..f2560e22f2c9 100644 --- a/Documentation/digiepca.txt +++ b/Documentation/digiepca.txt | |||
@@ -2,7 +2,7 @@ NOTE: This driver is obsolete. Digi provides a 2.6 driver (dgdm) at | |||
2 | http://www.digi.com for PCI cards. They no longer maintain this driver, | 2 | http://www.digi.com for PCI cards. They no longer maintain this driver, |
3 | and have no 2.6 driver for ISA cards. | 3 | and have no 2.6 driver for ISA cards. |
4 | 4 | ||
5 | This driver requires a number of user-space tools. They can be aquired from | 5 | This driver requires a number of user-space tools. They can be acquired from |
6 | http://www.digi.com, but only works with 2.4 kernels. | 6 | http://www.digi.com, but only works with 2.4 kernels. |
7 | 7 | ||
8 | 8 | ||
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl index 635cbb94357c..bb18115d5170 100644 --- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl +++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl | |||
@@ -3048,7 +3048,7 @@ struct _snd_pcm_runtime { | |||
3048 | </para> | 3048 | </para> |
3049 | 3049 | ||
3050 | <para> | 3050 | <para> |
3051 | If you aquire a spinlock in the interrupt handler, and the | 3051 | If you acquire a spinlock in the interrupt handler, and the |
3052 | lock is used in other pcm callbacks, too, then you have to | 3052 | lock is used in other pcm callbacks, too, then you have to |
3053 | release the lock before calling | 3053 | release the lock before calling |
3054 | <function>snd_pcm_period_elapsed()</function>, because | 3054 | <function>snd_pcm_period_elapsed()</function>, because |
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 478bf4d7d065..c105b9540ad8 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c | |||
@@ -245,7 +245,7 @@ static int lock_card(struct isi_board *card) | |||
245 | printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n", | 245 | printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n", |
246 | card->base); | 246 | card->base); |
247 | 247 | ||
248 | return 0; /* Failed to aquire the card! */ | 248 | return 0; /* Failed to acquire the card! */ |
249 | } | 249 | } |
250 | 250 | ||
251 | static int lock_card_at_interrupt(struct isi_board *card) | 251 | static int lock_card_at_interrupt(struct isi_board *card) |
@@ -262,7 +262,7 @@ static int lock_card_at_interrupt(struct isi_board *card) | |||
262 | spin_unlock_irqrestore(&card->card_lock, card->flags); | 262 | spin_unlock_irqrestore(&card->card_lock, card->flags); |
263 | } | 263 | } |
264 | /* Failing in interrupt is an acceptable event */ | 264 | /* Failing in interrupt is an acceptable event */ |
265 | return 0; /* Failed to aquire the card! */ | 265 | return 0; /* Failed to acquire the card! */ |
266 | } | 266 | } |
267 | 267 | ||
268 | static void unlock_card(struct isi_board *card) | 268 | static void unlock_card(struct isi_board *card) |
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index d2956010f763..311c4c541e01 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h | |||
@@ -360,7 +360,7 @@ struct bttv { | |||
360 | int mbox_csel; | 360 | int mbox_csel; |
361 | 361 | ||
362 | /* risc memory management data | 362 | /* risc memory management data |
363 | - must aquire s_lock before changing these | 363 | - must acquire s_lock before changing these |
364 | - only the irq handler is supported to touch top + bottom + vcurr */ | 364 | - only the irq handler is supported to touch top + bottom + vcurr */ |
365 | struct btcx_riscmem main; | 365 | struct btcx_riscmem main; |
366 | struct bttv_buffer *screen; /* overlay */ | 366 | struct bttv_buffer *screen; /* overlay */ |
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index d6f6579cfd27..6734453ea28a 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
@@ -2134,7 +2134,7 @@ typedef struct scsi_qla_host { | |||
2134 | mempool_t *srb_mempool; | 2134 | mempool_t *srb_mempool; |
2135 | 2135 | ||
2136 | /* This spinlock is used to protect "io transactions", you must | 2136 | /* This spinlock is used to protect "io transactions", you must |
2137 | * aquire it before doing any IO to the card, eg with RD_REG*() and | 2137 | * acquire it before doing any IO to the card, eg with RD_REG*() and |
2138 | * WRT_REG*() for the duration of your entire commandtransaction. | 2138 | * WRT_REG*() for the duration of your entire commandtransaction. |
2139 | * | 2139 | * |
2140 | * This spinlock is of lower priority than the io request lock. | 2140 | * This spinlock is of lower priority than the io request lock. |
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index a83e889a97cd..fcaeead9696b 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
@@ -325,7 +325,7 @@ befs_read_inode(struct inode *inode) | |||
325 | if (!bh) { | 325 | if (!bh) { |
326 | befs_error(sb, "unable to read inode block - " | 326 | befs_error(sb, "unable to read inode block - " |
327 | "inode = %lu", inode->i_ino); | 327 | "inode = %lu", inode->i_ino); |
328 | goto unaquire_none; | 328 | goto unacquire_none; |
329 | } | 329 | } |
330 | 330 | ||
331 | raw_inode = (befs_inode *) bh->b_data; | 331 | raw_inode = (befs_inode *) bh->b_data; |
@@ -334,7 +334,7 @@ befs_read_inode(struct inode *inode) | |||
334 | 334 | ||
335 | if (befs_check_inode(sb, raw_inode, inode->i_ino) != BEFS_OK) { | 335 | if (befs_check_inode(sb, raw_inode, inode->i_ino) != BEFS_OK) { |
336 | befs_error(sb, "Bad inode: %lu", inode->i_ino); | 336 | befs_error(sb, "Bad inode: %lu", inode->i_ino); |
337 | goto unaquire_bh; | 337 | goto unacquire_bh; |
338 | } | 338 | } |
339 | 339 | ||
340 | inode->i_mode = (umode_t) fs32_to_cpu(sb, raw_inode->mode); | 340 | inode->i_mode = (umode_t) fs32_to_cpu(sb, raw_inode->mode); |
@@ -402,17 +402,17 @@ befs_read_inode(struct inode *inode) | |||
402 | befs_error(sb, "Inode %lu is not a regular file, " | 402 | befs_error(sb, "Inode %lu is not a regular file, " |
403 | "directory or symlink. THAT IS WRONG! BeFS has no " | 403 | "directory or symlink. THAT IS WRONG! BeFS has no " |
404 | "on disk special files", inode->i_ino); | 404 | "on disk special files", inode->i_ino); |
405 | goto unaquire_bh; | 405 | goto unacquire_bh; |
406 | } | 406 | } |
407 | 407 | ||
408 | brelse(bh); | 408 | brelse(bh); |
409 | befs_debug(sb, "<--- befs_read_inode()"); | 409 | befs_debug(sb, "<--- befs_read_inode()"); |
410 | return; | 410 | return; |
411 | 411 | ||
412 | unaquire_bh: | 412 | unacquire_bh: |
413 | brelse(bh); | 413 | brelse(bh); |
414 | 414 | ||
415 | unaquire_none: | 415 | unacquire_none: |
416 | make_bad_inode(inode); | 416 | make_bad_inode(inode); |
417 | befs_debug(sb, "<--- befs_read_inode() - Bad inode"); | 417 | befs_debug(sb, "<--- befs_read_inode() - Bad inode"); |
418 | return; | 418 | return; |
@@ -761,14 +761,14 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
761 | printk(KERN_ERR | 761 | printk(KERN_ERR |
762 | "BeFS(%s): Unable to allocate memory for private " | 762 | "BeFS(%s): Unable to allocate memory for private " |
763 | "portion of superblock. Bailing.\n", sb->s_id); | 763 | "portion of superblock. Bailing.\n", sb->s_id); |
764 | goto unaquire_none; | 764 | goto unacquire_none; |
765 | } | 765 | } |
766 | befs_sb = BEFS_SB(sb); | 766 | befs_sb = BEFS_SB(sb); |
767 | memset(befs_sb, 0, sizeof(befs_sb_info)); | 767 | memset(befs_sb, 0, sizeof(befs_sb_info)); |
768 | 768 | ||
769 | if (!parse_options((char *) data, &befs_sb->mount_opts)) { | 769 | if (!parse_options((char *) data, &befs_sb->mount_opts)) { |
770 | befs_error(sb, "cannot parse mount options"); | 770 | befs_error(sb, "cannot parse mount options"); |
771 | goto unaquire_priv_sbp; | 771 | goto unacquire_priv_sbp; |
772 | } | 772 | } |
773 | 773 | ||
774 | befs_debug(sb, "---> befs_fill_super()"); | 774 | befs_debug(sb, "---> befs_fill_super()"); |
@@ -794,7 +794,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
794 | 794 | ||
795 | if (!(bh = sb_bread(sb, sb_block))) { | 795 | if (!(bh = sb_bread(sb, sb_block))) { |
796 | befs_error(sb, "unable to read superblock"); | 796 | befs_error(sb, "unable to read superblock"); |
797 | goto unaquire_priv_sbp; | 797 | goto unacquire_priv_sbp; |
798 | } | 798 | } |
799 | 799 | ||
800 | /* account for offset of super block on x86 */ | 800 | /* account for offset of super block on x86 */ |
@@ -809,20 +809,20 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
809 | } | 809 | } |
810 | 810 | ||
811 | if (befs_load_sb(sb, disk_sb) != BEFS_OK) | 811 | if (befs_load_sb(sb, disk_sb) != BEFS_OK) |
812 | goto unaquire_bh; | 812 | goto unacquire_bh; |
813 | 813 | ||
814 | befs_dump_super_block(sb, disk_sb); | 814 | befs_dump_super_block(sb, disk_sb); |
815 | 815 | ||
816 | brelse(bh); | 816 | brelse(bh); |
817 | 817 | ||
818 | if (befs_check_sb(sb) != BEFS_OK) | 818 | if (befs_check_sb(sb) != BEFS_OK) |
819 | goto unaquire_priv_sbp; | 819 | goto unacquire_priv_sbp; |
820 | 820 | ||
821 | if( befs_sb->num_blocks > ~((sector_t)0) ) { | 821 | if( befs_sb->num_blocks > ~((sector_t)0) ) { |
822 | befs_error(sb, "blocks count: %Lu " | 822 | befs_error(sb, "blocks count: %Lu " |
823 | "is larger than the host can use", | 823 | "is larger than the host can use", |
824 | befs_sb->num_blocks); | 824 | befs_sb->num_blocks); |
825 | goto unaquire_priv_sbp; | 825 | goto unacquire_priv_sbp; |
826 | } | 826 | } |
827 | 827 | ||
828 | /* | 828 | /* |
@@ -838,7 +838,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
838 | if (!sb->s_root) { | 838 | if (!sb->s_root) { |
839 | iput(root); | 839 | iput(root); |
840 | befs_error(sb, "get root inode failed"); | 840 | befs_error(sb, "get root inode failed"); |
841 | goto unaquire_priv_sbp; | 841 | goto unacquire_priv_sbp; |
842 | } | 842 | } |
843 | 843 | ||
844 | /* load nls library */ | 844 | /* load nls library */ |
@@ -860,13 +860,13 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
860 | 860 | ||
861 | return 0; | 861 | return 0; |
862 | /*****************/ | 862 | /*****************/ |
863 | unaquire_bh: | 863 | unacquire_bh: |
864 | brelse(bh); | 864 | brelse(bh); |
865 | 865 | ||
866 | unaquire_priv_sbp: | 866 | unacquire_priv_sbp: |
867 | kfree(sb->s_fs_info); | 867 | kfree(sb->s_fs_info); |
868 | 868 | ||
869 | unaquire_none: | 869 | unacquire_none: |
870 | sb->s_fs_info = NULL; | 870 | sb->s_fs_info = NULL; |
871 | return -EINVAL; | 871 | return -EINVAL; |
872 | } | 872 | } |
@@ -925,18 +925,18 @@ init_befs_fs(void) | |||
925 | 925 | ||
926 | err = befs_init_inodecache(); | 926 | err = befs_init_inodecache(); |
927 | if (err) | 927 | if (err) |
928 | goto unaquire_none; | 928 | goto unacquire_none; |
929 | 929 | ||
930 | err = register_filesystem(&befs_fs_type); | 930 | err = register_filesystem(&befs_fs_type); |
931 | if (err) | 931 | if (err) |
932 | goto unaquire_inodecache; | 932 | goto unacquire_inodecache; |
933 | 933 | ||
934 | return 0; | 934 | return 0; |
935 | 935 | ||
936 | unaquire_inodecache: | 936 | unacquire_inodecache: |
937 | befs_destroy_inodecache(); | 937 | befs_destroy_inodecache(); |
938 | 938 | ||
939 | unaquire_none: | 939 | unacquire_none: |
940 | return err; | 940 | return err; |
941 | } | 941 | } |
942 | 942 | ||
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 5861eb42e626..944d2b9e092d 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
@@ -324,7 +324,7 @@ out: | |||
324 | return rc; | 324 | return rc; |
325 | } | 325 | } |
326 | 326 | ||
327 | /* Try to reaquire byte range locks that were released when session */ | 327 | /* Try to reacquire byte range locks that were released when session */ |
328 | /* to server was lost */ | 328 | /* to server was lost */ |
329 | static int cifs_relock_file(struct cifsFileInfo *cifsFile) | 329 | static int cifs_relock_file(struct cifsFileInfo *cifsFile) |
330 | { | 330 | { |
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c index ac3d66948e8c..10c46231ce15 100644 --- a/fs/jfs/jfs_txnmgr.c +++ b/fs/jfs/jfs_txnmgr.c | |||
@@ -842,7 +842,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp, | |||
842 | TXN_UNLOCK(); | 842 | TXN_UNLOCK(); |
843 | release_metapage(mp); | 843 | release_metapage(mp); |
844 | TXN_LOCK(); | 844 | TXN_LOCK(); |
845 | xtid = tlck->tid; /* reaquire after dropping TXN_LOCK */ | 845 | xtid = tlck->tid; /* reacquire after dropping TXN_LOCK */ |
846 | 846 | ||
847 | jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d", | 847 | jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d", |
848 | tid, xtid, lid); | 848 | tid, xtid, lid); |
diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c index baf4244a54f2..15ce7119c5f4 100644 --- a/sound/oss/dmabuf.c +++ b/sound/oss/dmabuf.c | |||
@@ -547,7 +547,7 @@ int DMAbuf_activate_recording(int dev, struct dma_buffparms *dmap) | |||
547 | } | 547 | } |
548 | return 0; | 548 | return 0; |
549 | } | 549 | } |
550 | /* aquires lock */ | 550 | /* acquires lock */ |
551 | int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock) | 551 | int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock) |
552 | { | 552 | { |
553 | struct audio_operations *adev = audio_devs[dev]; | 553 | struct audio_operations *adev = audio_devs[dev]; |
@@ -821,7 +821,7 @@ static int find_output_space(int dev, char **buf, int *size) | |||
821 | *size = len & ~SAMPLE_ROUNDUP; | 821 | *size = len & ~SAMPLE_ROUNDUP; |
822 | return (*size > 0); | 822 | return (*size > 0); |
823 | } | 823 | } |
824 | /* aquires lock */ | 824 | /* acquires lock */ |
825 | int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock) | 825 | int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock) |
826 | { | 826 | { |
827 | struct audio_operations *adev = audio_devs[dev]; | 827 | struct audio_operations *adev = audio_devs[dev]; |
@@ -855,7 +855,7 @@ int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock) | |||
855 | spin_unlock_irqrestore(&dmap->lock,flags); | 855 | spin_unlock_irqrestore(&dmap->lock,flags); |
856 | return 0; | 856 | return 0; |
857 | } | 857 | } |
858 | /* has to aquire dmap->lock */ | 858 | /* has to acquire dmap->lock */ |
859 | int DMAbuf_move_wrpointer(int dev, int l) | 859 | int DMAbuf_move_wrpointer(int dev, int l) |
860 | { | 860 | { |
861 | struct audio_operations *adev = audio_devs[dev]; | 861 | struct audio_operations *adev = audio_devs[dev]; |