redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: speakup: i18n: remove custom locking macros 

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
William Hubbs 2013-05-13 00:02:55 -05:00 committed by Greg Kroah-Hartman
parent 2da11ba637
commit 550e579a37
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/speakup/i18n.c
View File

@ -558,11 +558,11 @@ ssize_t spk_msg_set(enum msg_index_t index, char *text, size_t length)
kfree(newstr); kfree(newstr);
return -EINVAL; return -EINVAL;
} }
spk_lock(flags); spin_lock_irqsave(&speakup_info.spinlock, flags);
if (speakup_msgs[index] != speakup_default_msgs[index]) if (speakup_msgs[index] != speakup_default_msgs[index])
kfree(speakup_msgs[index]); kfree(speakup_msgs[index]);
speakup_msgs[index] = newstr; speakup_msgs[index] = newstr;
spk_unlock(flags); spin_unlock_irqrestore(&speakup_info.spinlock, flags);
} else { } else {
rc = -ENOMEM; rc = -ENOMEM;
} }
@ -595,14 +595,14 @@ void spk_reset_msg_group(struct msg_group_t *group)
unsigned long flags; unsigned long flags;
enum msg_index_t i; enum msg_index_t i;
spk_lock(flags); spin_lock_irqsave(&speakup_info.spinlock, flags);
for (i = group->start; i <= group->end; i++) { for (i = group->start; i <= group->end; i++) {
if (speakup_msgs[i] != speakup_default_msgs[i]) if (speakup_msgs[i] != speakup_default_msgs[i])
kfree(speakup_msgs[i]); kfree(speakup_msgs[i]);
speakup_msgs[i] = speakup_default_msgs[i]; speakup_msgs[i] = speakup_default_msgs[i];
} }
spk_unlock(flags); spin_unlock_irqrestore(&speakup_info.spinlock, flags);
} }
/* Called at initialization time, to establish default messages. */ /* Called at initialization time, to establish default messages. */
@ -618,12 +618,12 @@ void spk_free_user_msgs(void)
enum msg_index_t index; enum msg_index_t index;
unsigned long flags; unsigned long flags;
spk_lock(flags); spin_lock_irqsave(&speakup_info.spinlock, flags);
for (index = MSG_FIRST_INDEX; index < MSG_LAST_INDEX; index++) { for (index = MSG_FIRST_INDEX; index < MSG_LAST_INDEX; index++) {
if (speakup_msgs[index] != speakup_default_msgs[index]) { if (speakup_msgs[index] != speakup_default_msgs[index]) {
kfree(speakup_msgs[index]); kfree(speakup_msgs[index]);
speakup_msgs[index] = speakup_default_msgs[index]; speakup_msgs[index] = speakup_default_msgs[index];
} }
} }
spk_unlock(flags); spin_unlock_irqrestore(&speakup_info.spinlock, flags);
} }