Commit 0418726b authored by Adrian Bunk's avatar Adrian Bunk

typo fixes: aquire -> acquire

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent b3c2ffd5
...@@ -2,7 +2,7 @@ NOTE: This driver is obsolete. Digi provides a 2.6 driver (dgdm) at ...@@ -2,7 +2,7 @@ NOTE: This driver is obsolete. Digi provides a 2.6 driver (dgdm) at
http://www.digi.com for PCI cards. They no longer maintain this driver, http://www.digi.com for PCI cards. They no longer maintain this driver,
and have no 2.6 driver for ISA cards. and have no 2.6 driver for ISA cards.
This driver requires a number of user-space tools. They can be aquired from This driver requires a number of user-space tools. They can be acquired from
http://www.digi.com, but only works with 2.4 kernels. http://www.digi.com, but only works with 2.4 kernels.
......
...@@ -3048,7 +3048,7 @@ struct _snd_pcm_runtime { ...@@ -3048,7 +3048,7 @@ struct _snd_pcm_runtime {
</para> </para>
<para> <para>
If you aquire a spinlock in the interrupt handler, and the If you acquire a spinlock in the interrupt handler, and the
lock is used in other pcm callbacks, too, then you have to lock is used in other pcm callbacks, too, then you have to
release the lock before calling release the lock before calling
<function>snd_pcm_period_elapsed()</function>, because <function>snd_pcm_period_elapsed()</function>, because
......
...@@ -245,7 +245,7 @@ static int lock_card(struct isi_board *card) ...@@ -245,7 +245,7 @@ static int lock_card(struct isi_board *card)
printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n", printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n",
card->base); card->base);
return 0; /* Failed to aquire the card! */ return 0; /* Failed to acquire the card! */
} }
static int lock_card_at_interrupt(struct isi_board *card) 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,7 +262,7 @@ static int lock_card_at_interrupt(struct isi_board *card)
spin_unlock_irqrestore(&card->card_lock, card->flags); spin_unlock_irqrestore(&card->card_lock, card->flags);
} }
/* Failing in interrupt is an acceptable event */ /* Failing in interrupt is an acceptable event */
return 0; /* Failed to aquire the card! */ return 0; /* Failed to acquire the card! */
} }
static void unlock_card(struct isi_board *card) static void unlock_card(struct isi_board *card)
......
...@@ -360,7 +360,7 @@ struct bttv { ...@@ -360,7 +360,7 @@ struct bttv {
int mbox_csel; int mbox_csel;
/* risc memory management data /* risc memory management data
- must aquire s_lock before changing these - must acquire s_lock before changing these
- only the irq handler is supported to touch top + bottom + vcurr */ - only the irq handler is supported to touch top + bottom + vcurr */
struct btcx_riscmem main; struct btcx_riscmem main;
struct bttv_buffer *screen; /* overlay */ struct bttv_buffer *screen; /* overlay */
......
...@@ -2134,7 +2134,7 @@ typedef struct scsi_qla_host { ...@@ -2134,7 +2134,7 @@ typedef struct scsi_qla_host {
mempool_t *srb_mempool; mempool_t *srb_mempool;
/* This spinlock is used to protect "io transactions", you must /* This spinlock is used to protect "io transactions", you must
* aquire it before doing any IO to the card, eg with RD_REG*() and * acquire it before doing any IO to the card, eg with RD_REG*() and
* WRT_REG*() for the duration of your entire commandtransaction. * WRT_REG*() for the duration of your entire commandtransaction.
* *
* This spinlock is of lower priority than the io request lock. * This spinlock is of lower priority than the io request lock.
......
...@@ -325,7 +325,7 @@ befs_read_inode(struct inode *inode) ...@@ -325,7 +325,7 @@ befs_read_inode(struct inode *inode)
if (!bh) { if (!bh) {
befs_error(sb, "unable to read inode block - " befs_error(sb, "unable to read inode block - "
"inode = %lu", inode->i_ino); "inode = %lu", inode->i_ino);
goto unaquire_none; goto unacquire_none;
} }
raw_inode = (befs_inode *) bh->b_data; raw_inode = (befs_inode *) bh->b_data;
...@@ -334,7 +334,7 @@ befs_read_inode(struct inode *inode) ...@@ -334,7 +334,7 @@ befs_read_inode(struct inode *inode)
if (befs_check_inode(sb, raw_inode, inode->i_ino) != BEFS_OK) { if (befs_check_inode(sb, raw_inode, inode->i_ino) != BEFS_OK) {
befs_error(sb, "Bad inode: %lu", inode->i_ino); befs_error(sb, "Bad inode: %lu", inode->i_ino);
goto unaquire_bh; goto unacquire_bh;
} }
inode->i_mode = (umode_t) fs32_to_cpu(sb, raw_inode->mode); inode->i_mode = (umode_t) fs32_to_cpu(sb, raw_inode->mode);
...@@ -402,17 +402,17 @@ befs_read_inode(struct inode *inode) ...@@ -402,17 +402,17 @@ befs_read_inode(struct inode *inode)
befs_error(sb, "Inode %lu is not a regular file, " befs_error(sb, "Inode %lu is not a regular file, "
"directory or symlink. THAT IS WRONG! BeFS has no " "directory or symlink. THAT IS WRONG! BeFS has no "
"on disk special files", inode->i_ino); "on disk special files", inode->i_ino);
goto unaquire_bh; goto unacquire_bh;
} }
brelse(bh); brelse(bh);
befs_debug(sb, "<--- befs_read_inode()"); befs_debug(sb, "<--- befs_read_inode()");
return; return;
unaquire_bh: unacquire_bh:
brelse(bh); brelse(bh);
unaquire_none: unacquire_none:
make_bad_inode(inode); make_bad_inode(inode);
befs_debug(sb, "<--- befs_read_inode() - Bad inode"); befs_debug(sb, "<--- befs_read_inode() - Bad inode");
return; return;
...@@ -761,14 +761,14 @@ befs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -761,14 +761,14 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
printk(KERN_ERR printk(KERN_ERR
"BeFS(%s): Unable to allocate memory for private " "BeFS(%s): Unable to allocate memory for private "
"portion of superblock. Bailing.\n", sb->s_id); "portion of superblock. Bailing.\n", sb->s_id);
goto unaquire_none; goto unacquire_none;
} }
befs_sb = BEFS_SB(sb); befs_sb = BEFS_SB(sb);
memset(befs_sb, 0, sizeof(befs_sb_info)); memset(befs_sb, 0, sizeof(befs_sb_info));
if (!parse_options((char *) data, &befs_sb->mount_opts)) { if (!parse_options((char *) data, &befs_sb->mount_opts)) {
befs_error(sb, "cannot parse mount options"); befs_error(sb, "cannot parse mount options");
goto unaquire_priv_sbp; goto unacquire_priv_sbp;
} }
befs_debug(sb, "---> befs_fill_super()"); befs_debug(sb, "---> befs_fill_super()");
...@@ -794,7 +794,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -794,7 +794,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
if (!(bh = sb_bread(sb, sb_block))) { if (!(bh = sb_bread(sb, sb_block))) {
befs_error(sb, "unable to read superblock"); befs_error(sb, "unable to read superblock");
goto unaquire_priv_sbp; goto unacquire_priv_sbp;
} }
/* account for offset of super block on x86 */ /* account for offset of super block on x86 */
...@@ -809,20 +809,20 @@ befs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -809,20 +809,20 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
} }
if (befs_load_sb(sb, disk_sb) != BEFS_OK) if (befs_load_sb(sb, disk_sb) != BEFS_OK)
goto unaquire_bh; goto unacquire_bh;
befs_dump_super_block(sb, disk_sb); befs_dump_super_block(sb, disk_sb);
brelse(bh); brelse(bh);
if (befs_check_sb(sb) != BEFS_OK) if (befs_check_sb(sb) != BEFS_OK)
goto unaquire_priv_sbp; goto unacquire_priv_sbp;
if( befs_sb->num_blocks > ~((sector_t)0) ) { if( befs_sb->num_blocks > ~((sector_t)0) ) {
befs_error(sb, "blocks count: %Lu " befs_error(sb, "blocks count: %Lu "
"is larger than the host can use", "is larger than the host can use",
befs_sb->num_blocks); befs_sb->num_blocks);
goto unaquire_priv_sbp; goto unacquire_priv_sbp;
} }
/* /*
...@@ -838,7 +838,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -838,7 +838,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
if (!sb->s_root) { if (!sb->s_root) {
iput(root); iput(root);
befs_error(sb, "get root inode failed"); befs_error(sb, "get root inode failed");
goto unaquire_priv_sbp; goto unacquire_priv_sbp;
} }
/* load nls library */ /* load nls library */
...@@ -860,13 +860,13 @@ befs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -860,13 +860,13 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
return 0; return 0;
/*****************/ /*****************/
unaquire_bh: unacquire_bh:
brelse(bh); brelse(bh);
unaquire_priv_sbp: unacquire_priv_sbp:
kfree(sb->s_fs_info); kfree(sb->s_fs_info);
unaquire_none: unacquire_none:
sb->s_fs_info = NULL; sb->s_fs_info = NULL;
return -EINVAL; return -EINVAL;
} }
...@@ -925,18 +925,18 @@ init_befs_fs(void) ...@@ -925,18 +925,18 @@ init_befs_fs(void)
err = befs_init_inodecache(); err = befs_init_inodecache();
if (err) if (err)
goto unaquire_none; goto unacquire_none;
err = register_filesystem(&befs_fs_type); err = register_filesystem(&befs_fs_type);
if (err) if (err)
goto unaquire_inodecache; goto unacquire_inodecache;
return 0; return 0;
unaquire_inodecache: unacquire_inodecache:
befs_destroy_inodecache(); befs_destroy_inodecache();
unaquire_none: unacquire_none:
return err; return err;
} }
......
...@@ -324,7 +324,7 @@ int cifs_open(struct inode *inode, struct file *file) ...@@ -324,7 +324,7 @@ int cifs_open(struct inode *inode, struct file *file)
return rc; return rc;
} }
/* Try to reaquire byte range locks that were released when session */ /* Try to reacquire byte range locks that were released when session */
/* to server was lost */ /* to server was lost */
static int cifs_relock_file(struct cifsFileInfo *cifsFile) static int cifs_relock_file(struct cifsFileInfo *cifsFile)
{ {
......
...@@ -842,7 +842,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp, ...@@ -842,7 +842,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp,
TXN_UNLOCK(); TXN_UNLOCK();
release_metapage(mp); release_metapage(mp);
TXN_LOCK(); TXN_LOCK();
xtid = tlck->tid; /* reaquire after dropping TXN_LOCK */ xtid = tlck->tid; /* reacquire after dropping TXN_LOCK */
jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d", jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d",
tid, xtid, lid); tid, xtid, lid);
......
...@@ -547,7 +547,7 @@ int DMAbuf_activate_recording(int dev, struct dma_buffparms *dmap) ...@@ -547,7 +547,7 @@ int DMAbuf_activate_recording(int dev, struct dma_buffparms *dmap)
} }
return 0; return 0;
} }
/* aquires lock */ /* acquires lock */
int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock) int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock)
{ {
struct audio_operations *adev = audio_devs[dev]; struct audio_operations *adev = audio_devs[dev];
...@@ -821,7 +821,7 @@ static int find_output_space(int dev, char **buf, int *size) ...@@ -821,7 +821,7 @@ static int find_output_space(int dev, char **buf, int *size)
*size = len & ~SAMPLE_ROUNDUP; *size = len & ~SAMPLE_ROUNDUP;
return (*size > 0); return (*size > 0);
} }
/* aquires lock */ /* acquires lock */
int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock) int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock)
{ {
struct audio_operations *adev = audio_devs[dev]; struct audio_operations *adev = audio_devs[dev];
...@@ -855,7 +855,7 @@ int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock) ...@@ -855,7 +855,7 @@ int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock)
spin_unlock_irqrestore(&dmap->lock,flags); spin_unlock_irqrestore(&dmap->lock,flags);
return 0; return 0;
} }
/* has to aquire dmap->lock */ /* has to acquire dmap->lock */
int DMAbuf_move_wrpointer(int dev, int l) int DMAbuf_move_wrpointer(int dev, int l)
{ {
struct audio_operations *adev = audio_devs[dev]; struct audio_operations *adev = audio_devs[dev];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment