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

Commit 14c56706 authored by Bill Pemberton's avatar Bill Pemberton Committed by Takashi Iwai
Browse files

ALSA: snd-usb-caiaq: 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>
Acked-by: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 87f9796a

sound/usb/caiaq/control.c

+4 −4
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int control_put(struct snd_kcontrol *kcontrol, 
	return 1;

}



static struct snd_kcontrol_new kcontrol_template __devinitdata = {

static struct snd_kcontrol_new kcontrol_template = {

	.iface = SNDRV_CTL_ELEM_IFACE_HWDEP,

	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,

	.index = 0,
@@ -489,7 +489,7 @@ static struct caiaq_controller kontrols4_controller[] = { 
	{ "LED: FX2: Mode",			133 | CNT_INTVAL },

};



static int __devinit add_controls(struct caiaq_controller *c, int num,

static int add_controls(struct caiaq_controller *c, int num,

			struct snd_usb_caiaqdev *dev)

{

	int i, ret;
@@ -507,7 +507,7 @@ static int __devinit add_controls(struct caiaq_controller *c, int num, 
	return 0;

}



int __devinit snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev)

int snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev)

{

	int ret = 0;

sound/usb/caiaq/device.c

+3 −3
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ int snd_usb_caiaq_set_auto_msg(struct snd_usb_caiaqdev *dev, 
					  tmp, sizeof(tmp));

}



static void __devinit setup_card(struct snd_usb_caiaqdev *dev)

static void setup_card(struct snd_usb_caiaqdev *dev)

{

	int ret;

	char val[4];
@@ -407,7 +407,7 @@ static int create_card(struct usb_device *usb_dev, 
	return 0;

}



static int __devinit init_card(struct snd_usb_caiaqdev *dev)

static int init_card(struct snd_usb_caiaqdev *dev)

{

	char *c, usbpath[32];

	struct usb_device *usb_dev = dev->chip.dev;
@@ -481,7 +481,7 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev) 
	return 0;

}



static int __devinit snd_probe(struct usb_interface *intf,

static int snd_probe(struct usb_interface *intf,

		     const struct usb_device_id *id)

{

	int ret;