Skip to content

Commit

Permalink
ALSA: firewire-speakers: remove __dev* attributes
Browse files Browse the repository at this point in the history
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: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
wfp5p authored and tiwai committed Dec 7, 2012
1 parent 61dc674 commit 325fbfe
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sound/firewire/speakers.c
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ static void fwspk_card_free(struct snd_card *card)
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 = {
.driver_name = "FireWave",
Expand Down Expand Up @@ -699,7 +699,7 @@ static const struct device_info *__devinit fwspk_detect(struct fw_device *dev)
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_device *fw_dev = fw_parent_device(unit);
Expand Down Expand Up @@ -770,7 +770,7 @@ static int __devinit fwspk_probe(struct device *unit_dev)
return err;
}

static int __devexit fwspk_remove(struct device *dev)
static int fwspk_remove(struct device *dev)
{
struct fwspk *fwspk = dev_get_drvdata(dev);

Expand Down Expand Up @@ -834,7 +834,7 @@ static struct fw_driver fwspk_driver = {
.name = KBUILD_MODNAME,
.bus = &fw_bus_type,
.probe = fwspk_probe,
.remove = __devexit_p(fwspk_remove),
.remove = fwspk_remove,
},
.update = fwspk_bus_reset,
.id_table = fwspk_id_table,
Expand Down

0 comments on commit 325fbfe

Please sign in to comment.