Skip to content

L
linux
Commit ebe1472e authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files
Options

o sound: more fixups for header cleanup: add include <linux/interrupt.h> 

Also some cleanups wrt struct member initialization style.
parent c19a9472
Hide whitespace changes
Inline Side-by-side
Showing with 318 additions and 161 deletions
sound/oss/cs4281/cs4281_wrapper-24.c
View file @ ebe1472e
......@@ -26,7 +26,8 @@
#include <linux/spinlock.h>
void cs4281_null(struct pci_dev *pcidev) { return; }
int cs4281_resume_null(struct pci_dev *pcidev) { return 0; }
int cs4281_suspend_null(struct pci_dev *pcidev, u32 state) { return 0; }
#define cs4x_mem_map_reserve(page) mem_map_reserve(page)
#define cs4x_mem_map_unreserve(page) mem_map_unreserve(page)
......
sound/oss/cs4281/cs4281m.c
View file @ ebe1472e
......@@ -69,15 +69,19 @@
#include <linux/soundcard.h>
#include <linux/pci.h>
#include <linux/bitops.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/poll.h>
#include <linux/smp_lock.h>
#include <linux/wrapper.h>
#include <linux/fs.h>
#include <linux/wait.h>
#include <asm/current.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/page.h>
#include <asm/uaccess.h>
#include <asm/hardirq.h>
//#include "cs_dm.h"
#include "cs4281_hwdefs.h"
#include "cs4281pm.h"
......@@ -2622,10 +2626,10 @@ static int cs4281_ioctl_mixdev(struct inode *inode, struct file *file,
// Mixer file operations struct.
// ******************************************************************************************
static /*const */ struct file_operations cs4281_mixer_fops = {
llseek:no_llseek,
ioctl:cs4281_ioctl_mixdev,
open:cs4281_open_mixdev,
release:cs4281_release_mixdev,
.llseek = no_llseek,
.ioctl = cs4281_ioctl_mixdev,
.open = cs4281_open_mixdev,
.release = cs4281_release_mixdev,
};
// ---------------------------------------------------------------------
......@@ -3743,14 +3747,14 @@ static int cs4281_open(struct inode *inode, struct file *file)
// Wave (audio) file operations struct.
// ******************************************************************************************
static /*const */ struct file_operations cs4281_audio_fops = {
llseek:no_llseek,
read:cs4281_read,
write:cs4281_write,
poll:cs4281_poll,
ioctl:cs4281_ioctl,
mmap:cs4281_mmap,
open:cs4281_open,
release:cs4281_release,
.llseek = no_llseek,
.read = cs4281_read,
.write = cs4281_write,
.poll = cs4281_poll,
.ioctl = cs4281_ioctl,
.mmap = cs4281_mmap,
.open = cs4281_open,
.release = cs4281_release,
};
// ---------------------------------------------------------------------
......@@ -4092,12 +4096,12 @@ static int cs4281_midi_release(struct inode *inode, struct file *file)
// Midi file operations struct.
// ******************************************************************************************
static /*const */ struct file_operations cs4281_midi_fops = {
llseek:no_llseek,
read:cs4281_midi_read,
write:cs4281_midi_write,
poll:cs4281_midi_poll,
open:cs4281_midi_open,
release:cs4281_midi_release,
.llseek = no_llseek,
.read = cs4281_midi_read,
.write = cs4281_midi_write,
.poll = cs4281_midi_poll,
.open = cs4281_midi_open,
.release = cs4281_midi_release,
};
......@@ -4467,20 +4471,24 @@ static void __devinit cs4281_remove(struct pci_dev *pci_dev)
}
static struct pci_device_id cs4281_pci_tbl[] __devinitdata = {
{PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CRYSTAL_CS4281,
PCI_ANY_ID, PCI_ANY_ID, 0, 0},
{0,}
{
.vendor = PCI_VENDOR_ID_CIRRUS,
.device = PCI_DEVICE_ID_CRYSTAL_CS4281,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
{ 0, },
};
MODULE_DEVICE_TABLE(pci, cs4281_pci_tbl);
struct pci_driver cs4281_pci_driver = {
name:"cs4281",
id_table:cs4281_pci_tbl,
probe:cs4281_probe,
remove:cs4281_remove,
suspend:CS4281_SUSPEND_TBL,
resume:CS4281_RESUME_TBL,
.name = "cs4281",
.id_table = cs4281_pci_tbl,
.probe = cs4281_probe,
.remove = cs4281_remove,
.suspend = CS4281_SUSPEND_TBL,
.resume = CS4281_RESUME_TBL,
};
int __init cs4281_init_module(void)
......
sound/oss/cs4281/cs4281pm-24.c
View file @ ebe1472e
......@@ -38,8 +38,8 @@ int cs4281_resume(struct cs4281_state *s);
#define CS4281_SUSPEND_TBL cs4281_suspend_tbl
#define CS4281_RESUME_TBL cs4281_resume_tbl
*/
#define CS4281_SUSPEND_TBL cs4281_null
#define CS4281_RESUME_TBL cs4281_null
#define CS4281_SUSPEND_TBL cs4281_suspend_null
#define CS4281_RESUME_TBL cs4281_resume_null
int cs4281_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
{
......@@ -78,7 +78,7 @@ int cs4281_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
}
#else /* CS4281_PM */
#define CS4281_SUSPEND_TBL cs4281_null
#define CS4281_RESUME_TBL cs4281_null
#define CS4281_SUSPEND_TBL cs4281_suspend_null
#define CS4281_RESUME_TBL cs4281_resume_null
#endif /* CS4281_PM */
sound/oss/cs46xx.c
View file @ ebe1472e
......@@ -75,6 +75,7 @@
* turned on.
*/
#include <linux/interrupt.h>
#include <linux/list.h>
#include <linux/version.h>
#include <linux/module.h>
......@@ -87,18 +88,18 @@
#include <linux/soundcard.h>
#include <linux/pci.h>
#include <linux/bitops.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <linux/init.h>
#include <linux/poll.h>
#include <linux/smp_lock.h>
#include <linux/wrapper.h>
#include <linux/ac97_codec.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/uaccess.h>
#include <asm/hardirq.h>
#include <linux/ac97_codec.h>
#include "cs46xxpm-24.h"
#include "cs46xx_wrapper-24.h"
#include "cs461x.h"
/* MIDI buffer sizes */
......@@ -5243,22 +5244,85 @@ struct cs_card_type
void (*active)(struct cs_card *, int);
};
static struct cs_card_type cards[]={
{0x1489, 0x7001, "Genius Soundmaker 128 value", amp_none, NULL, NULL},
{0x5053, 0x3357, "Voyetra", amp_voyetra, NULL, NULL},
{0x1071, 0x6003, "Mitac MI6020/21", amp_voyetra, NULL, NULL},
{0x14AF, 0x0050, "Hercules Game Theatre XP", amp_hercules, NULL, NULL},
{0x1681, 0x0050, "Hercules Game Theatre XP", amp_hercules, NULL, NULL},
{0x1681, 0x0051, "Hercules Game Theatre XP", amp_hercules, NULL, NULL},
{0x1681, 0x0052, "Hercules Game Theatre XP", amp_hercules, NULL, NULL},
{0x1681, 0x0053, "Hercules Game Theatre XP", amp_hercules, NULL, NULL},
{0x1681, 0x0054, "Hercules Game Theatre XP", amp_hercules, NULL, NULL},
static struct cs_card_type cards[] = {
{
.vendor = 0x1489,
.id = 0x7001,
.name = "Genius Soundmaker 128 value",
.amp = amp_none,
},
{
.vendor = 0x5053,
.id = 0x3357,
.name = "Voyetra",
.amp = amp_voyetra,
},
{
.vendor = 0x1071,
.id = 0x6003,
.name = "Mitac MI6020/21",
.amp = amp_voyetra,
},
{
.vendor = 0x14AF,
.id = 0x0050,
.name = "Hercules Game Theatre XP",
.amp = amp_hercules,
},
{
.vendor = 0x1681,
.id = 0x0050,
.name = "Hercules Game Theatre XP",
.amp = amp_hercules,
},
{
.vendor = 0x1681,
.id = 0x0051,
.name = "Hercules Game Theatre XP",
.amp = amp_hercules,
},
{
.vendor = 0x1681,
.id = 0x0052,
.name = "Hercules Game Theatre XP",
.amp = amp_hercules,
},
{
.vendor = 0x1681,
.id = 0x0053,
.name = "Hercules Game Theatre XP",
.amp = amp_hercules,
},
{
.vendor = 0x1681,
.id = 0x0054,
.name = "Hercules Game Theatre XP",
.amp = amp_hercules,
},
/* Not sure if the 570 needs the clkrun hack */
{PCI_VENDOR_ID_IBM, 0x0132, "Thinkpad 570", amp_none, NULL, clkrun_hack},
{PCI_VENDOR_ID_IBM, 0x0153, "Thinkpad 600X/A20/T20", amp_none, NULL, clkrun_hack},
{PCI_VENDOR_ID_IBM, 0x1010, "Thinkpad 600E (unsupported)", NULL, NULL, NULL},
{0, 0, "Card without SSID set", NULL, NULL, NULL },
{0, 0, NULL, NULL, NULL}
{
.vendor = PCI_VENDOR_ID_IBM,
.id = 0x0132,
.name = "Thinkpad 570",
.amp = amp_none,
.active = clkrun_hack,
},
{
.vendor = PCI_VENDOR_ID_IBM,
.id = 0x0153,
.name = "Thinkpad 600X/A20/T20",
.amp = amp_none,
.active = clkrun_hack,
},
{
.vendor = PCI_VENDOR_ID_IBM,
.id = 0x1010,
.name = "Thinkpad 600E (unsupported)",
},
{
.name = "Card without SSID set",
},
{ 0, },
};
MODULE_AUTHOR("Alan Cox <alan@redhat.com>, Jaroslav Kysela, <pcaudio@crystal.cirrus.com>");
......@@ -5622,22 +5686,39 @@ enum {
};
static struct pci_device_id cs46xx_pci_tbl[] __devinitdata = {
{PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_4610, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CS46XX_4610},
{PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_4612, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CS46XX_4612},
{PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_4615, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CS46XX_4615},
{0,}
{
.vendor = PCI_VENDOR_ID_CIRRUS,
.device = PCI_DEVICE_ID_CIRRUS_4610,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.driver_data = CS46XX_4610,
},
{
.vendor = PCI_VENDOR_ID_CIRRUS,
.device = PCI_DEVICE_ID_CIRRUS_4612,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.driver_data = CS46XX_4612,
},
{
.vendor = PCI_VENDOR_ID_CIRRUS,
.device = PCI_DEVICE_ID_CIRRUS_4615,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.driver_data = CS46XX_4615,
},
{ 0, },
};
MODULE_DEVICE_TABLE(pci, cs46xx_pci_tbl);
struct pci_driver cs46xx_pci_driver = {
.name= "cs46xx",
.id_table= cs46xx_pci_tbl,
.probe= cs46xx_probe,
.remove= cs46xx_remove,
.suspend= CS46XX_SUSPEND_TBL,
.resume= CS46XX_RESUME_TBL,
.name = "cs46xx",
.id_table = cs46xx_pci_tbl,
.probe = cs46xx_probe,
.remove = cs46xx_remove,
.suspend = CS46XX_SUSPEND_TBL,
.resume = CS46XX_RESUME_TBL,
};
int __init cs46xx_init_module(void)
......
sound/oss/maestro.c
View file @ ebe1472e
......@@ -219,14 +219,18 @@
#include <linux/soundcard.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/poll.h>
#include <linux/reboot.h>
#include <asm/uaccess.h>
#include <asm/hardirq.h>
#include <linux/bitops.h>
#include <linux/wait.h>
#include <asm/current.h>
#include <asm/dma.h>
#include <asm/io.h>
#include <asm/page.h>
#include <asm/uaccess.h>
#include <linux/pm.h>
static int maestro_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *d);
......@@ -3609,10 +3613,10 @@ static struct pci_device_id maestro_pci_tbl[] __devinitdata = {
MODULE_DEVICE_TABLE(pci, maestro_pci_tbl);
static struct pci_driver maestro_pci_driver = {
name:"maestro",
id_table:maestro_pci_tbl,
probe:maestro_probe,
remove:maestro_remove,
.name = "maestro",
.id_table = maestro_pci_tbl,
.probe = maestro_probe,
.remove = maestro_remove,
};
int __init init_maestro(void)
......
sound/oss/maestro3.c
View file @ ebe1472e
......@@ -137,15 +137,17 @@
#include <linux/soundcard.h>
#include <linux/pci.h>
#include <linux/vmalloc.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/poll.h>
#include <linux/reboot.h>
#include <asm/uaccess.h>
#include <asm/hardirq.h>
#include <linux/spinlock.h>
#include <linux/ac97_codec.h>
#include <linux/wait.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/uaccess.h>
/*
* for crizappy mmap()
......@@ -320,15 +322,15 @@ static char *card_names[] = {
#define PCI_VENDOR_ESS 0x125D
#endif
#define M3_DEVICE(DEV, TYPE) \
{ \
vendor: PCI_VENDOR_ESS, \
device: DEV, \
subvendor: PCI_ANY_ID, \
subdevice: PCI_ANY_ID, \
class: PCI_CLASS_MULTIMEDIA_AUDIO << 8, \
class_mask: 0xffff << 8, \
driver_data: TYPE, \
#define M3_DEVICE(DEV, TYPE) \
{ \
.vendor = PCI_VENDOR_ESS, \
.device = DEV, \
.subvendor = PCI_ANY_ID, \
.subdevice = PCI_ANY_ID, \
.class = PCI_CLASS_MULTIMEDIA_AUDIO << 8, \
.class_mask = 0xffff << 8, \
.driver_data = TYPE, \
}
static struct pci_device_id m3_id_table[] __initdata = {
......@@ -381,7 +383,9 @@ static int m3_notifier(struct notifier_block *nb, unsigned long event, void *buf
static int m3_suspend(struct pci_dev *pci_dev, u32 state);
static void check_suspend(struct m3_card *card);
struct notifier_block m3_reboot_nb = {m3_notifier, NULL, 0};
struct notifier_block m3_reboot_nb = {
.notifier_call = m3_notifier,
};
static void m3_outw(struct m3_card *card,
u16 value, unsigned long reg)
......@@ -2179,11 +2183,11 @@ static int m3_ioctl_mixdev(struct inode *inode, struct file *file, unsigned int
}
static struct file_operations m3_mixer_fops = {
owner: THIS_MODULE,
llseek: no_llseek,
ioctl: m3_ioctl_mixdev,
open: m3_open_mixdev,
release: m3_release_mixdev,
.owner = THIS_MODULE,
.llseek = no_llseek,
.ioctl = m3_ioctl_mixdev,
.open = m3_open_mixdev,
.release = m3_release_mixdev,
};
void remote_codec_config(int io, int isremote)
......@@ -2559,15 +2563,15 @@ static void m3_enable_ints(struct m3_card *card)
}
static struct file_operations m3_audio_fops = {
owner: THIS_MODULE,
llseek: &no_llseek,
read: &m3_read,
write: &m3_write,
poll: &m3_poll,
ioctl: &m3_ioctl,
mmap: &m3_mmap,
open: &m3_open,
release: &m3_release,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = m3_read,
.write = m3_write,
.poll = m3_poll,
.ioctl = m3_ioctl,
.mmap = m3_mmap,
.open = m3_open,
.release = m3_release,
};
#ifdef CONFIG_PM
......@@ -2925,12 +2929,12 @@ MODULE_PARM(external_amp,"i");
MODULE_PARM(gpio_pin, "i");
static struct pci_driver m3_pci_driver = {
name: "ess_m3_audio",
id_table: m3_id_table,
probe: m3_probe,
remove: m3_remove,
suspend: m3_suspend,
resume: m3_resume,
.name = "ess_m3_audio",
.id_table = m3_id_table,
.probe = m3_probe,
.remove = m3_remove,
.suspend = m3_suspend,
.resume = m3_resume,
};
static int __init m3_init_module(void)
......
sound/oss/rme96xx.c
View file @ ebe1472e
......@@ -41,10 +41,14 @@
#include <linux/smp_lock.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <asm/dma.h>
#include <asm/hardirq.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/poll.h>
#include <linux/wait.h>
#include <asm/dma.h>
#include <asm/page.h>
#include "rme96xx.h"
#define NR_DEVICE 2
......@@ -808,17 +812,22 @@ static void __devinit rme96xx_remove(struct pci_dev *dev)
#endif
static struct pci_device_id id_table[] __devinitdata = {
{ PCI_VENDOR_ID_RME, PCI_DEVICE_ID_RME9652, PCI_ANY_ID, PCI_ANY_ID, 0, 0 },
{ 0, }
{
.vendor = PCI_VENDOR_ID_RME,
.device = PCI_DEVICE_ID_RME9652,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
{ 0, },
};
MODULE_DEVICE_TABLE(pci, id_table);
static struct pci_driver rme96xx_driver = {
name: "rme96xx",
id_table: id_table,
probe: rme96xx_probe,
remove: rme96xx_remove
.name = "rme96xx",
.id_table = id_table,
.probe = rme96xx_probe,
.remove = rme96xx_remove,
};
static int __init init_rme96xx(void)
......@@ -1223,7 +1232,7 @@ static int rme96xx_open(struct inode *in, struct file *f)
static int rme96xx_release(struct inode *in, struct file *file)
{
struct dmabuf * dma = (struct dmabuf*) file->private_data;
int hwp;
/* int hwp; */
DBG(printk(__FUNCTION__"\n"));
COMM ("draining")
......@@ -1483,15 +1492,15 @@ static unsigned int rme96xx_poll(struct file *file, struct poll_table_struct *wa
static struct file_operations rme96xx_audio_fops = {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
owner: THIS_MODULE,
.owner = THIS_MODULE,
#endif
read: rme96xx_read,
write: rme96xx_write,
poll: rme96xx_poll,
ioctl: rme96xx_ioctl,
mmap: rm96xx_mmap,
open: rme96xx_open,
release: rme96xx_release
.read = rme96xx_read,
.write = rme96xx_write,
.poll = rme96xx_poll,
.ioctl = rme96xx_ioctl,
.mmap = rm96xx_mmap,
.open = rme96xx_open,
.release = rme96xx_release
};
static int rme96xx_mixer_open(struct inode *inode, struct file *file)
......@@ -1565,9 +1574,9 @@ static int rme96xx_mixer_release(struct inode *inode, struct file *file)
static /*const*/ struct file_operations rme96xx_mixer_fops = {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
owner: THIS_MODULE,
.owner = THIS_MODULE,
#endif
ioctl: rme96xx_mixer_ioctl,
open: rme96xx_mixer_open,
release: rme96xx_mixer_release,
.ioctl = rme96xx_mixer_ioctl,
.open = rme96xx_mixer_open,
.release = rme96xx_mixer_release,
};
sound/pci/cs46xx/cs46xx_lib.c
View file @ ebe1472e
......@@ -46,12 +46,13 @@
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/pci.h>
#include <linux/pm.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/info.h>
......@@ -59,6 +60,9 @@
#ifndef LINUX_2_2
#include <linux/gameport.h>
#endif
#include <asm/io.h>
#include "cs46xx_lib.h"
#include "dsp_spos.h"
......@@ -447,7 +451,7 @@ static void snd_cs46xx_reset(cs46xx_t *chip)
static int cs46xx_wait_for_fifo(cs46xx_t * chip,int retry_timeout)
{
u32 i, status;
u32 i, status = 0;
/*
* Make sure the previous FIFO write operation has completed.
*/
......
sound/pci/emu10k1/emu10k1_main.c
View file @ ebe1472e
......@@ -28,9 +28,11 @@
#include <sound/driver.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <sound/core.h>
#include <sound/emu10k1.h>
......
sound/pci/es1938.c
View file @ ebe1472e
......@@ -48,8 +48,8 @@
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <sound/core.h>
......@@ -63,6 +63,8 @@
#include <linux/gameport.h>
#endif
#include <asm/io.h>
#define chip_t es1938_t
MODULE_AUTHOR("Jaromir Koutek <miri@punknet.cz>");
......
sound/pci/fm801.c
View file @ ebe1472e
......@@ -20,9 +20,9 @@
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <sound/core.h>
......@@ -33,6 +33,8 @@
#define SNDRV_GET_ID
#include <sound/initval.h>
#include <asm/io.h>
#define chip_t fm801_t
MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
......
sound/pci/korg1212/korg1212.c
View file @ ebe1472e
......@@ -20,11 +20,13 @@
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/wait.h>
#include <sound/core.h>
#include <sound/info.h>
#include <sound/control.h>
......@@ -33,6 +35,8 @@
#define SNDRV_GET_ID
#include <sound/initval.h>
#include <asm/io.h>
// ----------------------------------------------------------------------------
// Debug Stuff
// ----------------------------------------------------------------------------
......@@ -403,8 +407,13 @@ MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
MODULE_AUTHOR("Haroldo Gamal <gamal@alternex.com.br>");
static struct pci_device_id snd_korg1212_ids[] __devinitdata = {
{ 0x10b5, 0x906d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
{ 0, }
{
.vendor = 0x10b5,
.device = 0x906d,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
{ 0, },
};
static char* stateName[] = {
......@@ -2305,10 +2314,10 @@ static void __devexit snd_korg1212_remove(struct pci_dev *pci)
}
static struct pci_driver driver = {
.name = "korg1212",
.name = "korg1212",
.id_table = snd_korg1212_ids,
.probe = snd_korg1212_probe,
.remove = __devexit_p(snd_korg1212_remove),
.probe = snd_korg1212_probe,
.remove = __devexit_p(snd_korg1212_remove),
};
static int __init alsa_card_korg1212_init(void)
......
sound/pci/rme32.c
View file @ ebe1472e
......@@ -27,11 +27,12 @@
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <sound/core.h>
#include <sound/info.h>
#include <sound/control.h>
......@@ -41,6 +42,8 @@
#define SNDRV_GET_ID
#include <sound/initval.h>
#include <asm/io.h>
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
......
sound/pci/rme96.c
View file @ ebe1472e
......@@ -24,11 +24,12 @@
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <sound/core.h>
#include <sound/info.h>
#include <sound/control.h>
......@@ -38,6 +39,8 @@
#define SNDRV_GET_ID
#include <sound/initval.h>
#include <asm/io.h>
/* note, two last pcis should be equal, it is not a bug */
MODULE_AUTHOR("Anders Torger <torger@ludd.luth.se>");
......
sound/pci/rme9652/hdsp.c
View file @ ebe1472e
......@@ -20,12 +20,11 @@
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <asm/byteorder.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/pci.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/pcm.h>
......@@ -35,6 +34,10 @@
#define SNDRV_GET_ID
#include <sound/initval.h>
#include <asm/byteorder.h>
#include <asm/current.h>
#include <asm/io.h>
#include "multiface_firmware.dat"
#include "digiface_firmware.dat"
......@@ -409,10 +412,13 @@ extern void snd_hammerfall_free_buffer(struct pci_dev *, void *ptr);
#endif
static struct pci_device_id snd_hdsp_ids[] __devinitdata = {
{PCI_VENDOR_ID_XILINX,
PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,}, /* RME Hammerfall-DSP */
{0,}
{
.vendor = PCI_VENDOR_ID_XILINX,
.device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
}, /* RME Hammerfall-DSP */
{ 0, },
};
MODULE_DEVICE_TABLE(pci, snd_hdsp_ids);
......@@ -3116,10 +3122,10 @@ static void __devexit snd_hdsp_remove(struct pci_dev *pci)
}
static struct pci_driver driver = {
.name = "RME Hammerfall DSP",
.name = "RME Hammerfall DSP",
.id_table = snd_hdsp_ids,
.probe = snd_hdsp_probe,
.remove = __devexit_p(snd_hdsp_remove),
.probe = snd_hdsp_probe,
.remove = __devexit_p(snd_hdsp_remove),
};
static int __init alsa_card_hdsp_init(void)
......
sound/pci/rme9652/rme9652.c
View file @ ebe1472e
......@@ -21,11 +21,12 @@
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/pcm.h>
......@@ -34,6 +35,9 @@
#define SNDRV_GET_ID
#include <sound/initval.h>
#include <asm/current.h>
#include <asm/io.h>
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
......@@ -311,8 +315,13 @@ extern void snd_hammerfall_free_buffer(struct pci_dev *, void *ptr);
#endif
static struct pci_device_id snd_rme9652_ids[] __devinitdata = {
{0x10ee, 0x3fc4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,}, /* RME Digi9652 */
{0,}
{
.vendor = 0x10ee,
.device = 0x3fc4,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
}, /* RME Digi9652 */
{ 0, },
};
MODULE_DEVICE_TABLE(pci, snd_rme9652_ids);
......@@ -2733,10 +2742,10 @@ static void __devexit snd_rme9652_remove(struct pci_dev *pci)
}
static struct pci_driver driver = {
.name ="RME Digi9652 (Hammerfall)",
.name = "RME Digi9652 (Hammerfall)",
.id_table = snd_rme9652_ids,
.probe = snd_rme9652_probe,
.remove = __devexit_p(snd_rme9652_remove),
.probe = snd_rme9652_probe,
.remove = __devexit_p(snd_rme9652_remove),
};
static int __init alsa_card_hammerfall_init(void)
......
sound/pci/sonicvibes.c
View file @ ebe1472e
......@@ -23,11 +23,12 @@
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/info.h>
......@@ -40,6 +41,8 @@
#include <linux/gameport.h>
#endif
#include <asm/io.h>
MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
MODULE_DESCRIPTION("S3 SonicVibes PCI");
MODULE_LICENSE("GPL");
......
sound/pci/trident/trident_main.c
View file @ ebe1472e
......@@ -26,12 +26,13 @@
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <sound/core.h>
#include <sound/info.h>
#include <sound/control.h>
......@@ -41,6 +42,8 @@
#include <linux/gameport.h>
#endif
#include <asm/io.h>
#define chip_t trident_t
static int snd_trident_pcm_mixer_build(trident_t *trident, snd_trident_voice_t * voice, snd_pcm_substream_t *substream);
......
sound/pci/ymfpci/ymfpci_main.c
View file @ ebe1472e
......@@ -25,12 +25,14 @@
*/
#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/info.h>
......@@ -38,6 +40,8 @@
#include <sound/asoundef.h>
#include <sound/mpu401.h>
#include <asm/io.h>
#define chip_t ymfpci_t
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7