projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ALSA] hda-codec - Fix ALC262 HP-RP5700 model
[powerpc.git]
/
sound
/
mips
/
au1x00.c
diff --git
a/sound/mips/au1x00.c
b/sound/mips/au1x00.c
index
c31b386
..
ee0741f
100644
(file)
--- a/
sound/mips/au1x00.c
+++ b/
sound/mips/au1x00.c
@@
-36,7
+36,6
@@
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/interrupt.h>
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/version.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/version.h>
@@
-220,7
+219,7
@@
au1000_dma_start(struct audio_stream *stream)
}
static irqreturn_t
}
static irqreturn_t
-au1000_dma_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+au1000_dma_interrupt(int irq, void *dev_id)
{
struct audio_stream *stream = (struct audio_stream *) dev_id;
struct snd_pcm_substream *substream = stream->substream;
{
struct audio_stream *stream = (struct audio_stream *) dev_id;
struct snd_pcm_substream *substream = stream->substream;
@@
-258,7
+257,7
@@
au1000_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static unsigned int rates[] = {8000, 11025, 16000, 22050};
static struct snd_pcm_hw_constraint_list hw_constraints_rates = {
static unsigned int rates[] = {8000, 11025, 16000, 22050};
static struct snd_pcm_hw_constraint_list hw_constraints_rates = {
- .count =
sizeof(rates) / sizeof(rates[0]
),
+ .count =
ARRAY_SIZE(rates
),
.list = rates,
.mask = 0,
};
.list = rates,
.mask = 0,
};
@@
-498,8
+497,8
@@
snd_au1000_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
int i;
spin_lock(&au1000->ac97_lock);
int i;
spin_lock(&au1000->ac97_lock);
-/* would rather use the interupt than this polling but it works and I can't
-get the interupt driven case to work efficiently */
+/* would rather use the inter
r
upt than this polling but it works and I can't
+get the inter
r
upt driven case to work efficiently */
for (i = 0; i < 0x5000; i++)
if (!(au1000->ac97_ioport->status & AC97C_CP))
break;
for (i = 0; i < 0x5000; i++)
if (!(au1000->ac97_ioport->status & AC97C_CP))
break;
@@
-535,8
+534,8
@@
snd_au1000_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short
int i;
spin_lock(&au1000->ac97_lock);
int i;
spin_lock(&au1000->ac97_lock);
-/* would rather use the interupt than this polling but it works and I can't
-get the interupt driven case to work efficiently */
+/* would rather use the inter
r
upt than this polling but it works and I can't
+get the inter
r
upt driven case to work efficiently */
for (i = 0; i < 0x5000; i++)
if (!(au1000->ac97_ioport->status & AC97C_CP))
break;
for (i = 0; i < 0x5000; i++)
if (!(au1000->ac97_ioport->status & AC97C_CP))
break;