ALSA: isa: 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> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:

committed by
Takashi Iwai

parent
f120a6fb48
commit
1bff292e9a
@@ -89,13 +89,14 @@ MODULE_PARM_DESC(channels, "GF1 channels for " CRD_NAME " driver.");
|
||||
module_param_array(pcm_channels, int, NULL, 0444);
|
||||
MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver.");
|
||||
|
||||
static int __devinit snd_gusextreme_match(struct device *dev, unsigned int n)
|
||||
static int snd_gusextreme_match(struct device *dev, unsigned int n)
|
||||
{
|
||||
return enable[n];
|
||||
}
|
||||
|
||||
static int __devinit snd_gusextreme_es1688_create(struct snd_card *card,
|
||||
struct snd_es1688 *chip, struct device *dev, unsigned int n)
|
||||
static int snd_gusextreme_es1688_create(struct snd_card *card,
|
||||
struct snd_es1688 *chip,
|
||||
struct device *dev, unsigned int n)
|
||||
{
|
||||
static long possible_ports[] = {0x220, 0x240, 0x260};
|
||||
static int possible_irqs[] = {5, 9, 10, 7, -1};
|
||||
@@ -132,8 +133,9 @@ static int __devinit snd_gusextreme_es1688_create(struct snd_card *card,
|
||||
return error;
|
||||
}
|
||||
|
||||
static int __devinit snd_gusextreme_gus_card_create(struct snd_card *card,
|
||||
struct device *dev, unsigned int n, struct snd_gus_card **rgus)
|
||||
static int snd_gusextreme_gus_card_create(struct snd_card *card,
|
||||
struct device *dev, unsigned int n,
|
||||
struct snd_gus_card **rgus)
|
||||
{
|
||||
static int possible_irqs[] = {11, 12, 15, 9, 5, 7, 3, -1};
|
||||
static int possible_dmas[] = {5, 6, 7, 3, 1, -1};
|
||||
@@ -156,8 +158,8 @@ static int __devinit snd_gusextreme_gus_card_create(struct snd_card *card,
|
||||
0, channels[n], pcm_channels[n], 0, rgus);
|
||||
}
|
||||
|
||||
static int __devinit snd_gusextreme_detect(struct snd_gus_card *gus,
|
||||
struct snd_es1688 *es1688)
|
||||
static int snd_gusextreme_detect(struct snd_gus_card *gus,
|
||||
struct snd_es1688 *es1688)
|
||||
{
|
||||
unsigned long flags;
|
||||
unsigned char d;
|
||||
@@ -206,7 +208,7 @@ static int __devinit snd_gusextreme_detect(struct snd_gus_card *gus,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit snd_gusextreme_mixer(struct snd_card *card)
|
||||
static int snd_gusextreme_mixer(struct snd_card *card)
|
||||
{
|
||||
struct snd_ctl_elem_id id1, id2;
|
||||
int error;
|
||||
@@ -232,7 +234,7 @@ static int __devinit snd_gusextreme_mixer(struct snd_card *card)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)
|
||||
static int snd_gusextreme_probe(struct device *dev, unsigned int n)
|
||||
{
|
||||
struct snd_card *card;
|
||||
struct snd_gus_card *gus;
|
||||
@@ -339,7 +341,7 @@ out: snd_card_free(card);
|
||||
return error;
|
||||
}
|
||||
|
||||
static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n)
|
||||
static int snd_gusextreme_remove(struct device *dev, unsigned int n)
|
||||
{
|
||||
snd_card_free(dev_get_drvdata(dev));
|
||||
dev_set_drvdata(dev, NULL);
|
||||
@@ -349,7 +351,7 @@ static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n)
|
||||
static struct isa_driver snd_gusextreme_driver = {
|
||||
.match = snd_gusextreme_match,
|
||||
.probe = snd_gusextreme_probe,
|
||||
.remove = __devexit_p(snd_gusextreme_remove),
|
||||
.remove = snd_gusextreme_remove,
|
||||
#if 0 /* FIXME */
|
||||
.suspend = snd_gusextreme_suspend,
|
||||
.resume = snd_gusextreme_resume,
|
||||
|
Reference in New Issue
Block a user