Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: snd-usb-6fire: remove __dev* attributes

CONFIG_HOTPLUG is going away as an option. As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Bill Pemberton and committed by
Takashi Iwai
87f9796a fbbb01a1

+17 -17
+2 -2
sound/usb/6fire/chip.c
··· 82 82 } 83 83 } 84 84 85 - static int __devinit usb6fire_chip_probe(struct usb_interface *intf, 86 - const struct usb_device_id *usb_id) 85 + static int usb6fire_chip_probe(struct usb_interface *intf, 86 + const struct usb_device_id *usb_id) 87 87 { 88 88 int ret; 89 89 int i;
+1 -1
sound/usb/6fire/comm.c
··· 125 125 return usb6fire_comm_send_buffer(buffer, rt->chip->dev); 126 126 } 127 127 128 - int __devinit usb6fire_comm_init(struct sfire_chip *chip) 128 + int usb6fire_comm_init(struct sfire_chip *chip) 129 129 { 130 130 struct comm_runtime *rt = kzalloc(sizeof(struct comm_runtime), 131 131 GFP_KERNEL);
+1 -1
sound/usb/6fire/comm.h
··· 36 36 u8 vh, u8 vl); 37 37 }; 38 38 39 - int __devinit usb6fire_comm_init(struct sfire_chip *chip); 39 + int usb6fire_comm_init(struct sfire_chip *chip); 40 40 void usb6fire_comm_abort(struct sfire_chip *chip); 41 41 void usb6fire_comm_destroy(struct sfire_chip *chip); 42 42 #endif /* USB6FIRE_COMM_H */
+4 -4
sound/usb/6fire/control.c
··· 411 411 return 0; 412 412 } 413 413 414 - static struct __devinitdata snd_kcontrol_new vol_elements[] = { 414 + static struct snd_kcontrol_new vol_elements[] = { 415 415 { 416 416 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 417 417 .name = "Analog Playback Volume", ··· 451 451 {} 452 452 }; 453 453 454 - static struct __devinitdata snd_kcontrol_new mute_elements[] = { 454 + static struct snd_kcontrol_new mute_elements[] = { 455 455 { 456 456 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 457 457 .name = "Analog Playback Switch", ··· 485 485 {} 486 486 }; 487 487 488 - static struct __devinitdata snd_kcontrol_new elements[] = { 488 + static struct snd_kcontrol_new elements[] = { 489 489 { 490 490 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 491 491 .name = "Line/Phono Capture Route", ··· 561 561 return 0; 562 562 } 563 563 564 - int __devinit usb6fire_control_init(struct sfire_chip *chip) 564 + int usb6fire_control_init(struct sfire_chip *chip) 565 565 { 566 566 int i; 567 567 int ret;
+1 -1
sound/usb/6fire/control.h
··· 50 50 u8 ivol_updated; 51 51 }; 52 52 53 - int __devinit usb6fire_control_init(struct sfire_chip *chip); 53 + int usb6fire_control_init(struct sfire_chip *chip); 54 54 void usb6fire_control_abort(struct sfire_chip *chip); 55 55 void usb6fire_control_destroy(struct sfire_chip *chip); 56 56 #endif /* USB6FIRE_CONTROL_H */
+1 -1
sound/usb/6fire/firmware.h
··· 22 22 FW_NOT_READY = 1 23 23 }; 24 24 25 - int __devinit usb6fire_fw_init(struct usb_interface *intf); 25 + int usb6fire_fw_init(struct usb_interface *intf); 26 26 #endif /* USB6FIRE_FIRMWARE_H */ 27 27
+1 -1
sound/usb/6fire/midi.c
··· 146 146 .trigger = usb6fire_midi_in_trigger 147 147 }; 148 148 149 - int __devinit usb6fire_midi_init(struct sfire_chip *chip) 149 + int usb6fire_midi_init(struct sfire_chip *chip) 150 150 { 151 151 int ret; 152 152 struct midi_runtime *rt = kzalloc(sizeof(struct midi_runtime),
+1 -1
sound/usb/6fire/midi.h
··· 38 38 void (*in_received)(struct midi_runtime *rt, u8 *data, int length); 39 39 }; 40 40 41 - int __devinit usb6fire_midi_init(struct sfire_chip *chip); 41 + int usb6fire_midi_init(struct sfire_chip *chip); 42 42 void usb6fire_midi_abort(struct sfire_chip *chip); 43 43 void usb6fire_midi_destroy(struct sfire_chip *chip); 44 44 #endif /* USB6FIRE_MIDI_H */
+4 -4
sound/usb/6fire/pcm.c
··· 559 559 .pointer = usb6fire_pcm_pointer, 560 560 }; 561 561 562 - static void __devinit usb6fire_pcm_init_urb(struct pcm_urb *urb, 563 - struct sfire_chip *chip, bool in, int ep, 564 - void (*handler)(struct urb *)) 562 + static void usb6fire_pcm_init_urb(struct pcm_urb *urb, 563 + struct sfire_chip *chip, bool in, int ep, 564 + void (*handler)(struct urb *)) 565 565 { 566 566 urb->chip = chip; 567 567 usb_init_urb(&urb->instance); ··· 578 578 urb->instance.number_of_packets = PCM_N_PACKETS_PER_URB; 579 579 } 580 580 581 - int __devinit usb6fire_pcm_init(struct sfire_chip *chip) 581 + int usb6fire_pcm_init(struct sfire_chip *chip) 582 582 { 583 583 int i; 584 584 int ret;
+1 -1
sound/usb/6fire/pcm.h
··· 69 69 bool stream_wait_cond; 70 70 }; 71 71 72 - int __devinit usb6fire_pcm_init(struct sfire_chip *chip); 72 + int usb6fire_pcm_init(struct sfire_chip *chip); 73 73 void usb6fire_pcm_abort(struct sfire_chip *chip); 74 74 void usb6fire_pcm_destroy(struct sfire_chip *chip); 75 75 #endif /* USB6FIRE_PCM_H */