ALSA: drivers: 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>
Tento commit je obsažen v:
@@ -100,7 +100,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devinit snd_mpu401_probe(struct platform_device *devptr)
|
||||
static int snd_mpu401_probe(struct platform_device *devptr)
|
||||
{
|
||||
int dev = devptr->id;
|
||||
int err;
|
||||
@@ -126,7 +126,7 @@ static int __devinit snd_mpu401_probe(struct platform_device *devptr)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit snd_mpu401_remove(struct platform_device *devptr)
|
||||
static int snd_mpu401_remove(struct platform_device *devptr)
|
||||
{
|
||||
snd_card_free(platform_get_drvdata(devptr));
|
||||
platform_set_drvdata(devptr, NULL);
|
||||
@@ -137,7 +137,7 @@ static int __devexit snd_mpu401_remove(struct platform_device *devptr)
|
||||
|
||||
static struct platform_driver snd_mpu401_driver = {
|
||||
.probe = snd_mpu401_probe,
|
||||
.remove = __devexit_p(snd_mpu401_remove),
|
||||
.remove = snd_mpu401_remove,
|
||||
.driver = {
|
||||
.name = SND_MPU401_DRIVER,
|
||||
.owner = THIS_MODULE,
|
||||
@@ -156,8 +156,8 @@ static struct pnp_device_id snd_mpu401_pnpids[] = {
|
||||
|
||||
MODULE_DEVICE_TABLE(pnp, snd_mpu401_pnpids);
|
||||
|
||||
static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,
|
||||
const struct pnp_device_id *id)
|
||||
static int snd_mpu401_pnp(int dev, struct pnp_dev *device,
|
||||
const struct pnp_device_id *id)
|
||||
{
|
||||
if (!pnp_port_valid(device, 0) ||
|
||||
pnp_port_flags(device, 0) & IORESOURCE_DISABLED) {
|
||||
@@ -182,8 +182,8 @@ static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
|
||||
const struct pnp_device_id *id)
|
||||
static int snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
|
||||
const struct pnp_device_id *id)
|
||||
{
|
||||
static int dev;
|
||||
struct snd_card *card;
|
||||
@@ -211,7 +211,7 @@ static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static void __devexit snd_mpu401_pnp_remove(struct pnp_dev *dev)
|
||||
static void snd_mpu401_pnp_remove(struct pnp_dev *dev)
|
||||
{
|
||||
struct snd_card *card = (struct snd_card *) pnp_get_drvdata(dev);
|
||||
|
||||
@@ -223,7 +223,7 @@ static struct pnp_driver snd_mpu401_pnp_driver = {
|
||||
.name = "mpu401",
|
||||
.id_table = snd_mpu401_pnpids,
|
||||
.probe = snd_mpu401_pnp_probe,
|
||||
.remove = __devexit_p(snd_mpu401_pnp_remove),
|
||||
.remove = snd_mpu401_pnp_remove,
|
||||
};
|
||||
#else
|
||||
static struct pnp_driver snd_mpu401_pnp_driver;
|
||||
|
Odkázat v novém úkolu
Zablokovat Uživatele