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>
Šī revīzija ir iekļauta:

revīziju iesūtīja
Takashi Iwai

vecāks
f120a6fb48
revīzija
1bff292e9a
@@ -94,8 +94,8 @@ MODULE_DEVICE_TABLE(pnp_card, snd_ad1816a_pnpids);
|
||||
#define DRIVER_NAME "snd-card-ad1816a"
|
||||
|
||||
|
||||
static int __devinit snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card,
|
||||
const struct pnp_card_device_id *id)
|
||||
static int snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card,
|
||||
const struct pnp_card_device_id *id)
|
||||
{
|
||||
struct pnp_dev *pdev;
|
||||
int err;
|
||||
@@ -135,8 +135,8 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,
|
||||
const struct pnp_card_device_id *pid)
|
||||
static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,
|
||||
const struct pnp_card_device_id *pid)
|
||||
{
|
||||
int error;
|
||||
struct snd_card *card;
|
||||
@@ -217,10 +217,10 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
|
||||
return 0;
|
||||
}
|
||||
|
||||
static unsigned int __devinitdata ad1816a_devices;
|
||||
static unsigned int ad1816a_devices;
|
||||
|
||||
static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,
|
||||
const struct pnp_card_device_id *id)
|
||||
static int snd_ad1816a_pnp_detect(struct pnp_card_link *card,
|
||||
const struct pnp_card_device_id *id)
|
||||
{
|
||||
static int dev;
|
||||
int res;
|
||||
@@ -238,7 +238,7 @@ static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static void __devexit snd_ad1816a_pnp_remove(struct pnp_card_link * pcard)
|
||||
static void snd_ad1816a_pnp_remove(struct pnp_card_link *pcard)
|
||||
{
|
||||
snd_card_free(pnp_get_card_drvdata(pcard));
|
||||
pnp_set_card_drvdata(pcard, NULL);
|
||||
@@ -270,7 +270,7 @@ static struct pnp_card_driver ad1816a_pnpc_driver = {
|
||||
.name = "ad1816a",
|
||||
.id_table = snd_ad1816a_pnpids,
|
||||
.probe = snd_ad1816a_pnp_detect,
|
||||
.remove = __devexit_p(snd_ad1816a_pnp_remove),
|
||||
.remove = snd_ad1816a_pnp_remove,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = snd_ad1816a_pnp_suspend,
|
||||
.resume = snd_ad1816a_pnp_resume,
|
||||
|
@@ -537,7 +537,7 @@ void snd_ad1816a_resume(struct snd_ad1816a *chip)
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __devinit snd_ad1816a_probe(struct snd_ad1816a *chip)
|
||||
static int snd_ad1816a_probe(struct snd_ad1816a *chip)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
@@ -583,7 +583,7 @@ static int snd_ad1816a_dev_free(struct snd_device *device)
|
||||
return snd_ad1816a_free(chip);
|
||||
}
|
||||
|
||||
static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip)
|
||||
static const char *snd_ad1816a_chip_id(struct snd_ad1816a *chip)
|
||||
{
|
||||
switch (chip->hardware) {
|
||||
case AD1816A_HW_AD1816A: return "AD1816A";
|
||||
@@ -596,9 +596,9 @@ static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip)
|
||||
}
|
||||
}
|
||||
|
||||
int __devinit snd_ad1816a_create(struct snd_card *card,
|
||||
unsigned long port, int irq, int dma1, int dma2,
|
||||
struct snd_ad1816a *chip)
|
||||
int snd_ad1816a_create(struct snd_card *card,
|
||||
unsigned long port, int irq, int dma1, int dma2,
|
||||
struct snd_ad1816a *chip)
|
||||
{
|
||||
static struct snd_device_ops ops = {
|
||||
.dev_free = snd_ad1816a_dev_free,
|
||||
@@ -675,7 +675,7 @@ static struct snd_pcm_ops snd_ad1816a_capture_ops = {
|
||||
.pointer = snd_ad1816a_capture_pointer,
|
||||
};
|
||||
|
||||
int __devinit snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm)
|
||||
int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm)
|
||||
{
|
||||
int error;
|
||||
struct snd_pcm *pcm;
|
||||
@@ -702,7 +702,8 @@ int __devinit snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_p
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __devinit snd_ad1816a_timer(struct snd_ad1816a *chip, int device, struct snd_timer **rtimer)
|
||||
int snd_ad1816a_timer(struct snd_ad1816a *chip, int device,
|
||||
struct snd_timer **rtimer)
|
||||
{
|
||||
struct snd_timer *timer;
|
||||
struct snd_timer_id tid;
|
||||
@@ -923,7 +924,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_6bit, -9450, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_5bit_12db_max, -3450, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);
|
||||
|
||||
static struct snd_kcontrol_new snd_ad1816a_controls[] __devinitdata = {
|
||||
static struct snd_kcontrol_new snd_ad1816a_controls[] = {
|
||||
AD1816A_DOUBLE("Master Playback Switch", AD1816A_MASTER_ATT, 15, 7, 1, 1),
|
||||
AD1816A_DOUBLE_TLV("Master Playback Volume", AD1816A_MASTER_ATT, 8, 0, 31, 1,
|
||||
db_scale_5bit),
|
||||
@@ -969,7 +970,7 @@ AD1816A_SINGLE("3D Control - Switch", AD1816A_3D_PHAT_CTRL, 15, 1, 1),
|
||||
AD1816A_SINGLE("3D Control - Level", AD1816A_3D_PHAT_CTRL, 0, 15, 0),
|
||||
};
|
||||
|
||||
int __devinit snd_ad1816a_mixer(struct snd_ad1816a *chip)
|
||||
int snd_ad1816a_mixer(struct snd_ad1816a *chip)
|
||||
{
|
||||
struct snd_card *card;
|
||||
unsigned int idx;
|
||||
|
Atsaukties uz šo jaunā problēmā
Block a user