Commit e23e7a14 authored by Bill Pemberton's avatar Bill Pemberton Committed by Takashi Iwai
Browse files

ALSA: pci: 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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 445a51b3

sound/pci/ak4531_codec.c

+5 −5
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_master, -6200, 200, 0); 
static const DECLARE_TLV_DB_SCALE(db_scale_mono, -2800, 400, 0);

static const DECLARE_TLV_DB_SCALE(db_scale_input, -5000, 200, 0);



static struct snd_kcontrol_new snd_ak4531_controls[] __devinitdata = {

static struct snd_kcontrol_new snd_ak4531_controls[] = {



AK4531_DOUBLE_TLV("Master Playback Switch", 0,

		  AK4531_LMASTER, AK4531_RMASTER, 7, 7, 1, 1,
@@ -383,7 +383,7 @@ static u8 snd_ak4531_initial_map[0x19 + 1] = { 
	0x01		/* 19: Mic Amp Setup */

};



int __devinit snd_ak4531_mixer(struct snd_card *card,

int snd_ak4531_mixer(struct snd_card *card,

		     struct snd_ak4531 *_ak4531,

		     struct snd_ak4531 **rak4531)

{
@@ -483,7 +483,7 @@ static void snd_ak4531_proc_read(struct snd_info_entry *entry, 
		    ak4531->regs[AK4531_MIC_GAIN] & 1 ? "+30dB" : "+0dB");

}



static void __devinit

static void

snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak4531)

{

	struct snd_info_entry *entry;

sound/pci/ali5451/ali5451.c

+16 −16
Original line number Diff line number Diff line
@@ -1678,7 +1678,7 @@ static void snd_ali_pcm_free(struct snd_pcm *pcm) 
}





static int __devinit snd_ali_pcm(struct snd_ali * codec, int device,

static int snd_ali_pcm(struct snd_ali *codec, int device,

		       struct ali_pcm_description *desc)

{

	struct snd_pcm *pcm;
@@ -1727,7 +1727,7 @@ static struct ali_pcm_description ali_pcms[] = { 
	}

};



static int __devinit snd_ali_build_pcms(struct snd_ali *codec)

static int snd_ali_build_pcms(struct snd_ali *codec)

{

	int i, err;

	for (i = 0; i < codec->num_of_codecs && i < ARRAY_SIZE(ali_pcms); i++) {
@@ -1832,7 +1832,7 @@ static int snd_ali5451_spdif_put(struct snd_kcontrol *kcontrol, 
	return change;

}



static struct snd_kcontrol_new snd_ali5451_mixer_spdif[] __devinitdata = {

static struct snd_kcontrol_new snd_ali5451_mixer_spdif[] = {

	/* spdif aplayback switch */

	/* FIXME: "IEC958 Playback Switch" may conflict with one on ac97_codec */

	ALI5451_SPDIF(SNDRV_CTL_NAME_IEC958("Output ",NONE,SWITCH), 0, 0),
@@ -1842,7 +1842,7 @@ static struct snd_kcontrol_new snd_ali5451_mixer_spdif[] __devinitdata = { 
	ALI5451_SPDIF(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0, 2)

};



static int __devinit snd_ali_mixer(struct snd_ali * codec)

static int snd_ali_mixer(struct snd_ali *codec)

{

	struct snd_ac97_template ac97;

	unsigned int idx;
@@ -2079,14 +2079,14 @@ static void snd_ali_proc_read(struct snd_info_entry *entry, 
		snd_iprintf(buf, "%02x: %08x\n", i, inl(ALI_REG(codec, i)));

}



static void __devinit snd_ali_proc_init(struct snd_ali *codec)

static void snd_ali_proc_init(struct snd_ali *codec)

{

	struct snd_info_entry *entry;

	if (!snd_card_proc_new(codec->card, "ali5451", &entry))

		snd_info_set_text_ops(entry, codec, snd_ali_proc_read);

}



static int __devinit snd_ali_resources(struct snd_ali *codec)

static int snd_ali_resources(struct snd_ali *codec)

{

	int err;
@@ -2112,7 +2112,7 @@ static int snd_ali_dev_free(struct snd_device *device) 
	return 0;

}



static int __devinit snd_ali_create(struct snd_card *card,

static int snd_ali_create(struct snd_card *card,

			  struct pci_dev *pci,

			  int pcm_streams,

			  int spdif_support,
@@ -2246,7 +2246,7 @@ static int __devinit snd_ali_create(struct snd_card *card, 
	return 0;

}



static int __devinit snd_ali_probe(struct pci_dev *pci,

static int snd_ali_probe(struct pci_dev *pci,

			 const struct pci_device_id *pci_id)

{

	struct snd_card *card;
@@ -2295,7 +2295,7 @@ static int __devinit snd_ali_probe(struct pci_dev *pci, 
	return err;

}



static void __devexit snd_ali_remove(struct pci_dev *pci)

static void snd_ali_remove(struct pci_dev *pci)

{

	snd_card_free(pci_get_drvdata(pci));

	pci_set_drvdata(pci, NULL);
@@ -2305,7 +2305,7 @@ static struct pci_driver ali5451_driver = { 
	.name = KBUILD_MODNAME,

	.id_table = snd_ali_ids,

	.probe = snd_ali_probe,

	.remove = __devexit_p(snd_ali_remove),

	.remove = snd_ali_remove,

	.driver = {

		.pm = ALI_PM_OPS,

	},

sound/pci/als300.c

+7 −7
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static irqreturn_t snd_als300plus_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static void __devexit snd_als300_remove(struct pci_dev *pci)

static void snd_als300_remove(struct pci_dev *pci)

{

	snd_als300_dbgcallenter();

	snd_card_free(pci_get_drvdata(pci));
@@ -622,7 +622,7 @@ static struct snd_pcm_ops snd_als300_capture_ops = { 
	.pointer =	snd_als300_pointer,

};



static int __devinit snd_als300_new_pcm(struct snd_als300 *chip)

static int snd_als300_new_pcm(struct snd_als300 *chip)

{

	struct snd_pcm *pcm;

	int err;
@@ -683,7 +683,7 @@ static void snd_als300_init(struct snd_als300 *chip) 
	snd_als300_dbgcallleave();

}



static int __devinit snd_als300_create(struct snd_card *card,

static int snd_als300_create(struct snd_card *card,

			     struct pci_dev *pci, int chip_type,

			     struct snd_als300 **rchip)

{
@@ -815,7 +815,7 @@ static SIMPLE_DEV_PM_OPS(snd_als300_pm, snd_als300_suspend, snd_als300_resume); 
#define SND_ALS300_PM_OPS	NULL

#endif



static int __devinit snd_als300_probe(struct pci_dev *pci,

static int snd_als300_probe(struct pci_dev *pci,

                             const struct pci_device_id *pci_id)

{

	static int dev;
@@ -867,7 +867,7 @@ static struct pci_driver als300_driver = { 
	.name = KBUILD_MODNAME,

	.id_table = snd_als300_ids,

	.probe = snd_als300_probe,

	.remove = __devexit_p(snd_als300_remove),

	.remove = snd_als300_remove,

	.driver = {

		.pm = SND_ALS300_PM_OPS,

	},

sound/pci/als4000.c

+6 −6
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ static struct snd_pcm_ops snd_als4000_capture_ops = { 
	.pointer =	snd_als4000_capture_pointer

};



static int __devinit snd_als4000_pcm(struct snd_sb *chip, int device)

static int snd_als4000_pcm(struct snd_sb *chip, int device)

{

	struct snd_pcm *pcm;

	int err;
@@ -770,7 +770,7 @@ static void snd_als4000_configure(struct snd_sb *chip) 
}



#ifdef SUPPORT_JOYSTICK

static int __devinit snd_als4000_create_gameport(struct snd_card_als4000 *acard, int dev)

static int snd_als4000_create_gameport(struct snd_card_als4000 *acard, int dev)

{

	struct gameport *gp;

	struct resource *r;
@@ -847,7 +847,7 @@ static void snd_card_als4000_free( struct snd_card *card ) 
	pci_disable_device(acard->pci);

}



static int __devinit snd_card_als4000_probe(struct pci_dev *pci,

static int snd_card_als4000_probe(struct pci_dev *pci,

				  const struct pci_device_id *pci_id)

{

	static int dev;
@@ -981,7 +981,7 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci, 
	return err;

}



static void __devexit snd_card_als4000_remove(struct pci_dev *pci)

static void snd_card_als4000_remove(struct pci_dev *pci)

{

	snd_card_free(pci_get_drvdata(pci));

	pci_set_drvdata(pci, NULL);
@@ -1046,7 +1046,7 @@ static struct pci_driver als4000_driver = { 
	.name = KBUILD_MODNAME,

	.id_table = snd_als4000_ids,

	.probe = snd_card_als4000_probe,

	.remove = __devexit_p(snd_card_als4000_remove),

	.remove = snd_card_als4000_remove,

	.driver = {

		.pm = SND_ALS4000_PM_OPS,

	},

sound/pci/asihpi/asihpi.c

+27 −28
Original line number Diff line number Diff line
@@ -1235,8 +1235,7 @@ static struct snd_pcm_ops snd_card_asihpi_capture_mmap_ops = { 
	.pointer = snd_card_asihpi_capture_pointer,

};



static int __devinit snd_card_asihpi_pcm_new(

		struct snd_card_asihpi *asihpi, int device)

static int snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi, int device)

{

	struct snd_pcm *pcm;

	int err;
@@ -1497,7 +1496,7 @@ static int snd_asihpi_volume_mute_put(struct snd_kcontrol *kcontrol, 
	return change;

}



static int __devinit snd_asihpi_volume_add(struct snd_card_asihpi *asihpi,

static int snd_asihpi_volume_add(struct snd_card_asihpi *asihpi,

				 struct hpi_control *hpi_ctl)

{

	struct snd_card *card = asihpi->card;
@@ -1593,7 +1592,7 @@ static int snd_asihpi_level_put(struct snd_kcontrol *kcontrol, 


static const DECLARE_TLV_DB_SCALE(db_scale_level, -1000, 100, 0);



static int __devinit snd_asihpi_level_add(struct snd_card_asihpi *asihpi,

static int snd_asihpi_level_add(struct snd_card_asihpi *asihpi,

				struct hpi_control *hpi_ctl)

{

	struct snd_card *card = asihpi->card;
@@ -1715,7 +1714,7 @@ static int snd_asihpi_aesebu_rxstatus_get(struct snd_kcontrol *kcontrol, 
	return 0;

}



static int __devinit snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,

static int snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,

				    struct hpi_control *hpi_ctl)

{

	struct snd_card *card = asihpi->card;
@@ -1753,7 +1752,7 @@ static int snd_asihpi_aesebu_tx_format_put(struct snd_kcontrol *kcontrol, 
}





static int __devinit snd_asihpi_aesebu_tx_add(struct snd_card_asihpi *asihpi,

static int snd_asihpi_aesebu_tx_add(struct snd_card_asihpi *asihpi,

				    struct hpi_control *hpi_ctl)

{

	struct snd_card *card = asihpi->card;
@@ -1996,7 +1995,7 @@ static int snd_asihpi_tuner_freq_put(struct snd_kcontrol *kcontrol, 
}



/* Tuner control group initializer  */

static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,

static int snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,

				struct hpi_control *hpi_ctl)

{

	struct snd_card *card = asihpi->card;
@@ -2100,7 +2099,7 @@ static int snd_asihpi_meter_get(struct snd_kcontrol *kcontrol, 
	return 0;

}



static int __devinit snd_asihpi_meter_add(struct snd_card_asihpi *asihpi,

static int snd_asihpi_meter_add(struct snd_card_asihpi *asihpi,

				struct hpi_control *hpi_ctl, int subidx)

{

	struct snd_card *card = asihpi->card;
@@ -2214,7 +2213,7 @@ static int snd_asihpi_mux_put(struct snd_kcontrol *kcontrol, 
}





static int  __devinit snd_asihpi_mux_add(struct snd_card_asihpi *asihpi,

static int  snd_asihpi_mux_add(struct snd_card_asihpi *asihpi,

			       struct hpi_control *hpi_ctl)

{

	struct snd_card *card = asihpi->card;
@@ -2303,7 +2302,7 @@ static int snd_asihpi_cmode_put(struct snd_kcontrol *kcontrol, 
}





static int __devinit snd_asihpi_cmode_add(struct snd_card_asihpi *asihpi,

static int snd_asihpi_cmode_add(struct snd_card_asihpi *asihpi,

				struct hpi_control *hpi_ctl)

{

	struct snd_card *card = asihpi->card;
@@ -2471,7 +2470,7 @@ static int snd_asihpi_clkrate_get(struct snd_kcontrol *kcontrol, 
	return 0;

}



static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,

static int snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,

				      struct hpi_control *hpi_ctl)

{

	struct snd_card *card = asihpi->card;
@@ -2548,7 +2547,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi, 
   Mixer

 ------------------------------------------------------------*/



static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)

static int snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)

{

	struct snd_card *card = asihpi->card;

	unsigned int idx = 0;
@@ -2722,7 +2721,7 @@ snd_asihpi_proc_read(struct snd_info_entry *entry, 
	}

}



static void __devinit snd_asihpi_proc_init(struct snd_card_asihpi *asihpi)

static void snd_asihpi_proc_init(struct snd_card_asihpi *asihpi)

{

	struct snd_info_entry *entry;
@@ -2764,7 +2763,7 @@ static int snd_asihpi_hpi_ioctl(struct snd_hwdep *hw, struct file *file, 
/* results in /dev/snd/hwC#D0 file for each card with index #

   also /proc/asound/hwdep will contain '#-00: asihpi (HPI) for each card'

*/

static int __devinit snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi,

static int snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi,

			      int device, struct snd_hwdep **rhwdep)

{

	struct snd_hwdep *hw;
@@ -2789,7 +2788,7 @@ static int __devinit snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi, 
/*------------------------------------------------------------

   CARD

 ------------------------------------------------------------*/

static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,

static int snd_asihpi_probe(struct pci_dev *pci_dev,

			    const struct pci_device_id *pci_id)

{

	int err;
@@ -2944,7 +2943,7 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev, 


}



static void __devexit snd_asihpi_remove(struct pci_dev *pci_dev)

static void snd_asihpi_remove(struct pci_dev *pci_dev)

{

	struct hpi_adapter *hpi = pci_get_drvdata(pci_dev);

	snd_card_free(hpi->snd_card);
@@ -2967,7 +2966,7 @@ static struct pci_driver driver = { 
	.name = KBUILD_MODNAME,

	.id_table = asihpi_pci_tbl,

	.probe = snd_asihpi_probe,

	.remove = __devexit_p(snd_asihpi_remove),

	.remove = snd_asihpi_remove,

#ifdef CONFIG_PM_SLEEP

/*	.suspend = snd_asihpi_suspend,

	.resume = snd_asihpi_resume, */