Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

sound/isa/ad1816a/ad1816a.c

+9 −9
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 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,

static int snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card,

				const struct pnp_card_device_id *id)

{

	struct pnp_dev *pdev;
@@ -135,7 +135,7 @@ 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,

static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,

				  const struct pnp_card_device_id *pid)

{

	int error;
@@ -217,9 +217,9 @@ 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,

static int snd_ad1816a_pnp_detect(struct pnp_card_link *card,

				  const struct pnp_card_device_id *id)

{

	static int dev;
@@ -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,

sound/isa/ad1816a/ad1816a_lib.c

+10 −9
Original line number Diff line number Diff line
@@ -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,7 +596,7 @@ static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip) 
	}

}



int __devinit snd_ad1816a_create(struct snd_card *card,

int snd_ad1816a_create(struct snd_card *card,

		       unsigned long port, int irq, int dma1, int dma2,

		       struct snd_ad1816a *chip)

{
@@ -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;

sound/isa/ad1848/ad1848.c

+4 −4
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver."); 
module_param_array(thinkpad, bool, NULL, 0444);

MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series.");



static int __devinit snd_ad1848_match(struct device *dev, unsigned int n)

static int snd_ad1848_match(struct device *dev, unsigned int n)

{

	if (!enable[n])

		return 0;
@@ -84,7 +84,7 @@ static int __devinit snd_ad1848_match(struct device *dev, unsigned int n) 
	return 1;

}



static int __devinit snd_ad1848_probe(struct device *dev, unsigned int n)

static int snd_ad1848_probe(struct device *dev, unsigned int n)

{

	struct snd_card *card;

	struct snd_wss *chip;
@@ -132,7 +132,7 @@ out: snd_card_free(card); 
	return error;

}



static int __devexit snd_ad1848_remove(struct device *dev, unsigned int n)

static int snd_ad1848_remove(struct device *dev, unsigned int n)

{

	snd_card_free(dev_get_drvdata(dev));

	dev_set_drvdata(dev, NULL);
@@ -164,7 +164,7 @@ static int snd_ad1848_resume(struct device *dev, unsigned int n) 
static struct isa_driver snd_ad1848_driver = {

	.match		= snd_ad1848_match,

	.probe		= snd_ad1848_probe,

	.remove		= __devexit_p(snd_ad1848_remove),

	.remove		= snd_ad1848_remove,

#ifdef CONFIG_PM

	.suspend	= snd_ad1848_suspend,

	.resume		= snd_ad1848_resume,

sound/isa/adlib.c

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard."); 
module_param_array(port, long, NULL, 0444);

MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");



static int __devinit snd_adlib_match(struct device *dev, unsigned int n)

static int snd_adlib_match(struct device *dev, unsigned int n)

{

	if (!enable[n])

		return 0;
@@ -47,7 +47,7 @@ static void snd_adlib_free(struct snd_card *card) 
	release_and_free_resource(card->private_data);

}



static int __devinit snd_adlib_probe(struct device *dev, unsigned int n)

static int snd_adlib_probe(struct device *dev, unsigned int n)

{

	struct snd_card *card;

	struct snd_opl3 *opl3;
@@ -98,7 +98,7 @@ out: snd_card_free(card); 
	return error;

}



static int __devexit snd_adlib_remove(struct device *dev, unsigned int n)

static int snd_adlib_remove(struct device *dev, unsigned int n)

{

	snd_card_free(dev_get_drvdata(dev));

	dev_set_drvdata(dev, NULL);
@@ -108,7 +108,7 @@ static int __devexit snd_adlib_remove(struct device *dev, unsigned int n) 
static struct isa_driver snd_adlib_driver = {

	.match		= snd_adlib_match,

	.probe		= snd_adlib_probe,

	.remove		= __devexit_p(snd_adlib_remove),

	.remove		= snd_adlib_remove,



	.driver		= {

		.name	= DEV_NAME

sound/isa/als100.c

+11 −11
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 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,

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)

{
@@ -183,7 +183,7 @@ 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,

static int snd_card_als100_probe(int dev,

				 struct pnp_card_link *pcard,

				 const struct pnp_card_device_id *pid)

{
@@ -286,9 +286,9 @@ 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,

static int snd_als100_pnp_detect(struct pnp_card_link *card,

				 const struct pnp_card_device_id *id)

{

	static int dev;
@@ -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,