Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87f9796a authored by Bill Pemberton's avatar Bill Pemberton Committed by Takashi Iwai
Browse files

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fbbb01a1

sound/usb/6fire/chip.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

{

	int ret;

sound/usb/6fire/comm.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int usb6fire_comm_write16(struct comm_runtime *rt, u8 request, 
	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),

			GFP_KERNEL);

sound/usb/6fire/comm.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct comm_runtime { 
			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_destroy(struct sfire_chip *chip);

#endif /* USB6FIRE_COMM_H */

sound/usb/6fire/control.c

+4 −4
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static int usb6fire_control_digital_thru_get(struct snd_kcontrol *kcontrol, 
	return 0;

}



static struct __devinitdata snd_kcontrol_new vol_elements[] = {

static struct snd_kcontrol_new vol_elements[] = {

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.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,

		.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,

		.name = "Line/Phono Capture Route",
@@ -561,7 +561,7 @@ static int usb6fire_control_add_virtual( 
	return 0;

}



int __devinit usb6fire_control_init(struct sfire_chip *chip)

int usb6fire_control_init(struct sfire_chip *chip)

{

	int i;

	int ret;

sound/usb/6fire/control.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ struct control_runtime { 
	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_destroy(struct sfire_chip *chip);

#endif /* USB6FIRE_CONTROL_H */