提交 325fbfe0 编写于 作者: B Bill Pemberton 提交者: Takashi Iwai

ALSA: firewire-speakers: 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: NBill Pemberton <wfp5p@virginia.edu>
Acked-by: NClemens Ladisch <clemens@ladisch.de>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 61dc674c
...@@ -663,7 +663,7 @@ static void fwspk_card_free(struct snd_card *card) ...@@ -663,7 +663,7 @@ static void fwspk_card_free(struct snd_card *card)
mutex_destroy(&fwspk->mutex); mutex_destroy(&fwspk->mutex);
} }
static const struct device_info *__devinit fwspk_detect(struct fw_device *dev) static const struct device_info *fwspk_detect(struct fw_device *dev)
{ {
static const struct device_info griffin_firewave = { static const struct device_info griffin_firewave = {
.driver_name = "FireWave", .driver_name = "FireWave",
...@@ -699,7 +699,7 @@ static const struct device_info *__devinit fwspk_detect(struct fw_device *dev) ...@@ -699,7 +699,7 @@ static const struct device_info *__devinit fwspk_detect(struct fw_device *dev)
return NULL; return NULL;
} }
static int __devinit fwspk_probe(struct device *unit_dev) static int fwspk_probe(struct device *unit_dev)
{ {
struct fw_unit *unit = fw_unit(unit_dev); struct fw_unit *unit = fw_unit(unit_dev);
struct fw_device *fw_dev = fw_parent_device(unit); struct fw_device *fw_dev = fw_parent_device(unit);
...@@ -770,7 +770,7 @@ static int __devinit fwspk_probe(struct device *unit_dev) ...@@ -770,7 +770,7 @@ static int __devinit fwspk_probe(struct device *unit_dev)
return err; return err;
} }
static int __devexit fwspk_remove(struct device *dev) static int fwspk_remove(struct device *dev)
{ {
struct fwspk *fwspk = dev_get_drvdata(dev); struct fwspk *fwspk = dev_get_drvdata(dev);
...@@ -834,7 +834,7 @@ static struct fw_driver fwspk_driver = { ...@@ -834,7 +834,7 @@ static struct fw_driver fwspk_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.bus = &fw_bus_type, .bus = &fw_bus_type,
.probe = fwspk_probe, .probe = fwspk_probe,
.remove = __devexit_p(fwspk_remove), .remove = fwspk_remove,
}, },
.update = fwspk_bus_reset, .update = fwspk_bus_reset,
.id_table = fwspk_id_table, .id_table = fwspk_id_table,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册