Skip to content

L
linux
Commit 0077d97a authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

[PATCH] yet more sound version/c99

parent af5b4ea8
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 137 deletions
sound/oss/maestro.c
View file @ 0077d97a
......@@ -205,7 +205,6 @@
/*****************************************************************************/
#include <linux/version.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/smp_lock.h>
......@@ -2170,11 +2169,11 @@ static int ess_ioctl_mixdev(struct inode *inode, struct file *file, unsigned int
}
static /*const*/ struct file_operations ess_mixer_fops = {
owner: THIS_MODULE,
llseek: no_llseek,
ioctl: ess_ioctl_mixdev,
open: ess_open_mixdev,
release: ess_release_mixdev,
.owner = THIS_MODULE,
.llseek = no_llseek,
.ioctl = ess_ioctl_mixdev,
.open = ess_open_mixdev,
.release = ess_release_mixdev,
};
/* --------------------------------------------------------------------- */
......@@ -3106,15 +3105,15 @@ ess_release(struct inode *inode, struct file *file)
}
static struct file_operations ess_audio_fops = {
owner: THIS_MODULE,
llseek: no_llseek,
read: ess_read,
write: ess_write,
poll: ess_poll,
ioctl: ess_ioctl,
mmap: ess_mmap,
open: ess_open,
release: ess_release,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = ess_read,
.write = ess_write,
.poll = ess_poll,
.ioctl = ess_ioctl,
.mmap = ess_mmap,
.open = ess_open,
.release = ess_release,
};
static int
......
sound/oss/midi_synth.h
View file @ 0077d97a
......@@ -22,26 +22,26 @@ static struct synth_info std_synth_info =
static struct synth_operations std_midi_synth =
{
owner: THIS_MODULE,
id: "MIDI",
info: &std_synth_info,
midi_dev: 0,
synth_type: SYNTH_TYPE_MIDI,
synth_subtype: 0,
open: midi_synth_open,
close: midi_synth_close,
ioctl: midi_synth_ioctl,
kill_note: midi_synth_kill_note,
start_note: midi_synth_start_note,
set_instr: midi_synth_set_instr,
reset: midi_synth_reset,
hw_control: midi_synth_hw_control,
load_patch: midi_synth_load_patch,
aftertouch: midi_synth_aftertouch,
controller: midi_synth_controller,
panning: midi_synth_panning,
bender: midi_synth_bender,
setup_voice: midi_synth_setup_voice,
send_sysex: midi_synth_send_sysex
.owner = THIS_MODULE,
.id = "MIDI",
.info = &std_synth_info,
.midi_dev = 0,
.synth_type = SYNTH_TYPE_MIDI,
.synth_subtype = 0,
.open = midi_synth_open,
.close = midi_synth_close,
.ioctl = midi_synth_ioctl,
.kill_note = midi_synth_kill_note,
.start_note = midi_synth_start_note,
.set_instr = midi_synth_set_instr,
.reset = midi_synth_reset,
.hw_control = midi_synth_hw_control,
.load_patch = midi_synth_load_patch,
.aftertouch = midi_synth_aftertouch,
.controller = midi_synth_controller,
.panning = midi_synth_panning,
.bender = midi_synth_bender,
.setup_voice = midi_synth_setup_voice,
.send_sysex = midi_synth_send_sysex
};
#endif
sound/oss/mpu401.c
View file @ 0077d97a
......@@ -888,45 +888,45 @@ static void mpu_synth_close(int dev)
static struct synth_operations mpu401_synth_proto =
{
owner: THIS_MODULE,
id: "MPU401",
info: NULL,
midi_dev: 0,
synth_type: SYNTH_TYPE_MIDI,
synth_subtype: 0,
open: mpu_synth_open,
close: mpu_synth_close,
ioctl: mpu_synth_ioctl,
kill_note: midi_synth_kill_note,
start_note: midi_synth_start_note,
set_instr: midi_synth_set_instr,
reset: midi_synth_reset,
hw_control: midi_synth_hw_control,
load_patch: midi_synth_load_patch,
aftertouch: midi_synth_aftertouch,
controller: midi_synth_controller,
panning: midi_synth_panning,
bender: midi_synth_bender,
setup_voice: midi_synth_setup_voice,
send_sysex: midi_synth_send_sysex
.owner = THIS_MODULE,
.id = "MPU401",
.info = NULL,
.midi_dev = 0,
.synth_type = SYNTH_TYPE_MIDI,
.synth_subtype = 0,
.open = mpu_synth_open,
.close = mpu_synth_close,
.ioctl = mpu_synth_ioctl,
.kill_note = midi_synth_kill_note,
.start_note = midi_synth_start_note,
.set_instr = midi_synth_set_instr,
.reset = midi_synth_reset,
.hw_control = midi_synth_hw_control,
.load_patch = midi_synth_load_patch,
.aftertouch = midi_synth_aftertouch,
.controller = midi_synth_controller,
.panning = midi_synth_panning,
.bender = midi_synth_bender,
.setup_voice = midi_synth_setup_voice,
.send_sysex = midi_synth_send_sysex
};
static struct synth_operations *mpu401_synth_operations[MAX_MIDI_DEV];
static struct midi_operations mpu401_midi_proto =
{
owner: THIS_MODULE,
info: {"MPU-401 Midi", 0, MIDI_CAP_MPU401, SNDCARD_MPU401},
in_info: {0},
open: mpu401_open,
close: mpu401_close,
ioctl: mpu401_ioctl,
outputc: mpu401_out,
start_read: mpu401_start_read,
end_read: mpu401_end_read,
kick: mpu401_kick,
buffer_status: mpu401_buffer_status,
prefix_cmd: mpu401_prefix_cmd
.owner = THIS_MODULE,
.info = {"MPU-401 Midi", 0, MIDI_CAP_MPU401, SNDCARD_MPU401},
.in_info = {0},
.open = mpu401_open,
.close = mpu401_close,
.ioctl = mpu401_ioctl,
.outputc = mpu401_out,
.start_read = mpu401_start_read,
.end_read = mpu401_end_read,
.kick = mpu401_kick,
.buffer_status = mpu401_buffer_status,
.prefix_cmd = mpu401_prefix_cmd
};
static struct midi_operations mpu401_midi_operations[MAX_MIDI_DEV];
......@@ -1619,16 +1619,16 @@ static void mpu_timer_arm(int dev, long time)
static struct sound_timer_operations mpu_timer =
{
owner: THIS_MODULE,
info: {"MPU-401 Timer", 0},
priority: 10, /* Priority */
devlink: 0, /* Local device link */
open: mpu_timer_open,
close: mpu_timer_close,
event: mpu_timer_event,
get_time: mpu_timer_get_time,
ioctl: mpu_timer_ioctl,
arm_timer: mpu_timer_arm
.owner = THIS_MODULE,
.info = {"MPU-401 Timer", 0},
.priority = 10, /* Priority */
.devlink = 0, /* Local device link */
.open = mpu_timer_open,
.close = mpu_timer_close,
.event = mpu_timer_event,
.get_time = mpu_timer_get_time,
.ioctl = mpu_timer_ioctl,
.arm_timer = mpu_timer_arm
};
static void mpu_timer_interrupt(void)
......
sound/oss/msnd_pinnacle.c
View file @ 0077d97a
......@@ -40,7 +40,6 @@
#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/version.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/types.h>
......@@ -1081,12 +1080,12 @@ static void intr(int irq, void *dev_id, struct pt_regs *regs)
}
static struct file_operations dev_fileops = {
owner: THIS_MODULE,
read: dev_read,
write: dev_write,
ioctl: dev_ioctl,
open: dev_open,
release: dev_release,
.owner = THIS_MODULE,
.read = dev_read,
.write = dev_write,
.ioctl = dev_ioctl,
.open = dev_open,
.release = dev_release,
};
static int reset_dsp(void)
......
sound/oss/nec_vrc5477.c
View file @ 0077d97a
......@@ -61,7 +61,6 @@
* 02.08.2001 0.1 Initial release
*/
#include <linux/version.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/kernel.h>
......@@ -896,11 +895,11 @@ static int vrc5477_ac97_ioctl_mixdev(struct inode *inode, struct file *file,
}
static /*const*/ struct file_operations vrc5477_ac97_mixer_fops = {
owner: THIS_MODULE,
llseek: no_llseek,
ioctl: vrc5477_ac97_ioctl_mixdev,
open: vrc5477_ac97_open_mixdev,
release: vrc5477_ac97_release_mixdev,
.owner = THIS_MODULE,
.llseek = no_llseek,
.ioctl = vrc5477_ac97_ioctl_mixdev,
.open = vrc5477_ac97_open_mixdev,
.release = vrc5477_ac97_release_mixdev,
};
/* --------------------------------------------------------------------- */
......@@ -1658,15 +1657,15 @@ static int vrc5477_ac97_release(struct inode *inode, struct file *file)
}
static /*const*/ struct file_operations vrc5477_ac97_audio_fops = {
owner: THIS_MODULE,
llseek: no_llseek,
read: vrc5477_ac97_read,
write: vrc5477_ac97_write,
poll: vrc5477_ac97_poll,
ioctl: vrc5477_ac97_ioctl,
// mmap: vrc5477_ac97_mmap,
open: vrc5477_ac97_open,
release: vrc5477_ac97_release,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = vrc5477_ac97_read,
.write = vrc5477_ac97_write,
.poll = vrc5477_ac97_poll,
.ioctl = vrc5477_ac97_ioctl,
// .mmap = vrc5477_ac97_mmap,
.open = vrc5477_ac97_open,
.release = vrc5477_ac97_release,
};
......
sound/oss/nm256_audio.c
View file @ 0077d97a
......@@ -925,10 +925,10 @@ nm256_default_mixer_ioctl (int dev, unsigned int cmd, caddr_t arg)
}
static struct mixer_operations nm256_mixer_operations = {
owner: THIS_MODULE,
id: "NeoMagic",
name: "NM256AC97Mixer",
ioctl: nm256_default_mixer_ioctl
.owner = THIS_MODULE,
.id = "NeoMagic",
.name = "NM256AC97Mixer",
.ioctl = nm256_default_mixer_ioctl
};
/*
......@@ -1632,16 +1632,16 @@ nm256_audio_local_qlen(int dev)
static struct audio_driver nm256_audio_driver =
{
owner: THIS_MODULE,
open: nm256_audio_open,
close: nm256_audio_close,
output_block: nm256_audio_output_block,
start_input: nm256_audio_start_input,
ioctl: nm256_audio_ioctl,
prepare_for_input: nm256_audio_prepare_for_input,
prepare_for_output:nm256_audio_prepare_for_output,
halt_io: nm256_audio_reset,
local_qlen: nm256_audio_local_qlen,
.owner = THIS_MODULE,
.open = nm256_audio_open,
.close = nm256_audio_close,
.output_block = nm256_audio_output_block,
.start_input = nm256_audio_start_input,
.ioctl = nm256_audio_ioctl,
.prepare_for_input = nm256_audio_prepare_for_input,
.prepare_for_output = nm256_audio_prepare_for_output,
.halt_io = nm256_audio_reset,
.local_qlen = nm256_audio_local_qlen,
};
static struct pci_device_id nm256_pci_tbl[] __devinitdata = {
......
sound/oss/opl3.c
View file @ 0077d97a
......@@ -1078,28 +1078,28 @@ static void opl3_setup_voice(int dev, int voice, int chn)
static struct synth_operations opl3_operations =
{
owner: THIS_MODULE,
id: "OPL",
info: NULL,
midi_dev: 0,
synth_type: SYNTH_TYPE_FM,
synth_subtype: FM_TYPE_ADLIB,
open: opl3_open,
close: opl3_close,
ioctl: opl3_ioctl,
kill_note: opl3_kill_note,
start_note: opl3_start_note,
set_instr: opl3_set_instr,
reset: opl3_reset,
hw_control: opl3_hw_control,
load_patch: opl3_load_patch,
aftertouch: opl3_aftertouch,
controller: opl3_controller,
panning: opl3_panning,
volume_method: opl3_volume_method,
bender: opl3_bender,
alloc_voice: opl3_alloc_voice,
setup_voice: opl3_setup_voice
.owner = THIS_MODULE,
.id = "OPL",
.info = NULL,
.midi_dev = 0,
.synth_type = SYNTH_TYPE_FM,
.synth_subtype = FM_TYPE_ADLIB,
.open = opl3_open,
.close = opl3_close,
.ioctl = opl3_ioctl,
.kill_note = opl3_kill_note,
.start_note = opl3_start_note,
.set_instr = opl3_set_instr,
.reset = opl3_reset,
.hw_control = opl3_hw_control,
.load_patch = opl3_load_patch,
.aftertouch = opl3_aftertouch,
.controller = opl3_controller,
.panning = opl3_panning,
.volume_method = opl3_volume_method,
.bender = opl3_bender,
.alloc_voice = opl3_alloc_voice,
.setup_voice = opl3_setup_voice
};
int opl3_init(int ioaddr, int *osp, struct module *owner)
......
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