Kernel-Janitor sound/ make buildcheck fixes
Subsystems (8)
From my understanding of the output of make buildcheck, I've used make allyesconfig, and saved all the resulting errors, this is my first attempt at some fixes, this patch removes all the buildcheck errors in sound/ except for sound/oss/gus_wave.c as I am unsure of how to fix it yet.
This patch applies to Linus' git branch 7d69fa6266770eeb6317eddd46b64456e8a515bf
Signature · 2 lines
Gabriel Devenyi [email protected]
sound/arm/aaci.c +1 -1
@@ -951,7 +951,7 @@ static struct amba_driver aaci_driver = .id_table = aaci_ids, }; -static int __init aaci_init (void ) +static int __devinit aaci_init (void ) {return amba_driver_register (&aaci_driver); }
sound/arm/pxa2xx-ac97.c +1 -1
@@ -392,7 +392,7 @@ static struct device_driver pxa2xx_ac97_ .resume = pxa2xx_ac97_resume, }; -static int __init pxa2xx_ac97_init (void ) +static int __devinit pxa2xx_ac97_init (void ) {return driver_register (&pxa2xx_ac97_driver); }
sound/arm/sa11xx-uda1341.c +2 -2
@@ -822,7 +822,7 @@ static snd_pcm_ops_t snd_card_sa11xx_uda .pointer = snd_sa11xx_uda1341_pointer, }; -static int __init snd_card_sa11xx_uda1341_pcm (sa11xx_uda1341_t *sa11xx_uda1341,int device) +static int __devinit snd_card_sa11xx_uda1341_pcm (sa11xx_uda1341_t *sa11xx_uda1341,int device) {snd_pcm_t *pcm;int err;
@@ -905,7 +905,7 @@ void snd_sa11xx_uda1341_free(snd_card_tkfree (chip); } -static int __init sa11xx_uda1341_init (void ) +static int __devinit sa11xx_uda1341_init (void ) {int err;snd_card_t *card;
sound/core/hwdep.c +1 -1
@@ -489,7 +489,7 @@ static void snd_hwdep_proc_read(snd_infostatic snd_info_entry_t *snd_hwdep_proc_entry =NULL ; -static int __init alsa_hwdep_init (void ) +static int __devinit alsa_hwdep_init (void ) {snd_info_entry_t *entry;
sound/core/info.c +2 -2
@@ -531,7 +531,7 @@ static struct proc_dir_entry *snd_createreturn p; } -int __init snd_info_init (void ) +int __devinit snd_info_init (void ) {struct proc_dir_entry *p;
@@ -964,7 +964,7 @@ static void snd_info_version_read(snd_in ); } -static int __init snd_info_version_init (void ) +static int __devinit snd_info_version_init (void ) {snd_info_entry_t *entry;
sound/core/init.c +1 -1
@@ -521,7 +521,7 @@ static void snd_card_module_info_read(sn }#endif -int __init snd_card_info_init (void ) +int __devinit snd_card_info_init (void ) {snd_info_entry_t *entry;
sound/core/memalloc.c +1 -1
@@ -639,7 +639,7 @@ static int snd_mem_proc_write(struct fil* module entry */ -static int __init snd_mem_init (void ) +static int __devinit snd_mem_init (void ) {#ifdef CONFIG_PROC_FS snd_mem_proc =create_proc_entry (SND_MEM_PROC_FILE ,0644 ,NULL );
sound/core/memory.c +1 -1
@@ -204,7 +204,7 @@ static void snd_memory_info_read(snd_infsnd_iprintf (buffer,"vmalloc: %li bytes\n" , snd_alloc_vmalloc); } -int __init snd_memory_info_init (void ) +int __devinit snd_memory_info_init (void ) {snd_info_entry_t *entry;
sound/core/oss/mixer_oss.c +1 -1
@@ -1312,7 +1312,7 @@ static int snd_mixer_oss_notify_handler(return 0 ; } -static int __init alsa_mixer_oss_init (void ) +static int __devinit alsa_mixer_oss_init (void ) {int idx;
sound/core/oss/pcm_oss.c +1 -1
@@ -2514,7 +2514,7 @@ static snd_pcm_notify_t snd_pcm_oss_noti .n_unregister = snd_pcm_oss_unregister_minor, }; -static int __init alsa_pcm_oss_init (void ) +static int __devinit alsa_pcm_oss_init (void ) {int i;int err;
sound/core/pcm.c +1 -1
@@ -1010,7 +1010,7 @@ static void snd_pcm_proc_read(snd_info_estatic snd_info_entry_t *snd_pcm_proc_entry =NULL ; -static int __init alsa_pcm_init (void ) +static int __devinit alsa_pcm_init (void ) {snd_info_entry_t *entry;
sound/core/rawmidi.c +1 -1
@@ -1628,7 +1628,7 @@ void snd_rawmidi_set_ops(snd_rawmidi_t ** ENTRY functions */ -static int __init alsa_rawmidi_init (void ) +static int __devinit alsa_rawmidi_init (void ) {snd_ctl_register_ioctl (snd_rawmidi_control_ioctl);
sound/core/rtctimer.c +1 -1
@@ -124,7 +124,7 @@ static void rtctimer_interrupt(void *pri/* * ENTRY functions */ -static int __init rtctimer_init (void ) +static int __devinit rtctimer_init (void ) {int order, err;snd_timer_t *timer;
sound/core/seq/instr/ainstr_fm.c +1 -1
@@ -141,7 +141,7 @@ int snd_seq_fm_init(snd_seq_kinstr_ops_t* Init part */ -static int __init alsa_ainstr_fm_init (void ) +static int __devinit alsa_ainstr_fm_init (void ) {return 0 ; }
sound/core/seq/instr/ainstr_gf1.c +1 -1
@@ -344,7 +344,7 @@ int snd_seq_gf1_init(snd_gf1_ops_t *ops,* Init part */ -static int __init alsa_ainstr_gf1_init (void ) +static int __devinit alsa_ainstr_gf1_init (void ) {return 0 ; }
sound/core/seq/instr/ainstr_iw.c +1 -1
@@ -609,7 +609,7 @@ int snd_seq_iwffff_init(snd_iwffff_ops_t* Init part */ -static int __init alsa_ainstr_iw_init (void ) +static int __devinit alsa_ainstr_iw_init (void ) {return 0 ; }
sound/core/seq/instr/ainstr_simple.c +1 -1
@@ -200,7 +200,7 @@ int snd_seq_simple_init(snd_simple_ops_t* Init part */ -static int __init alsa_ainstr_simple_init (void ) +static int __devinit alsa_ainstr_simple_init (void ) {return 0 ; }
sound/core/seq/oss/seq_oss.c +3 -3
@@ -70,7 +70,7 @@ static void info_read(snd_info_entry_t ** module interface */ -static int __init alsa_seq_oss_init (void ) +static int __devinit alsa_seq_oss_init (void ) {int rc;static snd_seq_dev_ops_t ops = {
@@ -222,7 +222,7 @@ static snd_minor_t seq_oss_reg = { .f_ops = &seq_oss_f_ops, }; -static int __init +static int __devinit register_device (void ) {int rc;
@@ -283,7 +283,7 @@ info_read(snd_info_entry_t *entry, snd_i#endif /* CONFIG_PROC_FS */ -static int __init +static int __devinit register_proc (void ) {#ifdef CONFIG_PROC_FS
sound/core/seq/oss/seq_oss_init.c +1 -1
@@ -61,7 +61,7 @@ static void free_devinfo(void *private);/* * create sequencer client for OSS sequencer */ -int __init +int __devinit snd_seq_oss_create_client (void ) {int rc;
sound/core/seq/oss/seq_oss_midi.c +1 -1
@@ -70,7 +70,7 @@ static int send_midi_event(seq_oss_devin* look up the existing ports * this looks a very exhausting job. */ -int __init +int __devinit snd_seq_oss_midi_lookup_ports (int client) {snd_seq_client_info_t *clinfo;
sound/core/seq/oss/seq_oss_synth.c +1 -1
@@ -86,7 +86,7 @@ static void reset_channels(seq_oss_synth/* * global initialization */ -void __init +void __devinit snd_seq_oss_synth_init (void ) {snd_use_lock_init (&midi_synth_dev.use_lock);
sound/core/seq/seq.c +1 -1
@@ -70,7 +70,7 @@ MODULE_PARM_DESC(seq_default_timer_resol* INIT PART */ -static int __init alsa_seq_init (void ) +static int __devinit alsa_seq_init (void ) {int err;
sound/core/seq/seq_clientmgr.c +2 -2
@@ -187,7 +187,7 @@ static void usage_free(usage_t * res, in }/* initialise data structures */ -int __init client_init_data (void ) +int __devinit client_init_data (void ) {/* zap out the client table */ memset (&clienttablock,0 ,sizeof (clienttablock));
@@ -2475,7 +2475,7 @@ static snd_minor_t snd_seq_reg =/* * register sequencer device */ -int __init snd_sequencer_device_init (void ) +int __devinit snd_sequencer_device_init (void ) {int err;
sound/core/seq/seq_device.c +1 -1
@@ -539,7 +539,7 @@ static void unlock_driver(ops_list_t *op* module part */ -static int __init alsa_seq_device_init (void ) +static int __devinit alsa_seq_device_init (void ) { info_entry =snd_info_create_module_entry (THIS_MODULE ,"drivers" , snd_seq_root);if (info_entry ==NULL )
sound/core/seq/seq_dummy.c +3 -3
@@ -146,7 +146,7 @@ dummy_free(void *private_data)/* * create a port */ -static snd_seq_dummy_port_t __init * +static snd_seq_dummy_port_t __devinit *create_port (int idx,int type) {snd_seq_port_info_t pinfo;
@@ -189,7 +189,7 @@ create_port(int idx, int type)/* * register client and create ports */ -static int __init +static int __devinit register_client (void ) {snd_seq_client_callback_t cb;
@@ -252,7 +252,7 @@ delete_client(void)* Init part */ -static int __init alsa_seq_dummy_init (void ) +static int __devinit alsa_seq_dummy_init (void ) {int err;snd_seq_autoload_lock ();
sound/core/seq/seq_info.c +2 -2
@@ -33,7 +33,7 @@ static snd_info_entry_t *clients_entry;static snd_info_entry_t *timer_entry; -static snd_info_entry_t *__init +static snd_info_entry_t *__devinit create_info_entry (char *name,int size,void (*read)(snd_info_entry_t *,snd_info_buffer_t *)) {snd_info_entry_t *entry;
@@ -53,7 +53,7 @@ create_info_entry(char *name, int size,/* create all our /proc entries */ -int __init snd_seq_info_init (void ) +int __devinit snd_seq_info_init (void ) { queues_entry =create_info_entry ("queues" ,512 + (256 *SNDRV_SEQ_MAX_QUEUES ), snd_seq_info_queues_read);
sound/core/seq/seq_instr.c +1 -1
@@ -633,7 +633,7 @@ int snd_seq_instr_event(snd_seq_kinstr_o* Init part */ -static int __init alsa_seq_instr_init (void ) +static int __devinit alsa_seq_instr_init (void ) {return 0 ; }
sound/core/seq/seq_memory.c +1 -1
@@ -486,7 +486,7 @@ int snd_seq_pool_delete(pool_t **ppool) }/* initialize sequencer memory */ -int __init snd_sequencer_memory_init (void ) +int __devinit snd_sequencer_memory_init (void ) {return 0 ; }
sound/core/seq/seq_midi.c +1 -1
@@ -465,7 +465,7 @@ snd_seq_midisynth_unregister_port(snd_se } -static int __init alsa_seq_midi_init (void ) +static int __devinit alsa_seq_midi_init (void ) {static snd_seq_dev_ops_t ops = { snd_seq_midisynth_register_port,
sound/core/seq/seq_midi_emul.c +1 -1
@@ -717,7 +717,7 @@ void snd_midi_channel_free_set(snd_midi_kfree (chset); } -static int __init alsa_seq_midi_emul_init (void ) +static int __devinit alsa_seq_midi_emul_init (void ) {return 0 ; }
sound/core/seq/seq_midi_event.c +1 -1
@@ -528,7 +528,7 @@ EXPORT_SYMBOL(snd_midi_event_encode);EXPORT_SYMBOL (snd_midi_event_encode_byte);EXPORT_SYMBOL (snd_midi_event_decode); -static int __init alsa_seq_midi_event_init (void ) +static int __devinit alsa_seq_midi_event_init (void ) {return 0 ; }
sound/core/seq/seq_queue.c +1 -1
@@ -161,7 +161,7 @@ static void queue_delete(queue_t *q)/*----------------------------------------------------------------*/ /* setup queues */ -int __init snd_seq_queues_init (void ) +int __devinit snd_seq_queues_init (void ) {/* memset(queue_list, 0, sizeof(queue_list));
sound/core/seq/seq_system.c +1 -1
@@ -118,7 +118,7 @@ static int event_input_timer(snd_seq_eve }/* register our internal client */ -int __init snd_seq_system_client_init (void ) +int __devinit snd_seq_system_client_init (void ) {snd_seq_client_callback_t callbacks;
sound/core/seq/seq_virmidi.c +1 -1
@@ -536,7 +536,7 @@ int snd_virmidi_new(snd_card_t *card, in* ENTRY functions */ -static int __init alsa_virmidi_init (void ) +static int __devinit alsa_virmidi_init (void ) {return 0 ; }
sound/core/sound.c +2 -2
@@ -300,7 +300,7 @@ static void snd_minor_info_read(snd_infoup (&sound_mutex); } -int __init snd_minor_info_init (void ) +int __devinit snd_minor_info_init (void ) {snd_info_entry_t *entry;
@@ -328,7 +328,7 @@ int __exit snd_minor_info_done(void)* INIT PART */ -static int __init alsa_sound_init (void ) +static int __devinit alsa_sound_init (void ) {short controlnum;int err;
sound/core/sound_oss.c +2 -2
@@ -210,7 +210,7 @@ static void snd_minor_info_oss_read(snd_#endif /* CONFIG_PROC_FS */ -int __init snd_minor_info_oss_init (void ) +int __devinit snd_minor_info_oss_init (void ) {#ifdef CONFIG_PROC_FS snd_info_entry_t *entry;
@@ -238,7 +238,7 @@ int __exit snd_minor_info_oss_done(void)return 0 ; } -int __init snd_oss_init_module (void ) +int __devinit snd_oss_init_module (void ) {int card;
sound/core/timer.c +1 -1
@@ -1869,7 +1869,7 @@ static snd_minor_t snd_timer_reg =static snd_info_entry_t *snd_timer_proc_entry =NULL ; -static int __init alsa_timer_init (void ) +static int __devinit alsa_timer_init (void ) {int err;snd_info_entry_t *entry;
sound/drivers/dummy.c +4 -4
@@ -425,7 +425,7 @@ static snd_pcm_ops_t snd_card_dummy_capt .pointer = snd_card_dummy_capture_pointer, }; -static int __init snd_card_dummy_pcm (snd_card_dummy_t *dummy,int device,int substreams) +static int __devinit snd_card_dummy_pcm (snd_card_dummy_t *dummy,int device,int substreams) {snd_pcm_t *pcm;int err;
@@ -556,7 +556,7 @@ DUMMY_VOLUME("CD Volume", 0, MIXER_ADDR_ DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_MASTER) }; -static int __init snd_card_dummy_new_mixer (snd_card_dummy_t * dummy) +static int __devinit snd_card_dummy_new_mixer (snd_card_dummy_t * dummy) {snd_card_t *card = dummy->card;unsigned int idx;
@@ -573,7 +573,7 @@ static int __init snd_card_dummy_new_mixreturn 0 ; } -static int __init snd_card_dummy_probe (int dev) +static int __devinit snd_card_dummy_probe (int dev) {snd_card_t *card;struct snd_card_dummy *dummy;
@@ -609,7 +609,7 @@ static int __init snd_card_dummy_probe(ireturn err; } -static int __init alsa_card_dummy_init (void ) +static int __devinit alsa_card_dummy_init (void ) {int dev, cards;
sound/drivers/mpu401/mpu401.c +2 -2
@@ -117,7 +117,7 @@ static struct pnp_device_id snd_mpu401_pMODULE_DEVICE_TABLE (pnp, snd_mpu401_pnpids); -static int __init snd_mpu401_pnp (int dev,struct pnp_dev *device, +static int __devinit snd_mpu401_pnp (int dev,struct pnp_dev *device,const struct pnp_device_id *id) { if (!pnp_port_valid(device, 0) ||
@@ -184,7 +184,7 @@ static struct pnp_driver snd_mpu401_pnp_static struct pnp_driver snd_mpu401_pnp_driver;#endif -static int __init alsa_card_mpu401_init (void ) +static int __devinit alsa_card_mpu401_init (void ) {int dev, devices =0 ;int err;
sound/drivers/mpu401/mpu401_uart.c +1 -1
@@ -528,7 +528,7 @@ EXPORT_SYMBOL(snd_mpu401_uart_new);* INIT part */ -static int __init alsa_mpu401_uart_init (void ) +static int __devinit alsa_mpu401_uart_init (void ) {return 0 ; }
sound/drivers/mtpav.c +1 -1
@@ -727,7 +727,7 @@ static void free_mtpav(mtpav_t * crd)/* */ -static int __init alsa_card_mtpav_init (void ) +static int __devinit alsa_card_mtpav_init (void ) {int err =0 ;char longname_buffer[80 ];
sound/drivers/opl3/opl3_lib.c +1 -1
@@ -545,7 +545,7 @@ EXPORT_SYMBOL(snd_opl3_reset);* INIT part */ -static int __init alsa_opl3_init (void ) +static int __devinit alsa_opl3_init (void ) {return 0 ; }
sound/drivers/opl3/opl3_seq.c +1 -1
@@ -293,7 +293,7 @@ static int snd_opl3_seq_delete_device(snreturn 0 ; } -static int __init alsa_opl3_seq_init (void ) +static int __devinit alsa_opl3_seq_init (void ) {static snd_seq_dev_ops_t ops = {
sound/drivers/opl4/opl4_lib.c +1 -1
@@ -268,7 +268,7 @@ EXPORT_SYMBOL(snd_opl4_write_memory);EXPORT_SYMBOL (snd_opl4_read_memory);EXPORT_SYMBOL (snd_opl4_create); -static int __init alsa_opl4_init (void ) +static int __devinit alsa_opl4_init (void ) {return 0 ; }
sound/drivers/opl4/opl4_seq.c +1 -1
@@ -203,7 +203,7 @@ static int snd_opl4_seq_delete_device(snreturn 0 ; } -static int __init alsa_opl4_synth_init (void ) +static int __devinit alsa_opl4_synth_init (void ) {static snd_seq_dev_ops_t ops = { snd_opl4_seq_new_device,
sound/drivers/serial-u16550.c +6 -6
@@ -324,7 +324,7 @@ static void snd_uart16550_buffer_timer(u* return 0 if found * return negative error if not found */ -static int __init snd_uart16550_detect (snd_uart16550_t *uart) +static int __devinit snd_uart16550_detect (snd_uart16550_t *uart) {unsigned long io_base = uart->base;int ok;
@@ -763,7 +763,7 @@ static int snd_uart16550_dev_free(snd_dereturn snd_uart16550_free (uart); } -static int __init snd_uart16550_create(snd_card_t * card, +static int __devinit snd_uart16550_create(snd_card_t * card, unsigned long iobase, int irq, unsigned int speed,
@@ -841,7 +841,7 @@ static int __init snd_uart16550_create(sreturn 0 ; } -static void __init snd_uart16550_substreams (snd_rawmidi_str_t *stream) +static void __devinit snd_uart16550_substreams (snd_rawmidi_str_t *stream) {struct list_head *list;
@@ -851,7 +851,7 @@ static void __init snd_uart16550_substre } } -static int __init snd_uart16550_rmidi (snd_uart16550_t *uart,int device,int outs,int ins,snd_rawmidi_t **rmidi) +static int __devinit snd_uart16550_rmidi (snd_uart16550_t *uart,int device,int outs,int ins,snd_rawmidi_t **rmidi) {snd_rawmidi_t *rrawmidi;int err;
@@ -872,7 +872,7 @@ static int __init snd_uart16550_rmidi(snreturn 0 ; } -static int __init snd_serial_probe (int dev) +static int __devinit snd_serial_probe (int dev) {snd_card_t *card;snd_uart16550_t *uart;
@@ -957,7 +957,7 @@ static int __init snd_serial_probe(int dreturn 0 ; } -static int __init alsa_card_serial_init (void ) +static int __devinit alsa_card_serial_init (void ) {int dev =0 ;int cards =0 ;
sound/drivers/virmidi.c +2 -2
@@ -83,7 +83,7 @@ typedef struct snd_card_virmidi {static snd_card_t *snd_virmidi_cards[SNDRV_CARDS ] =SNDRV_DEFAULT_PTR ; -static int __init snd_card_virmidi_probe (int dev) +static int __devinit snd_card_virmidi_probe (int dev) {snd_card_t *card;struct snd_card_virmidi *vmidi;
@@ -125,7 +125,7 @@ static int __init snd_card_virmidi_probereturn err; } -static int __init alsa_card_virmidi_init (void ) +static int __devinit alsa_card_virmidi_init (void ) {int dev, cards;
sound/drivers/vx/vx_core.c +1 -1
@@ -811,7 +811,7 @@ vx_core_t *snd_vx_create(snd_card_t *car/* * module entries */ -static int __init alsa_vx_core_init (void ) +static int __devinit alsa_vx_core_init (void ) {return 0 ; }
sound/i2c/cs8427.c +1 -1
@@ -552,7 +552,7 @@ int snd_cs8427_iec958_pcm(snd_i2c_devicereturn err <0 ? err :0 ; } -static int __init alsa_cs8427_module_init (void ) +static int __devinit alsa_cs8427_module_init (void ) {return 0 ; }
sound/i2c/i2c.c +1 -1
@@ -320,7 +320,7 @@ EXPORT_SYMBOL(snd_i2c_sendbytes);EXPORT_SYMBOL (snd_i2c_readbytes);EXPORT_SYMBOL (snd_i2c_probeaddr); -static int __init alsa_i2c_init (void ) +static int __devinit alsa_i2c_init (void ) {return 0 ; }
sound/i2c/l3/uda1341.c +2 -2
@@ -660,7 +660,7 @@ static int uda1341_dev_free(snd_device_treturn 0 ; } -int __init snd_chip_uda1341_mixer_new (snd_card_t *card,struct l3_client **clnt) +int __devinit snd_chip_uda1341_mixer_new (snd_card_t *card,struct l3_client **clnt) {static snd_device_ops_t ops = { .dev_free = uda1341_dev_free,
@@ -801,7 +801,7 @@ static struct l3_driver uda1341_driver = .owner = THIS_MODULE, }; -static int __init uda1341_init (void ) +static int __devinit uda1341_init (void ) {return l3_add_driver (&uda1341_driver); }
sound/i2c/other/ak4xxx-adda.c +1 -1
@@ -483,7 +483,7 @@ int snd_akm4xxx_build_controls(akm4xxx_treturn err; } -static int __init alsa_akm4xxx_module_init (void ) +static int __devinit alsa_akm4xxx_module_init (void ) {return 0 ; }
sound/i2c/other/tea575x-tuner.c +1 -1
@@ -217,7 +217,7 @@ void snd_tea575x_exit(tea575x_t *tea) } } -static int __init alsa_tea575x_module_init (void ) +static int __devinit alsa_tea575x_module_init (void ) {return 0 ; }
sound/i2c/tea6330t.c +1 -1
@@ -355,7 +355,7 @@ EXPORT_SYMBOL(snd_tea6330t_update_mixer)* INIT part */ -static int __init alsa_tea6330t_init (void ) +static int __devinit alsa_tea6330t_init (void ) {return 0 ; }
sound/isa/ad1816a/ad1816a.c +1 -1
@@ -291,7 +291,7 @@ static struct pnp_card_driver ad1816a_pn .remove = __devexit_p(snd_ad1816a_pnp_remove), }; -static int __init alsa_card_ad1816a_init (void ) +static int __devinit alsa_card_ad1816a_init (void ) {int cards =0 ;
sound/isa/ad1816a/ad1816a_lib.c +1 -1
@@ -961,7 +961,7 @@ EXPORT_SYMBOL(snd_ad1816a_create);EXPORT_SYMBOL (snd_ad1816a_pcm);EXPORT_SYMBOL (snd_ad1816a_mixer); -static int __init alsa_ad1816a_init (void ) +static int __devinit alsa_ad1816a_init (void ) {return 0 ; }
sound/isa/ad1848/ad1848.c +2 -2
@@ -63,7 +63,7 @@ MODULE_PARM_DESC(thinkpad, "Enable onlystatic snd_card_t *snd_ad1848_cards[SNDRV_CARDS ] =SNDRV_DEFAULT_PTR ; -static int __init snd_card_ad1848_probe (int dev) +static int __devinit snd_card_ad1848_probe (int dev) {snd_card_t *card;ad1848_t *chip;
@@ -122,7 +122,7 @@ static int __init snd_card_ad1848_probe(return 0 ; } -static int __init alsa_card_ad1848_init (void ) +static int __devinit alsa_card_ad1848_init (void ) {int dev, cards;
sound/isa/ad1848/ad1848_lib.c +1 -1
@@ -1266,7 +1266,7 @@ EXPORT_SYMBOL(snd_ad1848_add_ctl);* INIT part */ -static int __init alsa_ad1848_init (void ) +static int __devinit alsa_ad1848_init (void ) {return 0 ; }
sound/isa/als100.c +2 -2
@@ -198,7 +198,7 @@ static int __devinit snd_card_als100_pnpreturn 0 ; } -static int __init snd_card_als100_probe (int dev, +static int __devinit snd_card_als100_probe (int dev,struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {
@@ -313,7 +313,7 @@ static struct pnp_card_driver als100_pnp .remove = __devexit_p(snd_als100_pnp_remove), }; -static int __init alsa_card_als100_init (void ) +static int __devinit alsa_card_als100_init (void ) {int cards =0 ;
sound/isa/azt2320.c +1 -1
@@ -343,7 +343,7 @@ static struct pnp_card_driver azt2320_pn .remove = __devexit_p(snd_azt2320_pnp_remove), }; -static int __init alsa_card_azt2320_init (void ) +static int __devinit alsa_card_azt2320_init (void ) {int cards =0 ;
sound/isa/cmi8330.c +4 -4
@@ -170,7 +170,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_cmi833#endif -static struct ad1848_mix_elem snd_cmi8330_controls[]__initdata = { +static struct ad1848_mix_elem snd_cmi8330_controls[]__devinitdata = {AD1848_DOUBLE ("Master Playback Volume" ,0 ,CMI8330_MASTVOL ,CMI8330_MASTVOL ,4 ,0 ,15 ,0 ),AD1848_SINGLE ("Loud Playback Switch" ,0 ,CMI8330_MUTEMUX ,6 ,1 ,1 ),AD1848_DOUBLE ("PCM Playback Switch" ,0 ,AD1848_LEFT_OUTPUT ,AD1848_RIGHT_OUTPUT ,7 ,7 ,1 ,1 ),
@@ -199,7 +199,7 @@ AD1848_SINGLE("IEC958 Input Playback Swi };#ifdef ENABLE_SB_MIXER -static struct sbmix_elem cmi8330_sb_mixers[]__initdata = { +static struct sbmix_elem cmi8330_sb_mixers[]__devinitdata = {SB_DOUBLE ("SB Master Playback Volume" ,SB_DSP4_MASTER_DEV , (SB_DSP4_MASTER_DEV +1 ),3 ,3 ,31 ),SB_DOUBLE ("Tone Control - Bass" ,SB_DSP4_BASS_DEV , (SB_DSP4_BASS_DEV +1 ),4 ,4 ,15 ), SB_DOUBLE("Tone Control - Treble", SB_DSP4_TREBLE_DEV, (SB_DSP4_TREBLE_DEV + 1), 4, 4, 15),
@@ -217,7 +217,7 @@ SB_DOUBLE("SB Playback Volume", SB_DSP4_ SB_SINGLE("SB Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1), }; -static unsigned char cmi8330_sb_init_values[][2 ]__initdata = { +static unsigned char cmi8330_sb_init_values[][2 ]__devinitdata = { {SB_DSP4_MASTER_DEV +0 ,0 }, {SB_DSP4_MASTER_DEV +1 ,0 }, {SB_DSP4_PCM_DEV +0 ,0 },
@@ -587,7 +587,7 @@ static struct pnp_card_driver cmi8330_pn };#endif /* CONFIG_PNP */ -static int __init alsa_card_cmi8330_init (void ) +static int __devinit alsa_card_cmi8330_init (void ) {int dev, cards =0 ;
sound/isa/cs423x/cs4231.c +2 -2
@@ -67,7 +67,7 @@ MODULE_PARM_DESC(dma2, "DMA2 # for CS423static snd_card_t *snd_cs4231_cards[SNDRV_CARDS ] =SNDRV_DEFAULT_PTR ; -static int __init snd_card_cs4231_probe (int dev) +static int __devinit snd_card_cs4231_probe (int dev) {snd_card_t *card;struct snd_card_cs4231 *acard;
@@ -140,7 +140,7 @@ static int __init snd_card_cs4231_probe(return 0 ; } -static int __init alsa_card_cs4231_init (void ) +static int __devinit alsa_card_cs4231_init (void ) {int dev, cards;
sound/isa/cs423x/cs4231_lib.c +1 -1
@@ -1951,7 +1951,7 @@ EXPORT_SYMBOL(snd_cs4231_put_double);* INIT part */ -static int __init alsa_cs4231_init (void ) +static int __devinit alsa_cs4231_init (void ) {return 0 ; }
sound/isa/cs423x/cs4236.c +1 -1
@@ -562,7 +562,7 @@ static struct pnp_card_driver cs423x_pnp };#endif /* CONFIG_PNP */ -static int __init alsa_card_cs423x_init (void ) +static int __devinit alsa_card_cs423x_init (void ) {int dev, cards =0 ;
sound/isa/cs423x/cs4236_lib.c +1 -1
@@ -957,7 +957,7 @@ EXPORT_SYMBOL(snd_cs4236_mixer);* INIT part */ -static int __init alsa_cs4236_init (void ) +static int __devinit alsa_cs4236_init (void ) {return 0 ; }
sound/isa/dt019x.c +1 -1
@@ -303,7 +303,7 @@ static struct pnp_card_driver dt019x_pnp .remove = __devexit_p(snd_dt019x_pnp_remove), }; -static int __init alsa_card_dt019x_init (void ) +static int __devinit alsa_card_dt019x_init (void ) {int cards =0 ;
sound/isa/es1688/es1688.c +3 -3
@@ -71,7 +71,7 @@ MODULE_PARM_DESC(dma8, "8-bit DMA # forstatic snd_card_t *snd_audiodrive_cards[SNDRV_CARDS ] =SNDRV_DEFAULT_PTR ; -static int __init snd_audiodrive_probe (int dev) +static int __devinit snd_audiodrive_probe (int dev) {static int possible_irqs[] = {5 ,9 ,10 ,7 ,-1 };static int possible_dmas[] = {1 ,3 ,0 ,-1 };
@@ -151,7 +151,7 @@ static int __init snd_audiodrive_probe(i } -static int __init snd_audiodrive_legacy_auto_probe (unsigned long xport) +static int __devinit snd_audiodrive_legacy_auto_probe (unsigned long xport) {static int dev;int res;
@@ -168,7 +168,7 @@ static int __init snd_audiodrive_legacy_return -ENODEV ; } -static int __init alsa_card_es1688_init (void ) +static int __devinit alsa_card_es1688_init (void ) {static unsigned long possible_ports[] = {0x220 ,0x240 ,0x260 ,-1 };int dev, cards =0 , i;
sound/isa/es1688/es1688_lib.c +1 -1
@@ -1049,7 +1049,7 @@ EXPORT_SYMBOL(snd_es1688_mixer);* INIT part */ -static int __init alsa_es1688_init (void ) +static int __devinit alsa_es1688_init (void ) {return 0 ; }
sound/isa/es18xx.c +1 -1
@@ -2168,7 +2168,7 @@ static struct pnp_card_driver es18xx_pnp };#endif /* CONFIG_PNP */ -static int __init alsa_card_es18xx_init (void ) +static int __devinit alsa_card_es18xx_init (void ) {static unsigned long possible_ports[] = {0x220 ,0x240 ,0x260 ,0x280 ,-1 };int dev, cards =0 , i;
sound/isa/gus/gus_main.c +1 -1
@@ -500,7 +500,7 @@ EXPORT_SYMBOL(snd_gf1_mem_lock);* INIT part */ -static int __init alsa_gus_init (void ) +static int __devinit alsa_gus_init (void ) {return 0 ; }
sound/isa/gus/gus_synth.c +1 -1
@@ -310,7 +310,7 @@ static int snd_gus_synth_delete_device(sreturn 0 ; } -static int __init alsa_gus_synth_init (void ) +static int __devinit alsa_gus_synth_init (void ) {static snd_seq_dev_ops_t ops = { snd_gus_synth_new_device,
sound/isa/gus/gusclassic.c +5 -5
@@ -73,7 +73,7 @@ MODULE_PARM_DESC(pcm_channels, "Reservedstatic snd_card_t *snd_gusclassic_cards[SNDRV_CARDS ] =SNDRV_DEFAULT_PTR ; -static int __init snd_gusclassic_detect (snd_gus_card_t * gus) +static int __devinit snd_gusclassic_detect (snd_gus_card_t * gus) {snd_gf1_i_write8 (gus,SNDRV_GF1_GB_RESET ,0 );/* reset GF1 */ #ifdef CONFIG_SND_DEBUG_DETECT
@@ -109,7 +109,7 @@ static int __init snd_gusclassic_detect(return 0 ; } -static void __init snd_gusclassic_init (int dev,snd_gus_card_t * gus) +static void __devinit snd_gusclassic_init (int dev,snd_gus_card_t * gus) { gus->equal_irq =0 ; gus->codec_flag =0 ;
@@ -117,7 +117,7 @@ static void __init snd_gusclassic_init(i gus->joystick_dac = joystick_dac[dev]; } -static int __init snd_gusclassic_probe (int dev) +static int __devinit snd_gusclassic_probe (int dev) {static int possible_irqs[] = {5 ,11 ,12 ,9 ,7 ,15 ,3 ,4 ,-1 };static int possible_dmas[] = {5 ,6 ,7 ,1 ,3 ,-1 };
@@ -207,7 +207,7 @@ static int __init snd_gusclassic_probe(ireturn 0 ; } -static int __init snd_gusclassic_legacy_auto_probe (unsigned long xport) +static int __devinit snd_gusclassic_legacy_auto_probe (unsigned long xport) {static int dev;int res;
@@ -224,7 +224,7 @@ static int __init snd_gusclassic_legacy_return -ENODEV ; } -static int __init alsa_card_gusclassic_init (void ) +static int __devinit alsa_card_gusclassic_init (void ) {static unsigned long possible_ports[] = {0x220 ,0x230 ,0x240 ,0x250 ,0x260 ,-1 };int dev, cards, i;
sound/isa/gus/gusextreme.c +6 -6
@@ -88,7 +88,7 @@ MODULE_PARM_DESC(pcm_channels, "Reservedstatic snd_card_t *snd_gusextreme_cards[SNDRV_CARDS ] =SNDRV_DEFAULT_PTR ; -static int __init snd_gusextreme_detect (int dev, +static int __devinit snd_gusextreme_detect (int dev,snd_card_t * card,snd_gus_card_t * gus,es1688_t *es1688)
@@ -156,12 +156,12 @@ static int __init snd_gusextreme_detect(return 0 ; } -static void __init snd_gusextreme_init (int dev,snd_gus_card_t * gus) +static void __devinit snd_gusextreme_init (int dev,snd_gus_card_t * gus) { gus->joystick_dac = joystick_dac[dev]; } -static int __init snd_gusextreme_mixer (es1688_t *chip) +static int __devinit snd_gusextreme_mixer (es1688_t *chip) {snd_card_t *card = chip->card;snd_ctl_elem_id_t id1, id2;
@@ -183,7 +183,7 @@ static int __init snd_gusextreme_mixer(ereturn 0 ; } -static int __init snd_gusextreme_probe (int dev) +static int __devinit snd_gusextreme_probe (int dev) {static int possible_ess_irqs[] = {5 ,9 ,10 ,7 ,-1 };static int possible_ess_dmas[] = {1 ,3 ,0 ,-1 };
@@ -314,7 +314,7 @@ static int __init snd_gusextreme_probe(ireturn err; } -static int __init snd_gusextreme_legacy_auto_probe (unsigned long xport) +static int __devinit snd_gusextreme_legacy_auto_probe (unsigned long xport) {static int dev;int res;
@@ -331,7 +331,7 @@ static int __init snd_gusextreme_legacy_return -ENODEV ; } -static int __init alsa_card_gusextreme_init (void ) +static int __devinit alsa_card_gusextreme_init (void ) {static unsigned long possible_ports[] = {0x220 ,0x240 ,0x260 ,-1 };int dev, cards, i;
sound/isa/gus/gusmax.c +6 -6
@@ -83,7 +83,7 @@ struct snd_gusmax {static snd_card_t *snd_gusmax_cards[SNDRV_CARDS ] =SNDRV_DEFAULT_PTR ; -static int __init snd_gusmax_detect (snd_gus_card_t * gus) +static int __devinit snd_gusmax_detect (snd_gus_card_t * gus) {snd_gf1_i_write8 (gus,SNDRV_GF1_GB_RESET ,0 );/* reset GF1 */ #ifdef CONFIG_SND_DEBUG_DETECT
@@ -140,7 +140,7 @@ static irqreturn_t snd_gusmax_interrupt(return IRQ_RETVAL (handled); } -static void __init snd_gusmax_init (int dev,snd_card_t * card,snd_gus_card_t * gus) +static void __devinit snd_gusmax_init (int dev,snd_card_t * card,snd_gus_card_t * gus) { gus->equal_irq =1 ; gus->codec_flag =1 ;
@@ -158,7 +158,7 @@ static void __init snd_gusmax_init(int d#define CS4231_PRIVATE ( left, right, shift, mute ) \ ((left << 24)|(right << 16)|(shift<<8)|mute) -static int __init snd_gusmax_mixer (cs4231_t *chip) +static int __devinit snd_gusmax_mixer (cs4231_t *chip) {snd_card_t *card = chip->card;snd_ctl_elem_id_t id1, id2;
@@ -217,7 +217,7 @@ static void snd_gusmax_free(snd_card_t *free_irq (maxcard->irq, (void *)maxcard); } -static int __init snd_gusmax_probe (int dev) +static int __devinit snd_gusmax_probe (int dev) {static int possible_irqs[] = {5 ,11 ,12 ,9 ,7 ,15 ,3 ,-1 };static int possible_dmas[] = {5 ,6 ,7 ,1 ,3 ,-1 };
@@ -347,7 +347,7 @@ static int __init snd_gusmax_probe(int dreturn 0 ; } -static int __init snd_gusmax_legacy_auto_probe (unsigned long xport) +static int __devinit snd_gusmax_legacy_auto_probe (unsigned long xport) {static int dev;int res;
@@ -364,7 +364,7 @@ static int __init snd_gusmax_legacy_autoreturn -ENODEV ; } -static int __init alsa_card_gusmax_init (void ) +static int __devinit alsa_card_gusmax_init (void ) {static unsigned long possible_ports[] = {0x220 ,0x230 ,0x240 ,0x250 ,0x260 ,-1 };int dev, cards, i;
sound/isa/gus/interwave.c +1 -1
@@ -909,7 +909,7 @@ static struct pnp_card_driver interwave_#endif /* CONFIG_PNP */ -static int __init alsa_card_interwave_init (void ) +static int __devinit alsa_card_interwave_init (void ) {int cards =0 , i;static long possible_ports[] = {0x210 ,0x220 ,0x230 ,0x240 ,0x250 ,0x260 ,-1 };
sound/isa/opl3sa2.c +4 -4
@@ -213,7 +213,7 @@ static void snd_opl3sa2_write(opl3sa2_tspin_unlock_irqrestore (&chip->reg_lock, flags); } -static int __init snd_opl3sa2_detect (opl3sa2_t *chip) +static int __devinit snd_opl3sa2_detect (opl3sa2_t *chip) {snd_card_t *card;unsigned long port;
@@ -481,7 +481,7 @@ static void snd_opl3sa2_master_free(snd_ chip->master_volume =NULL ; } -static int __init snd_opl3sa2_mixer (opl3sa2_t *chip) +static int __devinit snd_opl3sa2_mixer (opl3sa2_t *chip) {snd_card_t *card = chip->card;snd_ctl_elem_id_t id1, id2;
@@ -567,7 +567,7 @@ static int snd_opl3sa2_resume(snd_card_t#endif /* CONFIG_PM */ #ifdef CONFIG_PNP -static int __init snd_opl3sa2_pnp (int dev,opl3sa2_t *chip, +static int __devinit snd_opl3sa2_pnp (int dev,opl3sa2_t *chip,struct pnp_card_link *card,const struct pnp_card_device_id *id) {
@@ -815,7 +815,7 @@ static struct pnp_card_driver opl3sa2_pn };#endif /* CONFIG_PNP */ -static int __init alsa_card_opl3sa2_init (void ) +static int __devinit alsa_card_opl3sa2_init (void ) {int dev, cards =0 ;
sound/isa/opti9xx/opti92x-ad1848.c +1 -1
@@ -2188,7 +2188,7 @@ static struct pnp_card_driver opti9xx_pn };#endif -static int __init alsa_card_opti9xx_init (void ) +static int __devinit alsa_card_opti9xx_init (void ) {int cards, error;
sound/isa/sb/emu8000.c +11 -11
@@ -131,7 +131,7 @@ snd_emu8000_dma_chan(emu8000_t *emu, int/* */ -static void __init +static void __devinit snd_emu8000_read_wait (emu8000_t *emu) {while ((EMU8000_SMALR_READ (emu) &0x80000000 ) !=0 ) {
@@ -144,7 +144,7 @@ snd_emu8000_read_wait(emu8000_t *emu)/* */ -static void __init +static void __devinit snd_emu8000_write_wait (emu8000_t *emu) {while ((EMU8000_SMALW_READ (emu) &0x80000000 ) !=0 ) {
@@ -158,7 +158,7 @@ snd_emu8000_write_wait(emu8000_t *emu)/* * detect a card at the given port */ -static int __init +static int __devinit snd_emu8000_detect (emu8000_t *emu) {/* Initialise */
@@ -184,7 +184,7 @@ snd_emu8000_detect(emu8000_t *emu)/* * intiailize audio channels */ -static void __init +static void __devinit init_audio (emu8000_t *emu) {int ch;
@@ -225,7 +225,7 @@ init_audio(emu8000_t *emu)/* * initialize DMA address */ -static void __init +static void __devinit init_dma (emu8000_t *emu) {EMU8000_SMALR_WRITE (emu,0 );
@@ -329,7 +329,7 @@ static unsigned short init4[128] /*__dev* Taken from the oss driver, not obvious from the doc how this * is meant to work */ -static void __init +static void __devinit send_array (emu8000_t *emu,unsigned short *data,int size) {int i;
@@ -351,7 +351,7 @@ send_array(emu8000_t *emu, unsigned shor* Send initialization arrays to start up, this just follows the * initialisation sequence in the adip. */ -static void __init +static void __devinit init_arrays (emu8000_t *emu) {send_array (emu, init1,ARRAY_SIZE (init1)/4 );
@@ -377,7 +377,7 @@ init_arrays(emu8000_t *emu)* seems that the only way to do this is to use the one channel and keep * reallocating between read and write. */ -static void __init +static void __devinit size_dram (emu8000_t *emu) {int i, size;
@@ -503,7 +503,7 @@ snd_emu8000_init_fm(emu8000_t *emu)/* * The main initialization routine. */ -static void __init +static void __devinit snd_emu8000_init_hw (emu8000_t *emu) {int i;
@@ -1022,7 +1022,7 @@ static snd_kcontrol_new_t *mixer_defs[EM/* * create and attach mixer elements for WaveTable treble/bass controls */ -static int __init +static int __devinit snd_emu8000_create_mixer (snd_card_t *card,emu8000_t *emu) {int i, err =0 ;
@@ -1081,7 +1081,7 @@ static int snd_emu8000_dev_free(snd_devi/* * initialize and register emu8000 synth device. */ -int __init +int __devinit snd_emu8000_new (snd_card_t *card,int index,long port,int seq_ports,snd_seq_device_t **awe_ret) {snd_seq_device_t *awe;
sound/isa/sb/emu8000_synth.c +1 -1
@@ -115,7 +115,7 @@ static int snd_emu8000_delete_device(snd* INIT part */ -static int __init alsa_emu8000_init (void ) +static int __devinit alsa_emu8000_init (void ) {static snd_seq_dev_ops_t ops = {
sound/isa/sb/es968.c +2 -2
@@ -123,7 +123,7 @@ static int __devinit snd_card_es968_pnp(return 0 ; } -static int __init snd_card_es968_probe (int dev, +static int __devinit snd_card_es968_probe (int dev,struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {
@@ -214,7 +214,7 @@ static struct pnp_card_driver es968_pnpc .remove = __devexit_p(snd_es968_pnp_remove), }; -static int __init alsa_card_es968_init (void ) +static int __devinit alsa_card_es968_init (void ) {int cards =pnp_register_card_driver (&es968_pnpc_driver);#ifdef MODULE
sound/isa/sb/sb16.c +3 -3
@@ -351,7 +351,7 @@ static void snd_sb16_free(snd_card_t *ca } } -static int __init snd_sb16_probe (int dev, +static int __devinit snd_sb16_probe (int dev,struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {
@@ -552,7 +552,7 @@ static int __init snd_sb16_probe(int devreturn 0 ; } -static int __init snd_sb16_probe_legacy_port (unsigned long xport) +static int __devinit snd_sb16_probe_legacy_port (unsigned long xport) {static int dev;int res;
@@ -612,7 +612,7 @@ static struct pnp_card_driver sb16_pnpc_#endif /* CONFIG_PNP */ -static int __init alsa_card_sb16_init (void ) +static int __devinit alsa_card_sb16_init (void ) {int dev, cards =0 , i;static unsigned long possible_ports[] = {0x220 ,0x240 ,0x260 ,0x280 ,-1 };
sound/isa/sb/sb16_csp.c +1 -1
@@ -1162,7 +1162,7 @@ EXPORT_SYMBOL(snd_sb_csp_new);* INIT part */ -static int __init alsa_sb_csp_init (void ) +static int __devinit alsa_sb_csp_init (void ) {return 0 ; }
sound/isa/sb/sb16_main.c +1 -1
@@ -903,7 +903,7 @@ EXPORT_SYMBOL(snd_sb16dsp_interrupt);* INIT part */ -static int __init alsa_sb16_init (void ) +static int __devinit alsa_sb16_init (void ) {return 0 ; }
sound/isa/sb/sb8.c +3 -3
@@ -84,7 +84,7 @@ static void snd_sb8_free(snd_card_t *car } } -static int __init snd_sb8_probe (int dev) +static int __devinit snd_sb8_probe (int dev) {sb_t *chip;snd_card_t *card;
@@ -170,7 +170,7 @@ static int __init snd_sb8_probe(int dev)return 0 ; } -static int __init snd_card_sb8_legacy_auto_probe (unsigned long xport) +static int __devinit snd_card_sb8_legacy_auto_probe (unsigned long xport) {static int dev;int res;
@@ -187,7 +187,7 @@ static int __init snd_card_sb8_legacy_aureturn -ENODEV ; } -static int __init alsa_card_sb8_init (void ) +static int __devinit alsa_card_sb8_init (void ) {static unsigned long possible_ports[] = {0x220 ,0x240 ,0x260 ,-1 };int dev, cards, i;
sound/isa/sb/sb8_main.c +1 -1
@@ -552,7 +552,7 @@ EXPORT_SYMBOL(snd_sb8dsp_midi);* INIT part */ -static int __init alsa_sb8_init (void ) +static int __devinit alsa_sb8_init (void ) {return 0 ; }
sound/isa/sb/sb_common.c +1 -1
@@ -300,7 +300,7 @@ EXPORT_SYMBOL(snd_sbmixer_add_ctl);* INIT part */ -static int __init alsa_sb_common_init (void ) +static int __devinit alsa_sb_common_init (void ) {return 0 ; }
sound/isa/sgalaxy.c +6 -6
@@ -92,7 +92,7 @@ static int snd_sgalaxy_sbdsp_reset(unsigreturn 0 ; } -static int __init snd_sgalaxy_sbdsp_command (unsigned long port,unsigned char val) +static int __devinit snd_sgalaxy_sbdsp_command (unsigned long port,unsigned char val) {int i;
@@ -110,7 +110,7 @@ static irqreturn_t snd_sgalaxy_dummy_intreturn IRQ_NONE ; } -static int __init snd_sgalaxy_setup_wss (unsigned long port,int irq,int dma) +static int __devinit snd_sgalaxy_setup_wss (unsigned long port,int irq,int dma) {static int interrupt_bits[] = {-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,0x08 ,-1 ,0x10 ,0x18 ,0x20 ,-1 ,-1 ,-1 ,-1 };
@@ -157,7 +157,7 @@ static int __init snd_sgalaxy_setup_wss(return 0 ; } -static int __init snd_sgalaxy_detect (int dev,int irq,int dma) +static int __devinit snd_sgalaxy_detect (int dev,int irq,int dma) {#if 0 snd_printdd ("sgalaxy - switching to WSS mode\n" );
@@ -178,7 +178,7 @@ AD1848_DOUBLE("Aux Playback Switch", 0, AD1848_DOUBLE("Aux Playback Volume", 0, SGALAXY_AUXC_LEFT, SGALAXY_AUXC_RIGHT, 0, 0, 31, 0) }; -static int __init snd_sgalaxy_mixer (ad1848_t *chip) +static int __devinit snd_sgalaxy_mixer (ad1848_t *chip) {snd_card_t *card = chip->card;snd_ctl_elem_id_t id1, id2;
@@ -214,7 +214,7 @@ static int __init snd_sgalaxy_mixer(ad18return 0 ; } -static int __init snd_sgalaxy_probe (int dev) +static int __devinit snd_sgalaxy_probe (int dev) {static int possible_irqs[] = {7 ,9 ,10 ,11 ,-1 };static int possible_dmas[] = {1 ,3 ,0 ,-1 };
@@ -292,7 +292,7 @@ static int __init snd_sgalaxy_probe(intreturn 0 ; } -static int __init alsa_card_sgalaxy_init (void ) +static int __devinit alsa_card_sgalaxy_init (void ) {int dev, cards;
sound/isa/sscape.c +2 -2
@@ -1424,7 +1424,7 @@ static struct pnp_card_driver sscape_pnp#endif /* CONFIG_PNP */ -static int __init sscape_manual_probe (struct params *params) +static int __devinit sscape_manual_probe (struct params *params) {int ret;unsigned i;
@@ -1482,7 +1482,7 @@ static void sscape_exit(void) } -static int __init sscape_init (void ) +static int __devinit sscape_init (void ) {int ret;
sound/isa/wavefront/wavefront.c +1 -1
@@ -672,7 +672,7 @@ static struct pnp_card_driver wavefront_#endif /* CONFIG_PNP */ -static int __init alsa_card_wavefront_init (void ) +static int __devinit alsa_card_wavefront_init (void ) {int cards =0 ;int dev;
sound/isa/wavefront/wavefront_fx.c +18 -18
@@ -34,7 +34,7 @@/* weird stuff, derived from port I/O tracing with dosemu */ -static unsigned char page_zero[]__initdata = { +static unsigned char page_zero[]__devinitdata = {0x01 ,0x7c ,0x00 ,0x1e ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0xf5 ,0x00 ,0x11 ,0x00 ,0x20 ,0x00 ,0x32 ,0x00 ,0x40 ,0x00 ,0x13 ,0x00 ,0x00 ,0x00 ,0x14 ,0x02 ,0x76 ,0x00 ,0x60 ,0x00 ,0x80 ,0x02 ,0x00 ,0x00 ,
@@ -61,7 +61,7 @@ static unsigned char page_zero[] __initd0x1d ,0x02 ,0xdf }; -static unsigned char page_one[]__initdata = { +static unsigned char page_one[]__devinitdata = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x02 ,0x00 ,0x00 ,0x19 ,0x00 ,0x1f ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x03 ,0xd8 ,0x00 ,0x00 , 0x02, 0x20, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x01,
@@ -88,7 +88,7 @@ static unsigned char page_one[] __initda0x60 ,0x00 ,0x1b }; -static unsigned char page_two[]__initdata = { +static unsigned char page_two[]__devinitdata = {0xc4 ,0x00 ,0x44 ,0x07 ,0x44 ,0x00 ,0x40 ,0x25 ,0x01 ,0x06 ,0xc4 ,0x07 ,0x40 ,0x25 ,0x01 ,0x00 ,0x46 ,0x46 ,0x00 ,0x00 ,0x00 ,0x00 , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -103,7 +103,7 @@ static unsigned char page_two[] __initda0x46 ,0x05 ,0x46 ,0x07 ,0x46 ,0x07 ,0x44 }; -static unsigned char page_three[]__initdata = { +static unsigned char page_three[]__devinitdata = {0x07 ,0x40 ,0x00 ,0x00 ,0x00 ,0x47 ,0x00 ,0x40 ,0x00 ,0x40 ,0x06 ,0x40 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -118,7 +118,7 @@ static unsigned char page_three[] __init0x02 ,0x00 ,0x42 ,0x00 ,0xc0 ,0x00 ,0x40 }; -static unsigned char page_four[]__initdata = { +static unsigned char page_four[]__devinitdata = {0x63 ,0x03 ,0x26 ,0x02 ,0x2c ,0x00 ,0x24 ,0x00 ,0x2e ,0x02 ,0x02 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -133,7 +133,7 @@ static unsigned char page_four[] __initd0x02 ,0x62 ,0x02 ,0x20 ,0x01 ,0x21 ,0x01 }; -static unsigned char page_six[]__initdata = { +static unsigned char page_six[]__devinitdata = {0x00 ,0x00 ,0x00 ,0x02 ,0x00 ,0x00 ,0x04 ,0x00 ,0x00 ,0x06 ,0x00 ,0x00 ,0x08 ,0x00 ,0x00 ,0x0a ,0x00 ,0x00 ,0x0c ,0x00 ,0x00 ,0x0e , 0x00, 0x00, 0x10, 0x00, 0x00, 0x12, 0x00, 0x00, 0x14, 0x00, 0x00,
@@ -154,7 +154,7 @@ static unsigned char page_six[] __initda0x80 ,0x00 ,0x7e ,0x80 ,0x80 }; -static unsigned char page_seven[]__initdata = { +static unsigned char page_seven[]__devinitdata = {0x0f ,0xff ,0x00 ,0x00 ,0x08 ,0x00 ,0x08 ,0x00 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x0f ,0xff ,0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 , 0x08, 0x00, 0x00, 0x00, 0x0f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x0f,
@@ -181,7 +181,7 @@ static unsigned char page_seven[] __init0x00 ,0x02 ,0x00 }; -static unsigned char page_zero_v2[]__initdata = { +static unsigned char page_zero_v2[]__devinitdata = {0x00 ,0x00 ,0x00 ,0x00 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -193,7 +193,7 @@ static unsigned char page_zero_v2[] __in0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; -static unsigned char page_one_v2[]__initdata = { +static unsigned char page_one_v2[]__devinitdata = {0x01 ,0xc0 ,0x01 ,0xfa ,0x00 ,0x1a ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -205,21 +205,21 @@ static unsigned char page_one_v2[] __ini0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; -static unsigned char page_two_v2[]__initdata = { +static unsigned char page_two_v2[]__devinitdata = {0x46 ,0x46 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; -static unsigned char page_three_v2[]__initdata = { +static unsigned char page_three_v2[]__devinitdata = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; -static unsigned char page_four_v2[]__initdata = { +static unsigned char page_four_v2[]__devinitdata = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -227,7 +227,7 @@ static unsigned char page_four_v2[] __in0x00 ,0x00 ,0x00 ,0x00 }; -static unsigned char page_seven_v2[]__initdata = { +static unsigned char page_seven_v2[]__devinitdata = {0x0f ,0xff ,0x0f ,0xff ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -239,7 +239,7 @@ static unsigned char page_seven_v2[] __i0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; -static unsigned char mod_v2[]__initdata = { +static unsigned char mod_v2[]__devinitdata = {0x01 ,0x00 ,0x02 ,0x00 ,0x01 ,0x01 ,0x02 ,0x00 ,0x01 ,0x02 ,0x02 ,0x00 ,0x01 ,0x03 ,0x02 ,0x00 ,0x01 ,0x04 ,0x02 ,0x00 ,0x01 ,0x05 , 0x02, 0x00, 0x01, 0x06, 0x02, 0x00, 0x01, 0x07, 0x02, 0x00, 0xb0,
@@ -269,7 +269,7 @@ static unsigned char mod_v2[] __initdata0x02 ,0x01 ,0x01 ,0x04 ,0x02 ,0x01 ,0x01 ,0x05 ,0x02 ,0x01 ,0x01 ,0x06 ,0x02 ,0x01 ,0x01 ,0x07 ,0x02 ,0x01 }; -static unsigned char coefficients[]__initdata = { +static unsigned char coefficients[]__devinitdata = {0x07 ,0x46 ,0x00 ,0x00 ,0x07 ,0x49 ,0x00 ,0x00 ,0x00 ,0x4b ,0x03 ,0x11 ,0x00 ,0x4d ,0x01 ,0x32 ,0x07 ,0x46 ,0x00 ,0x00 ,0x07 ,0x49 , 0x00, 0x00, 0x07, 0x40, 0x00, 0x00, 0x07, 0x41, 0x00, 0x00, 0x01,
@@ -305,14 +305,14 @@ static unsigned char coefficients[] __in0x06 ,0x6c ,0x4c ,0x6c ,0x06 ,0x50 ,0x52 ,0xe2 ,0x06 ,0x42 ,0x02 ,0xba }; -static unsigned char coefficients2[]__initdata = { +static unsigned char coefficients2[]__devinitdata = {0x07 ,0x46 ,0x00 ,0x00 ,0x07 ,0x49 ,0x00 ,0x00 ,0x07 ,0x45 ,0x0f ,0xff ,0x07 ,0x48 ,0x0f ,0xff ,0x07 ,0x7b ,0x04 ,0xcc ,0x07 ,0x7d ,0x04 ,0xcc ,0x07 ,0x7c ,0x00 ,0x00 ,0x07 ,0x7e ,0x00 ,0x00 ,0x07 ,0x46 ,0x00 ,0x00 ,0x07 ,0x49 ,0x00 ,0x00 ,0x07 ,0x47 ,0x00 ,0x00 ,0x07 ,0x4a ,0x00 ,0x00 ,0x07 ,0x4c ,0x00 ,0x00 ,0x07 ,0x4e ,0x00 ,0x00 }; -static unsigned char coefficients3[]__initdata = { +static unsigned char coefficients3[]__devinitdata = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x28 ,0x00 ,0x28 ,0x00 ,0x51 ,0x00 ,0x51 ,0x00 ,0x7a ,0x00 ,0x7a ,0x00 ,0xa3 ,0x00 ,0xa3 ,0x00 ,0xcc , 0x00, 0xcc, 0x00, 0xf5, 0x00, 0xf5, 0x01, 0x1e, 0x01, 0x1e, 0x01,
@@ -563,7 +563,7 @@ snd_wavefront_fx_ioctl (snd_hwdep_t *sde*/ -int __init +int __devinit snd_wavefront_fx_start (snd_wavefront_t *dev) {
sound/isa/wavefront/wavefront_midi.c +1 -1
@@ -474,7 +474,7 @@ snd_wavefront_midi_disable_virtual (snd_spin_unlock_irqrestore (&card->wavefront.midi.virtual, flags); } -int __init +int __devinit snd_wavefront_midi_start (snd_wavefront_card_t *card) {
sound/isa/wavefront/wavefront_synth.c +7 -7
@@ -1746,7 +1746,7 @@ snd_wavefront_internal_interrupt (snd_wa7 Unused */ -static int __init +static int __devinit snd_wavefront_interrupt_bits (int irq) {
@@ -1774,7 +1774,7 @@ snd_wavefront_interrupt_bits (int irq)return bits; } -static void __init +static void __devinit wavefront_should_cause_interrupt (snd_wavefront_t *dev,int val,int port,int timeout)
@@ -1796,7 +1796,7 @@ wavefront_should_cause_interrupt (snd_wa } } -static int __init +static int __devinit wavefront_reset_to_cleanliness (snd_wavefront_t *dev) {
@@ -1955,7 +1955,7 @@ wavefront_reset_to_cleanliness (snd_wave#include <asm/uaccess.h> -static int __init +static int __devinit wavefront_download_firmware (snd_wavefront_t *dev,char *path) {
@@ -2056,7 +2056,7 @@ wavefront_download_firmware (snd_wavefro } -static int __init +static int __devinit wavefront_do_reset (snd_wavefront_t *dev) {
@@ -2145,7 +2145,7 @@ wavefront_do_reset (snd_wavefront_t *devreturn 1 ; } -int __init +int __devinit snd_wavefront_start (snd_wavefront_t *dev) {
@@ -2187,7 +2187,7 @@ snd_wavefront_start (snd_wavefront_t *dereturn (0 ); } -int __init +int __devinit snd_wavefront_detect (snd_wavefront_card_t *card) {
sound/last.c +2 -2
@@ -24,7 +24,7 @@#include <linux/init.h> #include <sound/core.h> -static int __init alsa_sound_last_init (void ) +static int __devinit alsa_sound_last_init (void ) {int idx, ok =0 ;
@@ -39,4 +39,4 @@ static int __init alsa_sound_last_init(vreturn 0 ; } -__initcall (alsa_sound_last_init); +__devinitcall (alsa_sound_last_init);
sound/mips/au1x00.c +1 -1
@@ -625,7 +625,7 @@ snd_au1000_free(snd_card_t *card) } -static int __init +static int __devinit au1000_init (void ) {int err;
sound/oss/aci.c +1 -1
@@ -598,7 +598,7 @@ static struct mixer_operations aci_mixer* from the inputs to the codec output are muted. */ -static int __init attach_aci (void ) +static int __devinit attach_aci (void ) {char *boardname;int i, rc = -EBUSY ;
sound/oss/ad1816.c +10 -10
@@ -965,7 +965,7 @@ static struct mixer_operations ad1816_mi/* check if AD1816 present at specified hw_config and register device with OS * return 1 if initialization was successful, 0 otherwise */ -static int __init ad1816_init_card (struct address_info *hw_config, +static int __devinit ad1816_init_card (struct address_info *hw_config,struct pnp_dev *pnp) {ad1816_info *devc =NULL ;
@@ -1206,10 +1206,10 @@ static void __exit unload_card(ad1816_inprintk (KERN_WARNING "ad1816: no device/card specified\n" ); } -static int __initdata io =-1 ; -static int __initdata irq =-1 ; -static int __initdata dma =-1 ; -static int __initdata dma2 =-1 ; +static int __devinitdata io =-1 ; +static int __devinitdata irq =-1 ; +static int __devinitdata dma =-1 ; +static int __devinitdata dma2 =-1 ;#ifdef __ISAPNP__/* use isapnp for configuration */
@@ -1232,7 +1232,7 @@ static struct {unsigned short vendor;unsigned short function;struct ad1816_data *data; -} isapnp_ad1816_list[] __initdata = { +} isapnp_ad1816_list[] __devinitdata = { {ISAPNP_ANY_ID ,ISAPNP_ANY_ID ,ISAPNP_VENDOR ('A' ,'D' ,'S' ),ISAPNP_FUNCTION (0x7150 ), NULL },
@@ -1245,7 +1245,7 @@ static struct {MODULE_DEVICE_TABLE (isapnp, isapnp_ad1816_list); -static void __init ad1816_config_pnp_card (struct pnp_card *card, +static void __devinit ad1816_config_pnp_card (struct pnp_card *card,unsigned short vendor,unsigned short function) {
@@ -1271,7 +1271,7 @@ static void __init ad1816_config_pnp_car } } -static void __init ad1816_config_pnp_cards (void ) +static void __devinit ad1816_config_pnp_cards (void ) {int nr_pnp_cfg;int i;
@@ -1299,7 +1299,7 @@ static void __init ad1816_config_pnp_car#endif /* module initialization */ -static int __init init_ad1816 (void ) +static int __devinit init_ad1816 (void ) {printk (KERN_INFO "ad1816: AD1816 sounddriver " "Copyright (C) 1998-2003 by Thorsten Knabe and "
@@ -1350,7 +1350,7 @@ module_exit(cleanup_ad1816);#ifndef MODULE /* kernel command line parameter evaluation */ -static int __init setup_ad1816 (char *str) +static int __devinit setup_ad1816 (char *str) {/* io, irq, dma, dma2 */ int ints[5 ];
sound/oss/ad1848.c +10 -10
@@ -2898,11 +2898,11 @@ EXPORT_SYMBOL(probe_ms_sound);EXPORT_SYMBOL (attach_ms_sound);EXPORT_SYMBOL (unload_ms_sound); -static int __initdata io =-1 ; -static int __initdata irq =-1 ; -static int __initdata dma =-1 ; -static int __initdata dma2 =-1 ; -static int __initdata type =0 ; +static int __devinitdata io =-1 ; +static int __devinitdata irq =-1 ; +static int __devinitdata dma =-1 ; +static int __devinitdata dma2 =-1 ; +static int __devinitdata type =0 ;module_param (io, int,0 );/* I/O for a raw AD1848 card */ module_param (irq, int,0 );/* IRQ to use */
@@ -2930,7 +2930,7 @@ static struct { vendor, function;short mss_io, irq, dma, dma2;/* index into isapnp table */ int type; -} ad1848_isapnp_list[] __initdata = { +} ad1848_isapnp_list[] __devinitdata = { {"CMI 8330 SoundPRO" ,ISAPNP_VENDOR ('C' ,'M' ,'I' ),ISAPNP_DEVICE (0x0001 ), ISAPNP_VENDOR('@','@','@'), ISAPNP_FUNCTION(0x0001),
@@ -3015,7 +3015,7 @@ static struct pnp_dev *ad1848_init_generreturn (ad1848_dev); } -static int __init ad1848_isapnp_init (struct address_info *hw_config,struct pnp_card *bus,int slot) +static int __devinit ad1848_isapnp_init (struct address_info *hw_config,struct pnp_card *bus,int slot) {char *busname = bus->name[0 ] ? bus->name : ad1848_isapnp_list[slot].name;
@@ -3033,7 +3033,7 @@ static int __init ad1848_isapnp_init(strreturn 0 ; } -static int __init ad1848_isapnp_probe (struct address_info *hw_config) +static int __devinit ad1848_isapnp_probe (struct address_info *hw_config) {static int first =1 ;int i;
@@ -3072,7 +3072,7 @@ static int __init ad1848_isapnp_probe(st#endif -static int __init init_ad1848 (void ) +static int __devinit init_ad1848 (void ) {printk (KERN_INFO "ad1848/cs4248 codec driver Copyright (C) by Hannu Savolainen 1993-1996\n" );
@@ -3137,7 +3137,7 @@ module_init(init_ad1848);module_exit (cleanup_ad1848);#ifndef MODULE -static int __init setup_ad1848 (char *str) +static int __devinit setup_ad1848 (char *str) {/* io, irq, dma, dma2, type */ int ints[6 ];
sound/oss/ad1889.c +1 -1
@@ -1087,7 +1087,7 @@ static struct pci_driver ad1889_driver = .remove = __devexit_p(ad1889_remove), }; -static int __init ad1889_init_module (void ) +static int __devinit ad1889_init_module (void ) {return pci_module_init (&ad1889_driver); }
sound/oss/adlib_card.c +5 -5
@@ -17,23 +17,23 @@#include "opl3.h" -static void __init attach_adlib_card (struct address_info *hw_config) +static void __devinit attach_adlib_card (struct address_info *hw_config) { hw_config->slots[0 ] =opl3_init (hw_config->io_base, hw_config->osp,THIS_MODULE ); } -static int __init probe_adlib (struct address_info *hw_config) +static int __devinit probe_adlib (struct address_info *hw_config) {return opl3_detect (hw_config->io_base, hw_config->osp); }static struct address_info cfg; -static int __initdata io =-1 ; +static int __devinitdata io =-1 ;module_param (io, int,0 ); -static int __init init_adlib (void ) +static int __devinit init_adlib (void ) { cfg.io_base = io;
@@ -58,7 +58,7 @@ module_init(init_adlib);module_exit (cleanup_adlib);#ifndef MODULE -static int __init setup_adlib (char *str) +static int __devinit setup_adlib (char *str) {/* io */ int ints[2 ];
sound/oss/aedsp16.c +41 -41
271 lines not on this page · raw message
sound/oss/ali5455.c +1 -1
@@ -3670,7 +3670,7 @@ static struct pci_driver ali_pci_driver#endif /* CONFIG_PM */ }; -static int __init ali_init_module (void ) +static int __devinit ali_init_module (void ) {printk (KERN_INFO "ALI 5455 + AC97 Audio, version " DRIVER_VERSION ", " __TIME__" " __DATE__"\n" );
sound/oss/au1000.c +2 -2
@@ -2172,7 +2172,7 @@ static void au1000_remove(void)unregister_sound_mixer (s->codec.dev_mixer); } -static int __init init_au1000 (void ) +static int __devinit init_au1000 (void ) {info ("[email protected], built " __TIME__" on " __DATE__);return au1000_probe ();
@@ -2191,7 +2191,7 @@ module_exit(cleanup_au1000);#ifndef MODULE -static int __init au1000_setup (char *options) +static int __devinit au1000_setup (char *options) {char *this_opt;
sound/oss/au1550_ac97.c +2 -2
@@ -2078,7 +2078,7 @@ au1550_remove(void)ac97_release_codec (s->codec); } -static int __init +static int __devinit init_au1550 (void ) {return au1550_probe ();
@@ -2095,7 +2095,7 @@ module_exit(cleanup_au1550);#ifndef MODULE -static int __init +static int __devinit au1550_setup (char *options) {char *this_opt;
sound/oss/awe_wave.c +9 -9
@@ -4123,7 +4123,7 @@ static struct mixer_operations awe_mixer .ioctl = awe_mixer_ioctl, }; -static void __init attach_mixer (void ) +static void __devinit attach_mixer (void ) {if ((my_mixerdev =sound_alloc_mixerdev ()) >=0 ) { mixer_devs[my_mixerdev] = &awe_mixer_operations;
@@ -4589,7 +4589,7 @@ awe_close_dram(void)#define UNIQUE_ID2 0x4321#define UNIQUE_ID3 0xABCD -static void __init +static void __devinit awe_check_dram (void ) {if (awe_present)/* already initialized */
@@ -4960,7 +4960,7 @@ static struct midi_operations awe_midi_ostatic int my_mididev =-1 ; -static void __init attach_midiemu (void ) +static void __devinit attach_midiemu (void ) {if ((my_mididev =sound_alloc_mididev ()) <0 )printk ("Sound: Too many midi devices detected\n" );
@@ -6005,7 +6005,7 @@ static void awe_dettach_device(void)/* detect emu8000 chip on the specified address; from VV's guide */ -static int __init +static int __devinit awe_detect_base (int addr) {setup_ports (addr,0 ,0 );
@@ -6019,7 +6019,7 @@ awe_detect_base(int addr)return 1 ; } -static int __init awe_detect_legacy_devices (void ) +static int __devinit awe_detect_legacy_devices (void ) {int base;for (base =0x620 ; base <=0x680 ; base +=0x20 )
@@ -6082,7 +6082,7 @@ static struct pnp_driver awe_pnp_driver .remove = awe_pnp_remove, }; -static int __init awe_detect_pnp_devices (void ) +static int __devinit awe_detect_pnp_devices (void ) {int ret;
@@ -6097,7 +6097,7 @@ static int __init awe_detect_pnp_devices* device / lowlevel (module) interface */ -static int __init +static int __devinit awe_detect (void ) {printk (KERN_INFO "AWE32: Probing for WaveTable...\n" );
@@ -6113,7 +6113,7 @@ awe_detect(void)return 0 ; } -static int __init attach_awe (void ) +static int __devinit attach_awe (void ) {return awe_detect () ?0 : -ENODEV ; }
@@ -6129,7 +6129,7 @@ module_init(attach_awe);module_exit (unload_awe);#ifndef MODULE -static int __init setup_awe (char *str) +static int __devinit setup_awe (char *str) {/* io, memsize, isapnp */ int ints[4 ];
sound/oss/bin2hex.c +1 -1
@@ -24,7 +24,7 @@ int main( int argc, const char * argv [] varname = argv[1 ];printf ("/* automatically generated by bin2hex */\n" ); -printf ("static unsigned char %s [] %s =\n{\n" , varname , id?"__initdata" :"" ); +printf ("static unsigned char %s [] %s =\n{\n" , varname , id?"__devinitdata" :"" );while ( ( c =getchar ( ) ) !=EOF ) {
sound/oss/cmpci.c +1 -1
@@ -3363,7 +3363,7 @@ static struct pci_driver cm_driver = { .remove = __devexit_p(cm_remove) }; -static int __init init_cmpci (void ) +static int __devinit init_cmpci (void ) {printk (KERN_INFO "cmpci: version $Revision: 6.82 $ time " __TIME__" " __DATE__"\n" );return pci_module_init (&cm_driver);
sound/oss/cs4232.c +14 -14
@@ -43,7 +43,7 @@* simple cleanups * Arnaldo C. de Melo got rid of attach_uart401 * Bartlomiej Zolnierkiewicz -* Added some __init/__initdata/__exit +* Added some __devinit/__devinitdata/__exit * Marcus Meissner Added ISA PnP support. */
@@ -72,7 +72,7 @@ static void CS_OUT(unsigned char a)#define CS_OUT2 (a, b) {CS_OUT(a);CS_OUT(b);}#define CS_OUT3 (a, b, c) {CS_OUT(a);CS_OUT(b);CS_OUT(c);} -static int __initdata bss =0 ; +static int __devinitdata bss =0 ;static int mpu_base, mpu_irq;static int synth_base, synth_irq;static int mpu_detected;
@@ -127,7 +127,7 @@ static void enable_xctrl(int baseio)outb (((unsigned char ) (ENABLE_PINS | regd)), baseio +INDEX_DATA ); } -static int __init probe_cs4232 (struct address_info *hw_config,int isapnp_configured) +static int __devinit probe_cs4232 (struct address_info *hw_config,int isapnp_configured) {int i, n;int base = hw_config->io_base, irq = hw_config->irq;
@@ -348,15 +348,15 @@ static void __devexit unload_cs4232(strustatic struct address_info cfg;static struct address_info cfg_mpu; -static int __initdata io =-1 ; -static int __initdata irq =-1 ; -static int __initdata dma =-1 ; -static int __initdata dma2 =-1 ; -static int __initdata mpuio =-1 ; -static int __initdata mpuirq =-1 ; -static int __initdata synthio =-1 ; -static int __initdata synthirq =-1 ; -static int __initdata isapnp =1 ; +static int __devinitdata io =-1 ; +static int __devinitdata irq =-1 ; +static int __devinitdata dma =-1 ; +static int __devinitdata dma2 =-1 ; +static int __devinitdata mpuio =-1 ; +static int __devinitdata mpuirq =-1 ; +static int __devinitdata synthio =-1 ; +static int __devinitdata synthirq =-1 ; +static int __devinitdata isapnp =1 ;MODULE_DESCRIPTION ("CS4232 based soundcard driver" );MODULE_AUTHOR ("Hannu Savolainen, Paul Barton-Davis" );
@@ -438,7 +438,7 @@ static struct pnp_driver cs4232_driver = .remove = __devexit_p(cs4232_pnp_remove), }; -static int __init init_cs4232 (void ) +static int __devinit init_cs4232 (void ) {#ifdef CONFIG_SOUND_WAVEFRONT_MODULE if (synthio ==-1 )
@@ -495,7 +495,7 @@ module_init(init_cs4232);module_exit (cleanup_cs4232);#ifndef MODULE -static int __init setup_cs4232 (char *str) +static int __devinit setup_cs4232 (char *str) {/* io, irq, dma, dma2 mpuio, mpuirq*/ int ints[7 ];
sound/oss/cs4281/cs4281m.c +1 -1
@@ -4468,7 +4468,7 @@ static struct pci_driver cs4281_pci_driv .resume = CS4281_RESUME_TBL, }; -static int __init cs4281_init_module (void ) +static int __devinit cs4281_init_module (void ) {int rtn =0 ; CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO
sound/oss/cs46xx.c +2 -2
@@ -4213,7 +4213,7 @@ static /*const*/ struct file_operations };/* AC97 codec initialisation. */ -static int __init cs_ac97_init (struct cs_card *card) +static int __devinit cs_ac97_init (struct cs_card *card) {int num_ac97 =0 ;int ready_2nd =0 ;
@@ -5706,7 +5706,7 @@ static struct pci_driver cs46xx_pci_driv .resume = CS46XX_RESUME_TBL, }; -static int __init cs46xx_init_module (void ) +static int __devinit cs46xx_init_module (void ) {int rtn =0 ; CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO
sound/oss/dmasound/dmasound_atari.c +4 -4
@@ -820,7 +820,7 @@ static void AtaFree(void *obj, unsignedatari_stram_free ( obj ); } -static int __init AtaIrqInit (void ) +static int __devinit AtaIrqInit (void ) {/* Set up timer A. Timer A will receive a signal upon end of playing from the sound
@@ -1320,7 +1320,7 @@ static irqreturn_t AtaInterrupt(int irq,#define RECLEVEL_GAIN_TO_VOXWARE (v) (((v) * 20 + 2) / 3) -static void __init TTMixerInit (void ) +static void __devinit TTMixerInit (void ) {atari_microwire_cmd (MW_LM1992_VOLUME (0 )); dmasound.volume_left =0 ;
@@ -1331,7 +1331,7 @@ static void __init TTMixerInit(void)atari_microwire_cmd (MW_LM1992_BASS (0 )); } -static void __init FalconMixerInit (void ) +static void __devinit FalconMixerInit (void ) { dmasound.volume_left = (tt_dmasnd.output_atten &0xf00 ) >>8 ; dmasound.volume_right = (tt_dmasnd.output_atten &0xf0 ) >>4 ;
@@ -1565,7 +1565,7 @@ static MACHINE machFalcon = {/*** Config & Setup **********************************************************/ -static int __init dmasound_atari_init (void ) +static int __devinit dmasound_atari_init (void ) {if (MACH_IS_ATARI &&ATARIHW_PRESENT (PCM_8BIT )) {if (ATARIHW_PRESENT (CODEC )) {
sound/oss/dmasound/dmasound_awacs.c +14 -14
@@ -581,7 +581,7 @@ tas_mixer_ioctl(u_int cmd, u_long arg)return rc; } -static void __init +static void __devinit tas_init_frame_rates (unsigned int *prop,unsigned int l) {int i ;
@@ -624,7 +624,7 @@ static void PMacFree(void *ptr, unsignedkfree (ptr); } -static int __init PMacIrqInit (void ) +static int __devinit PMacIrqInit (void ) {if (awacs)if (request_irq (awacs_irq, pmac_awacs_intr,0 ,"Built-in Sound misc" ,NULL ))
@@ -2524,7 +2524,7 @@ static MACHINE machPMac = {/* Check for pmac models that we care about in terms of special actions. */ -void __init +void __devinit set_model (void ) {/* portables/lap-tops */
@@ -2551,7 +2551,7 @@ set_model(void)code that looks for chip properties knows how to go about it. */ -static struct device_node *__init +static struct device_node *__devinit get_snd_io_node (void ) {struct device_node *np =NULL ;
@@ -2593,7 +2593,7 @@ get_snd_io_node(void)we have to deduce the info other ways for these. */ -static struct device_node *__init +static struct device_node *__devinit get_snd_info_node (struct device_node *io) {struct device_node *info;
@@ -2607,7 +2607,7 @@ get_snd_info_node(struct device_node *io/* Find out what type of codec we have. */ -static int __init +static int __devinit get_codec_type (struct device_node *info) {/* already set if pre-davbus model and info will be NULL */
@@ -2633,7 +2633,7 @@ get_codec_type(struct device_node *info)/* find out what type, if any, of expansion card we have */ -static void __init +static void __devinit get_expansion_type (void ) {if (find_devices ("perch" ) !=NULL )
@@ -2652,7 +2652,7 @@ get_expansion_type(void)* Set dmasound.mach.max_dsp_rate on the basis of these routines. */ -static void __init +static void __devinit awacs_init_frame_rates (unsigned int *prop,unsigned int l) {int i ;
@@ -2675,7 +2675,7 @@ awacs_init_frame_rates(unsigned int *pro/* else we assume that all the rates are available */ } -static void __init +static void __devinit burgundy_init_frame_rates (unsigned int *prop,unsigned int l) {int temp[9 ] ;
@@ -2701,7 +2701,7 @@ if (i > 1){#endif } -static void __init +static void __devinit daca_init_frame_rates (unsigned int *prop,unsigned int l) {int temp[9 ] ;
@@ -2728,7 +2728,7 @@ if (i > 1){#endif } -static void __init +static void __devinit init_frame_rates (unsigned int *prop,unsigned int l) {switch (awacs_revision) {
@@ -2751,7 +2751,7 @@ init_frame_rates(unsigned int *prop, uns/* find things/machines that can't do mac-io byteswap */ -static void __init +static void __devinit set_hw_byteswap (struct device_node *io) {struct device_node *mio ;
@@ -2779,7 +2779,7 @@ set_hw_byteswap(struct device_node *io)*/ int32_t -__init setup_beep (void ) +__devinit setup_beep (void ) {/* Initialize beep stuff */ /* want one cmd buffer for beeps, and a second one for emergencies
@@ -2816,7 +2816,7 @@ static struct input_dev awacs_beep_dev = }, }; -int __init dmasound_awacs_init (void ) +int __devinit dmasound_awacs_init (void ) {struct device_node *io =NULL , *info =NULL ;int vol, res;
sound/oss/dmasound/dmasound_paula.c +3 -3
@@ -327,7 +327,7 @@ static void AmiFree(void *obj, unsignedamiga_chip_free (obj); } -static int __init AmiIrqInit (void ) +static int __devinit AmiIrqInit (void ) {/* turn off DMA for audio channels */ StopDMA ();
@@ -606,7 +606,7 @@ static irqreturn_t AmiInterrupt(int irq,* /dev/mixer abstraction */ -static void __init AmiMixerInit (void ) +static void __devinit AmiMixerInit (void ) { dmasound.volume_left =64 ; dmasound.volume_right =64 ;
@@ -713,7 +713,7 @@ static MACHINE machAmiga = {/*** Config & Setup **********************************************************/ -int __init dmasound_paula_init (void ) +int __devinit dmasound_paula_init (void ) {int err;
sound/oss/dmasound/dmasound_q40.c +2 -2
@@ -368,7 +368,7 @@ static void Q40Free(void *ptr, unsignedkfree (ptr); } -static int __init Q40IrqInit (void ) +static int __devinit Q40IrqInit (void ) {/* Register interrupt handler. */ request_irq(Q40_IRQ_SAMPLE, Q40StereoInterrupt, 0,
@@ -611,7 +611,7 @@ static MACHINE machQ40 = {/*** Config & Setup **********************************************************/ -int __init dmasound_q40_init (void ) +int __devinit dmasound_q40_init (void ) {if (MACH_IS_Q40 ) { dmasound.mach = machQ40;
sound/oss/dmasound/tas_common.c +1 -1
@@ -188,7 +188,7 @@ tas_cleanup(void)i2c_del_driver (&tas_driver); } -int __init +int __devinit tas_init (int driver_id,const char *driver_name) {u32 * paddr;
sound/oss/emu10k1/main.c +1 -1
@@ -1424,7 +1424,7 @@ static struct pci_driver emu10k1_pci_dri .remove = __devexit_p(emu10k1_remove), }; -static int __init emu10k1_init_module (void ) +static int __devinit emu10k1_init_module (void ) {printk (KERN_INFO "Creative EMU10K1 PCI Audio Driver, version " DRIVER_VERSION ", " __TIME__" " __DATE__"\n" );
sound/oss/es1370.c +4 -4
@@ -98,7 +98,7 @@* 28.06.1999 0.24 Add pci_set_master * 02.08.1999 0.25 Added workaround for the "phantom write" bug first * documented by Dave Sharpless from Anchor Games -* 03.08.1999 0.26 adapt to Linus' new __setup/__initcall +* 03.08.1999 0.26 adapt to Linus' new __setup/__devinitcall * added kernel command line option "es1370=joystick[,lineout[,micbias]]" * removed CONFIG_SOUND_ES1370_JOYPORT_BOOT kludge * 12.08.1999 0.27 module_init/__setup fixes
@@ -2776,7 +2776,7 @@ static struct pci_driver es1370_driver = .remove = __devexit_p(es1370_remove), }; -static int __init init_es1370 (void ) +static int __devinit init_es1370 (void ) {printk (KERN_INFO "es1370: version v0.38 time " __TIME__" " __DATE__"\n" );return pci_module_init (&es1370_driver);
@@ -2797,9 +2797,9 @@ module_exit(cleanup_es1370);/* format is: es1370=lineout[,micbias]] */ -static int __init es1370_setup (char *str) +static int __devinit es1370_setup (char *str) { -static unsigned __initdata nr_dev =0 ; +static unsigned __devinitdata nr_dev =0 ;if (nr_dev >=NR_DEVICE )return 0 ;
sound/oss/es1371.c +4 -4
@@ -62,7 +62,7 @@* 15.06.1999 0.12 Fix bad allocation bug. * Thanks to Deti Fliegl <[email protected]> * 28.06.1999 0.13 Add pci_set_master -* 03.08.1999 0.14 adapt to Linus' new __setup/__initcall +* 03.08.1999 0.14 adapt to Linus' new __setup/__devinitcall * added kernel command line option "es1371=joystickaddr" * removed CONFIG_SOUND_ES1371_JOYPORT_BOOT kludge * 10.08.1999 0.15 (Re)added S/PDIF module option for cards revision >= 4.
@@ -3087,7 +3087,7 @@ static struct pci_driver es1371_driver = .remove = __devexit_p(es1371_remove), }; -static int __init init_es1371 (void ) +static int __devinit init_es1371 (void ) { printk(KERN_INFO PFX "version v0.32 time " __TIME__ " " __DATE__ "\n");return pci_module_init (&es1371_driver);
@@ -3108,9 +3108,9 @@ module_exit(cleanup_es1371);/* format is: es1371=[spdif,[nomix,[amplifier]]] */ -static int __init es1371_setup (char *str) +static int __devinit es1371_setup (char *str) { -static unsigned __initdata nr_dev =0 ; +static unsigned __devinitdata nr_dev =0 ;if (nr_dev >=NR_DEVICE )return 0 ;
sound/oss/esssolo1.c +1 -1
@@ -2488,7 +2488,7 @@ static struct pci_driver solo1_driver = }; -static int __init init_solo1 (void ) +static int __devinit init_solo1 (void ) {printk (KERN_INFO "solo1: version v0.20 time " __TIME__" " __DATE__"\n" );return pci_register_driver (&solo1_driver);
sound/oss/forte.c +3 -3
@@ -1838,7 +1838,7 @@ forte_proc_read (char *page, char **star* Creates driver info entries in /proc */ -static int __init +static int __devinit forte_proc_init (void ) {if (!proc_mkdir ("driver/forte" ,NULL ))
@@ -1982,7 +1982,7 @@ forte_chip_init (struct forte_chip *chip* Description: * Allocates chip instance, I/O region, and IRQ */ -static int __init +static int __devinit forte_probe (struct pci_dev *pci_dev,const struct pci_device_id *pci_id) {struct forte_chip *chip;
@@ -2107,7 +2107,7 @@ static struct pci_driver forte_pci_drive* */ -static int __init +static int __devinit forte_init_module (void ) { printk (KERN_INFO PFX DRIVER_VERSION "\n");
sound/oss/gus_card.c +10 -10
@@ -37,7 +37,7 @@ int gus_pnp_flag = 0;static int db16;/* Has a Gus16 AD1848 on it */ #endif -static void __init attach_gus (struct address_info *hw_config) +static void __devinit attach_gus (struct address_info *hw_config) {gus_wave_init (hw_config);
@@ -53,7 +53,7 @@ static void __init attach_gus(struct addreturn ; } -static int __init probe_gus (struct address_info *hw_config) +static int __devinit probe_gus (struct address_info *hw_config) {int irq;int io_addr;
@@ -160,7 +160,7 @@ irqreturn_t gusintr(int irq, void *dev_i#ifdef CONFIG_SOUND_GUS16 -static int __init init_gus_db16 (struct address_info *hw_config) +static int __devinit init_gus_db16 (struct address_info *hw_config) {struct resource *ports;
@@ -212,11 +212,11 @@ static int no_wave_dma; /* Set if no dstatic struct address_info cfg; -static int __initdata io =-1 ; -static int __initdata irq =-1 ; -static int __initdata dma =-1 ; -static int __initdata dma16 =-1 ;/* Set this for modules that need it */ -static int __initdata type =0 ;/* 1 for PnP */ +static int __devinitdata io =-1 ; +static int __devinitdata irq =-1 ; +static int __devinitdata dma =-1 ; +static int __devinitdata dma16 =-1 ;/* Set this for modules that need it */ +static int __devinitdata type =0 ;/* 1 for PnP */ module_param (io, int,0 );module_param (irq, int,0 );
@@ -232,7 +232,7 @@ module_param(gus16, int, 0);#endif MODULE_LICENSE ("GPL" ); -static int __init init_gus (void ) +static int __devinit init_gus (void ) {printk (KERN_INFO "Gravis Ultrasound audio driver Copyright (C) by Hannu Savolainen 1993-1996\n" );
@@ -274,7 +274,7 @@ module_init(init_gus);module_exit (cleanup_gus);#ifndef MODULE -static int __init setup_gus (char *str) +static int __devinit setup_gus (char *str) {/* io, irq, dma, dma2 */ int ints[5 ];
sound/oss/gus_midi.c +2 -2
@@ -12,7 +12,7 @@* * Changes: * 11-10-2000 Bartlomiej Zolnierkiewicz <[email protected]> -* Added __init to gus_midi_init() +* Added __devinit to gus_midi_init() */ #include <linux/init.h>
@@ -201,7 +201,7 @@ static struct midi_operations gus_midi_o .buffer_status = gus_midi_buffer_status, }; -void __init gus_midi_init (struct address_info *hw_config) +void __devinit gus_midi_init (struct address_info *hw_config) {int dev =sound_alloc_mididev ();
sound/oss/gus_wave.c +5 -5
@@ -14,7 +14,7 @@* Thomas Sailer : ioctl code reworked (vmalloc/vfree removed) * Frank van de Pol : Fixed GUS MAX interrupt handling. Enabled simultanious * usage of CS4231A codec, GUS wave and MIDI for GUS MAX. -* Bartlomiej Zolnierkiewicz : added some __init/__exit +* Bartlomiej Zolnierkiewicz : added some __devinit/__exit */ #include <linux/init.h>
@@ -803,7 +803,7 @@ static void gus_initialize(void) } -static void __init pnp_mem_init (void ) +static void __devinit pnp_mem_init (void ) {#include "iwmem.h" #define CHUNK_SIZE (256*1024)
@@ -972,7 +972,7 @@ static void __init pnp_mem_init(void)gus_write8 (0x19 , (gus_read8 (0x19 ) |0x01 ) & ~0x02 ); } -int __init gus_wave_detect (int baseaddr) +int __devinit gus_wave_detect (int baseaddr) {unsigned long i, max_mem =1024L ;unsigned long loc;
@@ -2831,7 +2831,7 @@ static struct mixer_operations gus_mixer .ioctl = gus_default_mixer_ioctl }; -static int __init gus_default_mixer_init (void ) +static int __devinit gus_default_mixer_init (void ) {int n;
@@ -2856,7 +2856,7 @@ static int __init gus_default_mixer_initreturn n; } -void __init gus_wave_init (struct address_info *hw_config) +void __devinit gus_wave_init (struct address_info *hw_config) {unsigned long flags;unsigned char val;
sound/oss/hal2.c +1 -1
@@ -1516,7 +1516,7 @@ extern void (*indy_volume_button)(int);* Assuming only one HAL2 card. Mail me if you ever meet machine with * more than one. */ -static int __init init_hal2 (void ) +static int __devinit init_hal2 (void ) {int i, error;
sound/oss/harmony.c +4 -4
@@ -220,7 +220,7 @@ static struct harmony_buffer played_buf, }while (0 ) -static int __init harmony_alloc_buffer(struct harmony_buffer *b, +static int __devinit harmony_alloc_buffer(struct harmony_buffer *b,unsigned int buffer_count) { b->len = buffer_count *HARMONY_BUF_SIZE ;
@@ -1183,7 +1183,7 @@ static struct file_operations harmony_mi* Mute all the output and reset Harmony. */ -static void __init harmony_mixer_reset (void ) +static void __devinit harmony_mixer_reset (void ) { harmony.current_gain =GAIN_TOTAL_SILENCE ;harmony_mixer_set_gain ();
@@ -1195,7 +1195,7 @@ static void __init harmony_mixer_reset(vharmony_mixer_set_gain (); } -static int __init harmony_mixer_init (void ) +static int __devinit harmony_mixer_init (void ) {/* Register the device file operations */ harmony.mixer_unit =register_sound_mixer (&harmony_mixer_fops,-1 );
@@ -1303,7 +1303,7 @@ static struct parisc_driver harmony_driv .probe = harmony_driver_probe, }; -static int __init init_harmony (void ) +static int __devinit init_harmony (void ) {return register_parisc_driver (&harmony_driver); }
sound/oss/hex2hex.c +1 -1
@@ -87,7 +87,7 @@ int main( int argc, const char * argv []printf ("/*\n *\t Computer generated file. Do not edit.\n */\n" );printf ("static int %s_len = %d;\n" , varline, l); -printf ("static unsigned char %s[] %s = {\n" , varline, id?"__initdata" :"" ); +printf ("static unsigned char %s[] %s = {\n" , varline, id?"__devinitdata" :"" );for (i=0 ;i<l;i++) {
sound/oss/i810_audio.c +1 -1
@@ -3617,7 +3617,7 @@ static struct pci_driver i810_pci_driver }; -static int __init i810_init_module (void ) +static int __devinit i810_init_module (void ) {int retval;
sound/oss/ics2101.c +2 -2
@@ -12,7 +12,7 @@* * * Thomas Sailer : ioctl code reworked (vmalloc/vfree removed) -* Bartlomiej Zolnierkiewicz : added __init to ics2101_mixer_init() +* Bartlomiej Zolnierkiewicz : added __devinit to ics2101_mixer_init() */ #include <linux/init.h> #include <linux/spinlock.h>
@@ -215,7 +215,7 @@ static struct mixer_operations ics2101_m .ioctl = ics2101_mixer_ioctl }; -int __init ics2101_mixer_init (void ) +int __devinit ics2101_mixer_init (void ) {int i;int n;
sound/oss/ite8172.c +3 -3
@@ -2203,7 +2203,7 @@ static struct pci_driver it8172_driver = .remove = __devexit_p(it8172_remove) }; -static int __init init_it8172 (void ) +static int __devinit init_it8172 (void ) {info ("version v0.5 time " __TIME__" " __DATE__);return pci_module_init (&it8172_driver);
@@ -2224,10 +2224,10 @@ module_exit(cleanup_it8172);/* format is: it8172=[spdif],[i2s:<I2S format>] */ -static int __init it8172_setup (char *options) +static int __devinit it8172_setup (char *options) {char * this_opt; -static unsigned __initdata nr_dev =0 ; +static unsigned __devinitdata nr_dev =0 ;if (nr_dev >=NR_DEVICE )return 0 ;
sound/oss/kahlua.c +1 -1
@@ -215,7 +215,7 @@ static struct pci_driver kahlua_driver = }; -static int __init kahlua_init_module (void ) +static int __devinit kahlua_init_module (void ) {printk (KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n" );return pci_module_init (&kahlua_driver);
sound/oss/mad16.c +22 -22
109 lines not on this page · raw message
sound/oss/maestro.c +4 -4
@@ -124,7 +124,7 @@* (still kind of v0.14) Nov 23 - Alan Cox <[email protected]> * Add clocking= for people with seriously warped hardware * (still v0.14) Nov 10 2000 - Bartlomiej Zolnierkiewicz <[email protected]> -* add __init to maestro_ac97_init() and maestro_install() +* add __devinit to maestro_ac97_init() and maestro_install() * (still based on v0.14) Mar 29 2000 - Zach Brown <[email protected]> * move to 2.3 power management interface, which * required hacking some suspend/resume/check paths
@@ -832,7 +832,7 @@ ac97_recmask_io(struct ess_card *card, i* The PT101 setup is untested. */ -static u16 __init maestro_ac97_init (struct ess_card *card) +static u16 __devinit maestro_ac97_init (struct ess_card *card) {u16 vend1, vend2, caps;
@@ -3394,7 +3394,7 @@ parse_power(struct ess_card *card, strucreturn card->power_regs ?1 :0 ; } -static int __init +static int __devinit maestro_probe (struct pci_dev *pcidev,const struct pci_device_id *pdid) {int card_type = pdid->driver_data;
@@ -3629,7 +3629,7 @@ static struct pci_driver maestro_pci_dri .remove = maestro_remove, }; -static int __init init_maestro (void ) +static int __devinit init_maestro (void ) {int rc;
sound/oss/maestro3.c +1 -1
@@ -2933,7 +2933,7 @@ static struct pci_driver m3_pci_driver = .resume = m3_resume, }; -static int __init m3_init_module (void ) +static int __devinit m3_init_module (void ) { printk(KERN_INFO PFX "version " DRIVER_VERSION " built at " __TIME__ " " __DATE__ "\n");
sound/oss/maui.c +8 -8
@@ -15,7 +15,7 @@* system * Christoph Hellwig Adapted to module_init/module_exit * Bartlomiej Zolnierkiewicz -* Added __init to download_code() +* Added __devinit to download_code() * * Status: * Andrew J. Kroll Tested 06/01/1999 with:
@@ -108,7 +108,7 @@ static irqreturn_t mauiintr(int irq, voireturn IRQ_HANDLED ; } -static int __init download_code (void ) +static int __devinit download_code (void ) {int i, lines =0 ;int eol_seen =0 , done =0 ;
@@ -170,7 +170,7 @@ failure:return 0 ; } -static int __init maui_init (int irq) +static int __devinit maui_init (int irq) {unsigned char bits;
@@ -299,7 +299,7 @@ static int maui_load_patch(int dev, intreturn 0 ; } -static int __init probe_maui (struct address_info *hw_config) +static int __devinit probe_maui (struct address_info *hw_config) {struct resource *ports;int this_dev;
@@ -417,8 +417,8 @@ static int fw_load;static struct address_info cfg; -static int __initdata io =-1 ; -static int __initdata irq =-1 ; +static int __devinitdata io =-1 ; +static int __devinitdata irq =-1 ;module_param (io, int,0 );module_param (irq, int,0 );
@@ -427,7 +427,7 @@ module_param(irq, int, 0);* Install a Maui card. Needs mpu401 loaded already. */ -static int __init init_maui (void ) +static int __devinit init_maui (void ) {printk (KERN_INFO "Turtle beach Maui and Tropez driver, Copyright (C) by Hannu Savolainen 1993-1996\n" );
@@ -460,7 +460,7 @@ module_init(init_maui);module_exit (cleanup_maui);#ifndef MODULE -static int __init setup_maui (char *str) +static int __devinit setup_maui (char *str) {/* io, irq */ int ints[3 ];
sound/oss/mpu401.c +3 -3
@@ -13,7 +13,7 @@* * Thomas Sailer ioctl code reworked (vmalloc/vfree removed) * Alan Cox modularisation, use normal request_irq, use dev_id -* Bartlomiej Zolnierkiewicz removed some __init to allow using many drivers +* Bartlomiej Zolnierkiewicz removed some __devinit to allow using many drivers * Chris Rankin Update the module-usage counter for the coprocessor * Zwane Mwaikambo Changed attach/unload resource freeing */
@@ -1772,7 +1772,7 @@ static int irq = -1;module_param (irq, int,0 );module_param (io, int,0 ); -static int __init init_mpu401 (void ) +static int __devinit init_mpu401 (void ) {int ret;/* Can be loaded either for module use or to provide functions
@@ -1807,7 +1807,7 @@ module_init(init_mpu401);module_exit (cleanup_mpu401);#ifndef MODULE -static int __init setup_mpu401 (char *str) +static int __devinit setup_mpu401 (char *str) {/* io, irq */ int ints[3 ];
sound/oss/msnd.c +1 -1
@@ -48,7 +48,7 @@static multisound_dev_t *devs[MSND_MAX_DEVS ];static int num_devs; -int __init msnd_register (multisound_dev_t *dev) +int __devinit msnd_register (multisound_dev_t *dev) {int i;
sound/oss/msnd_pinnacle.c +44 -44
132 lines not on this page · raw message
sound/oss/nec_vrc5477.c +1 -1
Lines of this file are not shown. View the raw message.
sound/oss/nm256_audio.c +4 -4
Lines of this file are not shown. View the raw message.
sound/oss/opl3.c +2 -2
Lines of this file are not shown. View the raw message.
sound/oss/opl3sa.c +12 -12
Lines of this file are not shown. View the raw message.
sound/oss/opl3sa2.c +20 -20
Lines of this file are not shown. View the raw message.
sound/oss/pas2_card.c +15 -15
Lines of this file are not shown. View the raw message.
sound/oss/pas2_midi.c +2 -2
Lines of this file are not shown. View the raw message.
sound/oss/pas2_mixer.c +2 -2
Lines of this file are not shown. View the raw message.
sound/oss/pas2_pcm.c +2 -2
Lines of this file are not shown. View the raw message.
sound/oss/pss.c +13 -13
Lines of this file are not shown. View the raw message.
sound/oss/rme96xx.c +1 -1
Lines of this file are not shown. View the raw message.
sound/oss/sb_card.c +13 -13
Lines of this file are not shown. View the raw message.
sound/oss/sgalaxy.c +11 -11
Lines of this file are not shown. View the raw message.
sound/oss/sh_dac_audio.c +1 -1
Lines of this file are not shown. View the raw message.
sound/oss/sonicvibes.c +4 -4
Lines of this file are not shown. View the raw message.
sound/oss/soundcard.c +1 -1
Lines of this file are not shown. View the raw message.
sound/oss/sscape.c +14 -14
Lines of this file are not shown. View the raw message.
sound/oss/swarm_cs4297a.c +2 -2
Lines of this file are not shown. View the raw message.
sound/oss/trident.c +2 -2
Lines of this file are not shown. View the raw message.
sound/oss/trix.c +14 -14
Lines of this file are not shown. View the raw message.
sound/oss/uart401.c +2 -2
Lines of this file are not shown. View the raw message.
sound/oss/uart6850.c +6 -6
Lines of this file are not shown. View the raw message.
sound/oss/v_midi.c +3 -3
Lines of this file are not shown. View the raw message.
sound/oss/via82cxxx_audio.c +1 -1
Lines of this file are not shown. View the raw message.
sound/oss/vidc.c +3 -3
Lines of this file are not shown. View the raw message.
sound/oss/vwsnd.c +6 -6
Lines of this file are not shown. View the raw message.
sound/oss/waveartist.c +10 -10
Lines of this file are not shown. View the raw message.
sound/oss/wavfront.c +12 -12
Lines of this file are not shown. View the raw message.
sound/oss/wf_midi.c +2 -2
Lines of this file are not shown. View the raw message.
sound/oss/ymfpci.c +1 -1
Lines of this file are not shown. View the raw message.
sound/oss/yss225.c +17 -17
Lines of this file are not shown. View the raw message.
sound/parisc/harmony.c +3 -3
Lines of this file are not shown. View the raw message.
sound/pci/ac97/ac97_codec.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/ac97/ak4531_codec.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/ali5451/ali5451.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/als4000.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/atiixp.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/atiixp_modem.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/au88x0/au88x0.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/azt3328.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/bt87x.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/ca0106/ca0106_main.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/cmipci.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/cs4281.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/cs46xx/cs46xx.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/emu10k1/emu10k1.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/emu10k1/emu10k1_synth.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/emu10k1/emu10k1x.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/ens1370.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/es1938.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/es1968.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/fm801.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/hda/hda_codec.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/hda/hda_intel.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/ice1712/ak4xxx.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/ice1712/ice1712.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/ice1712/ice1724.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/intel8x0.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/intel8x0m.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/korg1212/korg1212.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/maestro3.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/mixart/mixart.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/nm256/nm256.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/rme32.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/rme96.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/rme9652/hdsp.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/rme9652/hdspm.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/rme9652/rme9652.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/sonicvibes.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/trident/trident.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/trident/trident_synth.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/via82xx.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/via82xx_modem.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/vx222/vx222.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/ymfpci/ymfpci.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pcmcia/pdaudiocf/pdaudiocf.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pcmcia/vx/vxpocket.c +1 -1
Lines of this file are not shown. View the raw message.
sound/ppc/awacs.c +12 -12
Lines of this file are not shown. View the raw message.
sound/ppc/beep.c +1 -1
Lines of this file are not shown. View the raw message.
sound/ppc/burgundy.c +4 -4
Lines of this file are not shown. View the raw message.
sound/ppc/daca.c +1 -1
Lines of this file are not shown. View the raw message.
sound/ppc/keywest.c +2 -2
Lines of this file are not shown. View the raw message.
sound/ppc/pmac.c +7 -7
Lines of this file are not shown. View the raw message.
sound/ppc/powermac.c +2 -2
Lines of this file are not shown. View the raw message.
sound/ppc/toonie.c +2 -2
Lines of this file are not shown. View the raw message.
sound/ppc/tumbler.c +8 -8
Lines of this file are not shown. View the raw message.
sound/sound_core.c +1 -1
Lines of this file are not shown. View the raw message.
sound/sparc/amd7930.c +6 -6
Lines of this file are not shown. View the raw message.
sound/sparc/cs4231.c +3 -3
Lines of this file are not shown. View the raw message.
sound/sparc/dbri.c +4 -4
Lines of this file are not shown. View the raw message.
sound/synth/emux/emux.c +1 -1
Lines of this file are not shown. View the raw message.
sound/synth/util_mem.c +1 -1
Lines of this file are not shown. View the raw message.
sound/usb/usbaudio.c +1 -1
Lines of this file are not shown. View the raw message.
sound/usb/usx2y/usbusx2y.c +1 -1
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Part of the diff is not shown here. View the raw message.