dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Bill Pemberton <wfp5p@virginia.edu>
Acked-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Bill Pemberton 2012-12-06 12:35:29 -05:00 committed by Takashi Iwai
parent 87f9796a03
commit 14c56706f9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/usb/caiaq/control.c
View File

@ -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,8 +489,8 @@ static struct caiaq_controller kontrols4_controller[] = {
{ "LED: FX2: Mode", 133 | CNT_INTVAL },
};
static int __devinit add_controls(struct caiaq_controller *c, int num,
struct snd_usb_caiaqdev *dev)
static int add_controls(struct caiaq_controller *c, int num,
struct snd_usb_caiaqdev *dev)
{
int i, ret;
struct snd_kcontrol *kc;
@ -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;

6
sound/usb/caiaq/device.c
View File

@ -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;