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
@@ -117,9 +117,9 @@ static struct pnp_card_device_id snd_als100_pnpids[] = {
|
||||
|
||||
MODULE_DEVICE_TABLE(pnp_card, snd_als100_pnpids);
|
||||
|
||||
static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,
|
||||
struct pnp_card_link *card,
|
||||
const struct pnp_card_device_id *id)
|
||||
static int snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,
|
||||
struct pnp_card_link *card,
|
||||
const struct pnp_card_device_id *id)
|
||||
{
|
||||
struct pnp_dev *pdev;
|
||||
int err;
|
||||
@@ -183,9 +183,9 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit snd_card_als100_probe(int dev,
|
||||
struct pnp_card_link *pcard,
|
||||
const struct pnp_card_device_id *pid)
|
||||
static int snd_card_als100_probe(int dev,
|
||||
struct pnp_card_link *pcard,
|
||||
const struct pnp_card_device_id *pid)
|
||||
{
|
||||
int error;
|
||||
struct snd_sb *chip;
|
||||
@@ -286,10 +286,10 @@ static int __devinit snd_card_als100_probe(int dev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static unsigned int __devinitdata als100_devices;
|
||||
static unsigned int als100_devices;
|
||||
|
||||
static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
|
||||
const struct pnp_card_device_id *id)
|
||||
static int snd_als100_pnp_detect(struct pnp_card_link *card,
|
||||
const struct pnp_card_device_id *id)
|
||||
{
|
||||
static int dev;
|
||||
int res;
|
||||
@@ -307,7 +307,7 @@ static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static void __devexit snd_als100_pnp_remove(struct pnp_card_link * pcard)
|
||||
static void snd_als100_pnp_remove(struct pnp_card_link *pcard)
|
||||
{
|
||||
snd_card_free(pnp_get_card_drvdata(pcard));
|
||||
pnp_set_card_drvdata(pcard, NULL);
|
||||
@@ -344,7 +344,7 @@ static struct pnp_card_driver als100_pnpc_driver = {
|
||||
.name = "als100",
|
||||
.id_table = snd_als100_pnpids,
|
||||
.probe = snd_als100_pnp_detect,
|
||||
.remove = __devexit_p(snd_als100_pnp_remove),
|
||||
.remove = snd_als100_pnp_remove,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = snd_als100_pnp_suspend,
|
||||
.resume = snd_als100_pnp_resume,
|
||||
|
Reference in New Issue
Block a user