projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PKTGEN]: fix device name handling
[powerpc.git]
/
sound
/
oss
/
ad1889.c
diff --git
a/sound/oss/ad1889.c
b/sound/oss/ad1889.c
index
a4ca756
..
c0730a3
100644
(file)
--- a/
sound/oss/ad1889.c
+++ b/
sound/oss/ad1889.c
@@
-26,7
+26,6
@@
*
* $Id: ad1889.c,v 1.3 2002/10/19 21:31:44 grundler Exp $
*/
*
* $Id: ad1889.c,v 1.3 2002/10/19 21:31:44 grundler Exp $
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/ioport.h>
@@
-231,9
+230,8
@@
static ad1889_dev_t *ad1889_alloc_dev(struct pci_dev *pci)
struct dmabuf *dmabuf;
int i;
struct dmabuf *dmabuf;
int i;
- if ((dev = k
malloc(sizeof(ad1889_dev_t), GFP_KERNEL)) == NULL)
+ if ((dev = k
zalloc(sizeof(ad1889_dev_t), GFP_KERNEL)) == NULL)
return NULL;
return NULL;
- memset(dev, 0, sizeof(ad1889_dev_t));
spin_lock_init(&dev->lock);
dev->pci = pci;
spin_lock_init(&dev->lock);
dev->pci = pci;
@@
-779,7
+777,7
@@
static int ad1889_release(struct inode *inode, struct file *file)
return 0;
}
return 0;
}
-static struct file_operations ad1889_fops = {
+static
const
struct file_operations ad1889_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = ad1889_read,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = ad1889_read,
@@
-813,7
+811,7
@@
static int ad1889_mixer_ioctl(struct inode *inode, struct file *file,
return codec->mixer_ioctl(codec, cmd, arg);
}
return codec->mixer_ioctl(codec, cmd, arg);
}
-static struct file_operations ad1889_mixer_fops = {
+static
const
struct file_operations ad1889_mixer_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.ioctl = ad1889_mixer_ioctl,
.owner = THIS_MODULE,
.llseek = no_llseek,
.ioctl = ad1889_mixer_ioctl,
@@
-930,7
+928,7
@@
static struct pci_device_id ad1889_id_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, ad1889_id_tbl);
};
MODULE_DEVICE_TABLE(pci, ad1889_id_tbl);
-static irqreturn_t ad1889_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t ad1889_interrupt(int irq, void *dev_id)
{
u32 stat;
ad1889_dev_t *dev = (ad1889_dev_t *)dev_id;
{
u32 stat;
ad1889_dev_t *dev = (ad1889_dev_t *)dev_id;
@@
-1011,7
+1009,7
@@
static int __devinit ad1889_probe(struct pci_dev *pcidev, const struct pci_devic
goto out2;
}
goto out2;
}
- if (request_irq(pcidev->irq, ad1889_interrupt,
SA_SHIRQ
, DEVNAME, dev) != 0) {
+ if (request_irq(pcidev->irq, ad1889_interrupt,
IRQF_SHARED
, DEVNAME, dev) != 0) {
printk(KERN_ERR DEVNAME ": unable to request interrupt\n");
goto out3;
}
printk(KERN_ERR DEVNAME ": unable to request interrupt\n");
goto out3;
}