OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Bill Pemberton 2012-12-06 12:35:28 -05:00 committed by Takashi Iwai
parent fbbb01a12d
commit 87f9796a03
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/usb/6fire/chip.c
View File

@ -82,7 +82,7 @@ static void usb6fire_chip_destroy(struct sfire_chip *chip)
} }
} }
static int __devinit usb6fire_chip_probe(struct usb_interface *intf, static int usb6fire_chip_probe(struct usb_interface *intf,
const struct usb_device_id *usb_id) const struct usb_device_id *usb_id)
{ {
int ret; int ret;

2
sound/usb/6fire/comm.c
View File

@ -125,7 +125,7 @@ static int usb6fire_comm_write16(struct comm_runtime *rt, u8 request,
return usb6fire_comm_send_buffer(buffer, rt->chip->dev); return usb6fire_comm_send_buffer(buffer, rt->chip->dev);
} }
int __devinit usb6fire_comm_init(struct sfire_chip *chip) int usb6fire_comm_init(struct sfire_chip *chip)
{ {
struct comm_runtime *rt = kzalloc(sizeof(struct comm_runtime), struct comm_runtime *rt = kzalloc(sizeof(struct comm_runtime),
GFP_KERNEL); GFP_KERNEL);

2
sound/usb/6fire/comm.h
View File

@ -36,7 +36,7 @@ struct comm_runtime {
u8 vh, u8 vl); u8 vh, u8 vl);
}; };
int __devinit usb6fire_comm_init(struct sfire_chip *chip); int usb6fire_comm_init(struct sfire_chip *chip);
void usb6fire_comm_abort(struct sfire_chip *chip); void usb6fire_comm_abort(struct sfire_chip *chip);
void usb6fire_comm_destroy(struct sfire_chip *chip); void usb6fire_comm_destroy(struct sfire_chip *chip);
#endif /* USB6FIRE_COMM_H */ #endif /* USB6FIRE_COMM_H */

8
sound/usb/6fire/control.c
View File

@ -411,7 +411,7 @@ static int usb6fire_control_digital_thru_get(struct snd_kcontrol *kcontrol,
return 0; return 0;
} }
static struct __devinitdata snd_kcontrol_new vol_elements[] = { static struct snd_kcontrol_new vol_elements[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Playback Volume", .name = "Analog Playback Volume",
@ -451,7 +451,7 @@ static struct __devinitdata snd_kcontrol_new vol_elements[] = {
{} {}
}; };
static struct __devinitdata snd_kcontrol_new mute_elements[] = { static struct snd_kcontrol_new mute_elements[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Playback Switch", .name = "Analog Playback Switch",
@ -485,7 +485,7 @@ static struct __devinitdata snd_kcontrol_new mute_elements[] = {
{} {}
}; };
static struct __devinitdata snd_kcontrol_new elements[] = { static struct snd_kcontrol_new elements[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Line/Phono Capture Route", .name = "Line/Phono Capture Route",
@ -561,7 +561,7 @@ static int usb6fire_control_add_virtual(
return 0; return 0;
} }
int __devinit usb6fire_control_init(struct sfire_chip *chip) int usb6fire_control_init(struct sfire_chip *chip)
{ {
int i; int i;
int ret; int ret;

2
sound/usb/6fire/control.h
View File

@ -50,7 +50,7 @@ struct control_runtime {
u8 ivol_updated; u8 ivol_updated;
}; };
int __devinit usb6fire_control_init(struct sfire_chip *chip); int usb6fire_control_init(struct sfire_chip *chip);
void usb6fire_control_abort(struct sfire_chip *chip); void usb6fire_control_abort(struct sfire_chip *chip);
void usb6fire_control_destroy(struct sfire_chip *chip); void usb6fire_control_destroy(struct sfire_chip *chip);
#endif /* USB6FIRE_CONTROL_H */ #endif /* USB6FIRE_CONTROL_H */

2
sound/usb/6fire/firmware.h
View File

@ -22,6 +22,6 @@ enum /* firmware state of device */
FW_NOT_READY = 1 FW_NOT_READY = 1
}; };
int __devinit usb6fire_fw_init(struct usb_interface *intf); int usb6fire_fw_init(struct usb_interface *intf);
#endif /* USB6FIRE_FIRMWARE_H */ #endif /* USB6FIRE_FIRMWARE_H */

2
sound/usb/6fire/midi.c
View File

@ -146,7 +146,7 @@ static struct snd_rawmidi_ops in_ops = {
.trigger = usb6fire_midi_in_trigger .trigger = usb6fire_midi_in_trigger
}; };
int __devinit usb6fire_midi_init(struct sfire_chip *chip) int usb6fire_midi_init(struct sfire_chip *chip)
{ {
int ret; int ret;
struct midi_runtime *rt = kzalloc(sizeof(struct midi_runtime), struct midi_runtime *rt = kzalloc(sizeof(struct midi_runtime),

2
sound/usb/6fire/midi.h
View File

@ -38,7 +38,7 @@ struct midi_runtime {
void (*in_received)(struct midi_runtime *rt, u8 *data, int length); void (*in_received)(struct midi_runtime *rt, u8 *data, int length);
}; };
int __devinit usb6fire_midi_init(struct sfire_chip *chip); int usb6fire_midi_init(struct sfire_chip *chip);
void usb6fire_midi_abort(struct sfire_chip *chip); void usb6fire_midi_abort(struct sfire_chip *chip);
void usb6fire_midi_destroy(struct sfire_chip *chip); void usb6fire_midi_destroy(struct sfire_chip *chip);
#endif /* USB6FIRE_MIDI_H */ #endif /* USB6FIRE_MIDI_H */

4
sound/usb/6fire/pcm.c
View File

@ -559,7 +559,7 @@ static struct snd_pcm_ops pcm_ops = {
.pointer = usb6fire_pcm_pointer, .pointer = usb6fire_pcm_pointer,
}; };
static void __devinit usb6fire_pcm_init_urb(struct pcm_urb *urb, static void usb6fire_pcm_init_urb(struct pcm_urb *urb,
struct sfire_chip *chip, bool in, int ep, struct sfire_chip *chip, bool in, int ep,
void (*handler)(struct urb *)) void (*handler)(struct urb *))
{ {
@ -578,7 +578,7 @@ static void __devinit usb6fire_pcm_init_urb(struct pcm_urb *urb,
urb->instance.number_of_packets = PCM_N_PACKETS_PER_URB; urb->instance.number_of_packets = PCM_N_PACKETS_PER_URB;
} }
int __devinit usb6fire_pcm_init(struct sfire_chip *chip) int usb6fire_pcm_init(struct sfire_chip *chip)
{ {
int i; int i;
int ret; int ret;

2
sound/usb/6fire/pcm.h
View File

@ -69,7 +69,7 @@ struct pcm_runtime {
bool stream_wait_cond; bool stream_wait_cond;
}; };
int __devinit usb6fire_pcm_init(struct sfire_chip *chip); int usb6fire_pcm_init(struct sfire_chip *chip);
void usb6fire_pcm_abort(struct sfire_chip *chip); void usb6fire_pcm_abort(struct sfire_chip *chip);
void usb6fire_pcm_destroy(struct sfire_chip *chip); void usb6fire_pcm_destroy(struct sfire_chip *chip);
#endif /* USB6FIRE_PCM_H */ #endif /* USB6FIRE_PCM_H */