projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[powerpc.git]
/
sound
/
oss
/
nec_vrc5477.c
diff --git
a/sound/oss/nec_vrc5477.c
b/sound/oss/nec_vrc5477.c
index
6f7f2f0
..
27b4ba3
100644
(file)
--- a/
sound/oss/nec_vrc5477.c
+++ b/
sound/oss/nec_vrc5477.c
@@
-848,7
+848,7
@@
static inline void vrc5477_ac97_dac_interrupt(struct vrc5477_ac97_state *s)
wake_up_interruptible(&dac->wait);
}
wake_up_interruptible(&dac->wait);
}
-static irqreturn_t vrc5477_ac97_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t vrc5477_ac97_interrupt(int irq, void *dev_id)
{
struct vrc5477_ac97_state *s = (struct vrc5477_ac97_state *)dev_id;
u32 irqStatus;
{
struct vrc5477_ac97_state *s = (struct vrc5477_ac97_state *)dev_id;
u32 irqStatus;
@@
-1381,11
+1381,11
@@
static int vrc5477_ac97_ioctl(struct inode *inode, struct file *file,
int val, ret;
#ifdef VRC5477_AC97_DEBUG
int val, ret;
#ifdef VRC5477_AC97_DEBUG
- for (count
=0; count<sizeof(ioctl_str)/sizeof(ioctl_str[0]
); count++) {
+ for (count
= 0; count < ARRAY_SIZE(ioctl_str
); count++) {
if (ioctl_str[count].cmd == cmd)
break;
}
if (ioctl_str[count].cmd == cmd)
break;
}
- if (count <
sizeof(ioctl_str)/sizeof(ioctl_str[0]
))
+ if (count <
ARRAY_SIZE(ioctl_str
))
printk(KERN_INFO PFX "ioctl %s\n", ioctl_str[count].str);
else
printk(KERN_INFO PFX "ioctl unknown, 0x%x\n", cmd);
printk(KERN_INFO PFX "ioctl %s\n", ioctl_str[count].str);
else
printk(KERN_INFO PFX "ioctl unknown, 0x%x\n", cmd);
@@
-1860,11
+1860,10
@@
static int __devinit vrc5477_ac97_probe(struct pci_dev *pcidev,
if (pcidev->irq == 0)
return -1;
if (pcidev->irq == 0)
return -1;
- if (!(s = k
m
alloc(sizeof(struct vrc5477_ac97_state), GFP_KERNEL))) {
+ if (!(s = k
z
alloc(sizeof(struct vrc5477_ac97_state), GFP_KERNEL))) {
printk(KERN_ERR PFX "alloc of device struct failed\n");
return -1;
}
printk(KERN_ERR PFX "alloc of device struct failed\n");
return -1;
}
- memset(s, 0, sizeof(struct vrc5477_ac97_state));
init_waitqueue_head(&s->dma_adc.wait);
init_waitqueue_head(&s->dma_dac.wait);
init_waitqueue_head(&s->dma_adc.wait);
init_waitqueue_head(&s->dma_dac.wait);