From: pwaechtler@mac.com
To: linux-kernel@vger.kernel.org
Cc: torvalds@transmeta.com
Subject: [PATCH] 6/41 sound/oss/pss.c - convert cli to spinlocks
Date: Thu, 29 Aug 2002 21:56:27 +0200 [thread overview]
Message-ID: <200208292154.g7TLs5ZH003520@smtp-relay02.mac.com> (raw)
--- vanilla-2.5.32/sound/oss/pss.c Fri Aug 9 23:57:46 2002
+++ linux-2.5-cli-oss/sound/oss/pss.c Wed Aug 14 23:22:40 2002
@@ -60,6 +60,7 @@
#include <linux/config.h>
#include <linux/init.h>
#include <linux/module.h>
+#include <linux/spinlock.h>
#include "sound_config.h"
#include "sound_firmware.h"
@@ -142,6 +143,7 @@
static pss_confdata pss_data;
static pss_confdata *devc = &pss_data;
+static spinlock_t lock=SPIN_LOCK_UNLOCKED;
static int pss_initialized = 0;
static int nonstandard_microcode = 0;
@@ -838,18 +840,17 @@
return -EFAULT;
}
data = (unsigned short *)(mbuf->data);
- save_flags(flags);
- cli();
+ spin_lock_irqsave(&lock, flags);
for (i = 0; i < mbuf->len; i++) {
if (!pss_put_dspword(devc, *data++)) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
mbuf->len = i; /* feed back number of WORDs sent */
err = copy_to_user(arg, mbuf, sizeof(copr_msg));
vfree(mbuf);
return err ? -EFAULT : -EIO;
}
}
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
vfree(mbuf);
return 0;
@@ -859,8 +860,7 @@
if (mbuf == NULL)
return -ENOSPC;
data = (unsigned short *)mbuf->data;
- save_flags(flags);
- cli();
+ spin_lock_irqsave(&lock, flags);
for (i = 0; i < sizeof(mbuf->data)/sizeof(unsigned short); i++) {
mbuf->len = i; /* feed back number of WORDs read */
if (!pss_get_dspword(devc, data++)) {
@@ -869,7 +869,7 @@
break;
}
}
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
if (copy_to_user(arg, mbuf, sizeof(copr_msg)))
err = -EFAULT;
vfree(mbuf);
@@ -878,22 +878,21 @@
case SNDCTL_COPR_RDATA:
if (copy_from_user(&dbuf, arg, sizeof(dbuf)))
return -EFAULT;
- save_flags(flags);
- cli();
+ spin_lock_irqsave(&lock, flags);
if (!pss_put_dspword(devc, 0x00d0)) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
if (!pss_put_dspword(devc, (unsigned short)(dbuf.parm1 & 0xffff))) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
if (!pss_get_dspword(devc, &tmp)) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
dbuf.parm1 = tmp;
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
if (copy_to_user(arg, &dbuf, sizeof(dbuf)))
return -EFAULT;
return 0;
@@ -901,74 +900,71 @@
case SNDCTL_COPR_WDATA:
if (copy_from_user(&dbuf, arg, sizeof(dbuf)))
return -EFAULT;
- save_flags(flags);
- cli();
+ spin_lock_irqsave(&lock, flags);
if (!pss_put_dspword(devc, 0x00d1)) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
if (!pss_put_dspword(devc, (unsigned short) (dbuf.parm1 & 0xffff))) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
tmp = (unsigned int)dbuf.parm2 & 0xffff;
if (!pss_put_dspword(devc, tmp)) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return 0;
case SNDCTL_COPR_WCODE:
if (copy_from_user(&dbuf, arg, sizeof(dbuf)))
return -EFAULT;
- save_flags(flags);
- cli();
+ spin_lock_irqsave(&lock, flags);
if (!pss_put_dspword(devc, 0x00d3)) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
if (!pss_put_dspword(devc, (unsigned short)(dbuf.parm1 & 0xffff))) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
tmp = (unsigned int)dbuf.parm2 & 0x00ff;
if (!pss_put_dspword(devc, tmp)) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
tmp = ((unsigned int)dbuf.parm2 >> 8) & 0xffff;
if (!pss_put_dspword(devc, tmp)) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return 0;
case SNDCTL_COPR_RCODE:
if (copy_from_user(&dbuf, arg, sizeof(dbuf)))
return -EFAULT;
- save_flags(flags);
- cli();
+ spin_lock_irqsave(&lock, flags);
if (!pss_put_dspword(devc, 0x00d2)) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
if (!pss_put_dspword(devc, (unsigned short)(dbuf.parm1 & 0xffff))) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
if (!pss_get_dspword(devc, &tmp)) { /* Read MSB */
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
dbuf.parm1 = tmp << 8;
if (!pss_get_dspword(devc, &tmp)) { /* Read LSB */
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
return -EIO;
}
dbuf.parm1 |= tmp & 0x00ff;
- restore_flags(flags);
+ spin_unlock_irqrestore(&lock,flags);
if (copy_to_user(arg, &dbuf, sizeof(dbuf)))
return -EFAULT;
return 0;
next reply other threads:[~2002-08-29 21:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-08-29 19:56 pwaechtler [this message]
2002-08-30 7:47 ` Tomas Szepe
2002-08-30 10:56 ` Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200208292154.g7TLs5ZH003520@smtp-relay02.mac.com \
--to=pwaechtler@mac.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®