Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 433 additions and 432 deletions
sound/isa/ad1816a/ad1816a.c
View file @ 1bff292e
...@@ -94,7 +94,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_ad1816a_pnpids); ...@@ -94,7 +94,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_ad1816a_pnpids);
#define DRIVER_NAME "snd-card-ad1816a" #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) const struct pnp_card_device_id *id)
{ {
struct pnp_dev *pdev; struct pnp_dev *pdev;
...@@ -135,7 +135,7 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card, ...@@ -135,7 +135,7 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card,
return 0; 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) const struct pnp_card_device_id *pid)
{ {
int error; int error;
...@@ -217,9 +217,9 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard ...@@ -217,9 +217,9 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
return 0; 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) const struct pnp_card_device_id *id)
{ {
static int dev; static int dev;
...@@ -238,7 +238,7 @@ static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card, ...@@ -238,7 +238,7 @@ static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,
return -ENODEV; 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)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -270,7 +270,7 @@ static struct pnp_card_driver ad1816a_pnpc_driver = { ...@@ -270,7 +270,7 @@ static struct pnp_card_driver ad1816a_pnpc_driver = {
.name = "ad1816a", .name = "ad1816a",
.id_table = snd_ad1816a_pnpids, .id_table = snd_ad1816a_pnpids,
.probe = snd_ad1816a_pnp_detect, .probe = snd_ad1816a_pnp_detect,
.remove = __devexit_p(snd_ad1816a_pnp_remove), .remove = snd_ad1816a_pnp_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_ad1816a_pnp_suspend, .suspend = snd_ad1816a_pnp_suspend,
.resume = snd_ad1816a_pnp_resume, .resume = snd_ad1816a_pnp_resume,
......
sound/isa/ad1816a/ad1816a_lib.c
View file @ 1bff292e
...@@ -537,7 +537,7 @@ void snd_ad1816a_resume(struct snd_ad1816a *chip) ...@@ -537,7 +537,7 @@ void snd_ad1816a_resume(struct snd_ad1816a *chip)
} }
#endif #endif
static int __devinit snd_ad1816a_probe(struct snd_ad1816a *chip) static int snd_ad1816a_probe(struct snd_ad1816a *chip)
{ {
unsigned long flags; unsigned long flags;
...@@ -583,7 +583,7 @@ static int snd_ad1816a_dev_free(struct snd_device *device) ...@@ -583,7 +583,7 @@ static int snd_ad1816a_dev_free(struct snd_device *device)
return snd_ad1816a_free(chip); 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) { switch (chip->hardware) {
case AD1816A_HW_AD1816A: return "AD1816A"; case AD1816A_HW_AD1816A: return "AD1816A";
...@@ -596,7 +596,7 @@ static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip) ...@@ -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, unsigned long port, int irq, int dma1, int dma2,
struct snd_ad1816a *chip) struct snd_ad1816a *chip)
{ {
...@@ -675,7 +675,7 @@ static struct snd_pcm_ops snd_ad1816a_capture_ops = { ...@@ -675,7 +675,7 @@ static struct snd_pcm_ops snd_ad1816a_capture_ops = {
.pointer = snd_ad1816a_capture_pointer, .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; int error;
struct snd_pcm *pcm; struct snd_pcm *pcm;
...@@ -702,7 +702,8 @@ int __devinit snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_p ...@@ -702,7 +702,8 @@ int __devinit snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_p
return 0; 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 *timer;
struct snd_timer_id tid; struct snd_timer_id tid;
...@@ -923,7 +924,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_6bit, -9450, 150, 0); ...@@ -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_5bit_12db_max, -3450, 150, 0);
static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 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("Master Playback Switch", AD1816A_MASTER_ATT, 15, 7, 1, 1),
AD1816A_DOUBLE_TLV("Master Playback Volume", AD1816A_MASTER_ATT, 8, 0, 31, 1, AD1816A_DOUBLE_TLV("Master Playback Volume", AD1816A_MASTER_ATT, 8, 0, 31, 1,
db_scale_5bit), db_scale_5bit),
...@@ -969,7 +970,7 @@ AD1816A_SINGLE("3D Control - Switch", AD1816A_3D_PHAT_CTRL, 15, 1, 1), ...@@ -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), 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; struct snd_card *card;
unsigned int idx; unsigned int idx;
......
sound/isa/ad1848/ad1848.c
View file @ 1bff292e
...@@ -64,7 +64,7 @@ MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver."); ...@@ -64,7 +64,7 @@ MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");
module_param_array(thinkpad, bool, NULL, 0444); module_param_array(thinkpad, bool, NULL, 0444);
MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series."); 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]) if (!enable[n])
return 0; return 0;
...@@ -84,7 +84,7 @@ static int __devinit snd_ad1848_match(struct device *dev, unsigned int n) ...@@ -84,7 +84,7 @@ static int __devinit snd_ad1848_match(struct device *dev, unsigned int n)
return 1; 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_card *card;
struct snd_wss *chip; struct snd_wss *chip;
...@@ -132,7 +132,7 @@ out: snd_card_free(card); ...@@ -132,7 +132,7 @@ out: snd_card_free(card);
return error; 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)); snd_card_free(dev_get_drvdata(dev));
dev_set_drvdata(dev, NULL); dev_set_drvdata(dev, NULL);
...@@ -164,7 +164,7 @@ static int snd_ad1848_resume(struct device *dev, unsigned int n) ...@@ -164,7 +164,7 @@ static int snd_ad1848_resume(struct device *dev, unsigned int n)
static struct isa_driver snd_ad1848_driver = { static struct isa_driver snd_ad1848_driver = {
.match = snd_ad1848_match, .match = snd_ad1848_match,
.probe = snd_ad1848_probe, .probe = snd_ad1848_probe,
.remove = __devexit_p(snd_ad1848_remove), .remove = snd_ad1848_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_ad1848_suspend, .suspend = snd_ad1848_suspend,
.resume = snd_ad1848_resume, .resume = snd_ad1848_resume,
......
sound/isa/adlib.c
View file @ 1bff292e
...@@ -30,7 +30,7 @@ MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard."); ...@@ -30,7 +30,7 @@ MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
module_param_array(port, long, NULL, 0444); module_param_array(port, long, NULL, 0444);
MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver."); 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]) if (!enable[n])
return 0; return 0;
...@@ -47,7 +47,7 @@ static void snd_adlib_free(struct snd_card *card) ...@@ -47,7 +47,7 @@ static void snd_adlib_free(struct snd_card *card)
release_and_free_resource(card->private_data); 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_card *card;
struct snd_opl3 *opl3; struct snd_opl3 *opl3;
...@@ -98,7 +98,7 @@ out: snd_card_free(card); ...@@ -98,7 +98,7 @@ out: snd_card_free(card);
return error; 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)); snd_card_free(dev_get_drvdata(dev));
dev_set_drvdata(dev, NULL); dev_set_drvdata(dev, NULL);
...@@ -108,7 +108,7 @@ static int __devexit snd_adlib_remove(struct device *dev, unsigned int n) ...@@ -108,7 +108,7 @@ static int __devexit snd_adlib_remove(struct device *dev, unsigned int n)
static struct isa_driver snd_adlib_driver = { static struct isa_driver snd_adlib_driver = {
.match = snd_adlib_match, .match = snd_adlib_match,
.probe = snd_adlib_probe, .probe = snd_adlib_probe,
.remove = __devexit_p(snd_adlib_remove), .remove = snd_adlib_remove,
.driver = { .driver = {
.name = DEV_NAME .name = DEV_NAME
......
sound/isa/als100.c
View file @ 1bff292e
...@@ -117,7 +117,7 @@ static struct pnp_card_device_id snd_als100_pnpids[] = { ...@@ -117,7 +117,7 @@ static struct pnp_card_device_id snd_als100_pnpids[] = {
MODULE_DEVICE_TABLE(pnp_card, 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, struct pnp_card_link *card,
const struct pnp_card_device_id *id) 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, ...@@ -183,7 +183,7 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,
return 0; return 0;
} }
static int __devinit snd_card_als100_probe(int dev, static int snd_card_als100_probe(int dev,
struct pnp_card_link *pcard, struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
...@@ -286,9 +286,9 @@ static int __devinit snd_card_als100_probe(int dev, ...@@ -286,9 +286,9 @@ static int __devinit snd_card_als100_probe(int dev,
return 0; 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) const struct pnp_card_device_id *id)
{ {
static int dev; static int dev;
...@@ -307,7 +307,7 @@ static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card, ...@@ -307,7 +307,7 @@ static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
return -ENODEV; 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)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -344,7 +344,7 @@ static struct pnp_card_driver als100_pnpc_driver = { ...@@ -344,7 +344,7 @@ static struct pnp_card_driver als100_pnpc_driver = {
.name = "als100", .name = "als100",
.id_table = snd_als100_pnpids, .id_table = snd_als100_pnpids,
.probe = snd_als100_pnp_detect, .probe = snd_als100_pnp_detect,
.remove = __devexit_p(snd_als100_pnp_remove), .remove = snd_als100_pnp_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_als100_pnp_suspend, .suspend = snd_als100_pnp_suspend,
.resume = snd_als100_pnp_resume, .resume = snd_als100_pnp_resume,
......
sound/isa/azt2320.c
View file @ 1bff292e
...@@ -99,7 +99,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_azt2320_pnpids); ...@@ -99,7 +99,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_azt2320_pnpids);
#define DRIVER_NAME "snd-card-azt2320" #define DRIVER_NAME "snd-card-azt2320"
static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acard, static int snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acard,
struct pnp_card_link *card, struct pnp_card_link *card,
const struct pnp_card_device_id *id) const struct pnp_card_device_id *id)
{ {
...@@ -147,7 +147,7 @@ static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acar ...@@ -147,7 +147,7 @@ static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acar
} }
/* same of snd_sbdsp_command by Jaroslav Kysela */ /* same of snd_sbdsp_command by Jaroslav Kysela */
static int __devinit snd_card_azt2320_command(unsigned long port, unsigned char val) static int snd_card_azt2320_command(unsigned long port, unsigned char val)
{ {
int i; int i;
unsigned long limit; unsigned long limit;
...@@ -161,7 +161,7 @@ static int __devinit snd_card_azt2320_command(unsigned long port, unsigned char ...@@ -161,7 +161,7 @@ static int __devinit snd_card_azt2320_command(unsigned long port, unsigned char
return -EBUSY; return -EBUSY;
} }
static int __devinit snd_card_azt2320_enable_wss(unsigned long port) static int snd_card_azt2320_enable_wss(unsigned long port)
{ {
int error; int error;
...@@ -174,7 +174,7 @@ static int __devinit snd_card_azt2320_enable_wss(unsigned long port) ...@@ -174,7 +174,7 @@ static int __devinit snd_card_azt2320_enable_wss(unsigned long port)
return 0; return 0;
} }
static int __devinit snd_card_azt2320_probe(int dev, static int snd_card_azt2320_probe(int dev,
struct pnp_card_link *pcard, struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
...@@ -264,9 +264,9 @@ static int __devinit snd_card_azt2320_probe(int dev, ...@@ -264,9 +264,9 @@ static int __devinit snd_card_azt2320_probe(int dev,
return 0; return 0;
} }
static unsigned int __devinitdata azt2320_devices; static unsigned int azt2320_devices;
static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card, static int snd_azt2320_pnp_detect(struct pnp_card_link *card,
const struct pnp_card_device_id *id) const struct pnp_card_device_id *id)
{ {
static int dev; static int dev;
...@@ -285,7 +285,7 @@ static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card, ...@@ -285,7 +285,7 @@ static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
return -ENODEV; return -ENODEV;
} }
static void __devexit snd_azt2320_pnp_remove(struct pnp_card_link * pcard) static void snd_azt2320_pnp_remove(struct pnp_card_link *pcard)
{ {
snd_card_free(pnp_get_card_drvdata(pcard)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -320,7 +320,7 @@ static struct pnp_card_driver azt2320_pnpc_driver = { ...@@ -320,7 +320,7 @@ static struct pnp_card_driver azt2320_pnpc_driver = {
.name = "azt2320", .name = "azt2320",
.id_table = snd_azt2320_pnpids, .id_table = snd_azt2320_pnpids,
.probe = snd_azt2320_pnp_detect, .probe = snd_azt2320_pnp_detect,
.remove = __devexit_p(snd_azt2320_pnp_remove), .remove = snd_azt2320_pnp_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_azt2320_pnp_suspend, .suspend = snd_azt2320_pnp_suspend,
.resume = snd_azt2320_pnp_resume, .resume = snd_azt2320_pnp_resume,
......
sound/isa/cmi8328.c
View file @ 1bff292e
...@@ -140,7 +140,7 @@ static void snd_cmi8328_cfg_restore(u16 port, u8 cfg[]) ...@@ -140,7 +140,7 @@ static void snd_cmi8328_cfg_restore(u16 port, u8 cfg[])
snd_cmi8328_cfg_write(port, CFG3, cfg[2]); snd_cmi8328_cfg_write(port, CFG3, cfg[2]);
} }
static int __devinit snd_cmi8328_mixer(struct snd_wss *chip) static int snd_cmi8328_mixer(struct snd_wss *chip)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_ctl_elem_id id1, id2; struct snd_ctl_elem_id id1, id2;
...@@ -212,7 +212,7 @@ int array_find_l(long array[], long item) ...@@ -212,7 +212,7 @@ int array_find_l(long array[], long item)
return -1; return -1;
} }
static int __devinit snd_cmi8328_probe(struct device *pdev, unsigned int ndev) static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_opl3 *opl3; struct snd_opl3 *opl3;
...@@ -401,7 +401,7 @@ static int __devinit snd_cmi8328_probe(struct device *pdev, unsigned int ndev) ...@@ -401,7 +401,7 @@ static int __devinit snd_cmi8328_probe(struct device *pdev, unsigned int ndev)
return err; return err;
} }
static int __devexit snd_cmi8328_remove(struct device *pdev, unsigned int dev) static int snd_cmi8328_remove(struct device *pdev, unsigned int dev)
{ {
struct snd_card *card = dev_get_drvdata(pdev); struct snd_card *card = dev_get_drvdata(pdev);
struct snd_cmi8328 *cmi = card->private_data; struct snd_cmi8328 *cmi = card->private_data;
...@@ -459,7 +459,7 @@ static int snd_cmi8328_resume(struct device *pdev, unsigned int n) ...@@ -459,7 +459,7 @@ static int snd_cmi8328_resume(struct device *pdev, unsigned int n)
static struct isa_driver snd_cmi8328_driver = { static struct isa_driver snd_cmi8328_driver = {
.probe = snd_cmi8328_probe, .probe = snd_cmi8328_probe,
.remove = __devexit_p(snd_cmi8328_remove), .remove = snd_cmi8328_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_cmi8328_suspend, .suspend = snd_cmi8328_suspend,
.resume = snd_cmi8328_resume, .resume = snd_cmi8328_resume,
......
sound/isa/cmi8330.c
View file @ 1bff292e
...@@ -193,7 +193,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_cmi8330_pnpids); ...@@ -193,7 +193,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_cmi8330_pnpids);
#endif #endif
static struct snd_kcontrol_new snd_cmi8330_controls[] __devinitdata = { static struct snd_kcontrol_new snd_cmi8330_controls[] = {
WSS_DOUBLE("Master Playback Volume", 0, WSS_DOUBLE("Master Playback Volume", 0,
CMI8330_MASTVOL, CMI8330_MASTVOL, 4, 0, 15, 0), CMI8330_MASTVOL, CMI8330_MASTVOL, 4, 0, 15, 0),
WSS_SINGLE("Loud Playback Switch", 0, WSS_SINGLE("Loud Playback Switch", 0,
...@@ -249,7 +249,7 @@ WSS_SINGLE(SNDRV_CTL_NAME_IEC958("Input ", PLAYBACK, SWITCH), 0, ...@@ -249,7 +249,7 @@ WSS_SINGLE(SNDRV_CTL_NAME_IEC958("Input ", PLAYBACK, SWITCH), 0,
}; };
#ifdef ENABLE_SB_MIXER #ifdef ENABLE_SB_MIXER
static struct sbmix_elem cmi8330_sb_mixers[] __devinitdata = { static struct sbmix_elem cmi8330_sb_mixers[] = {
SB_DOUBLE("SB Master Playback Volume", SB_DSP4_MASTER_DEV, (SB_DSP4_MASTER_DEV + 1), 3, 3, 31), SB_DOUBLE("SB Master Playback Volume", SB_DSP4_MASTER_DEV, (SB_DSP4_MASTER_DEV + 1), 3, 3, 31),
SB_DOUBLE("Tone Control - Bass", SB_DSP4_BASS_DEV, (SB_DSP4_BASS_DEV + 1), 4, 4, 15), SB_DOUBLE("Tone Control - Bass", SB_DSP4_BASS_DEV, (SB_DSP4_BASS_DEV + 1), 4, 4, 15),
SB_DOUBLE("Tone Control - Treble", SB_DSP4_TREBLE_DEV, (SB_DSP4_TREBLE_DEV + 1), 4, 4, 15), SB_DOUBLE("Tone Control - Treble", SB_DSP4_TREBLE_DEV, (SB_DSP4_TREBLE_DEV + 1), 4, 4, 15),
...@@ -267,7 +267,7 @@ SB_DOUBLE("SB Playback Volume", SB_DSP4_OGAIN_DEV, (SB_DSP4_OGAIN_DEV + 1), 6, 6 ...@@ -267,7 +267,7 @@ SB_DOUBLE("SB Playback Volume", SB_DSP4_OGAIN_DEV, (SB_DSP4_OGAIN_DEV + 1), 6, 6
SB_SINGLE("SB Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1), SB_SINGLE("SB Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1),
}; };
static unsigned char cmi8330_sb_init_values[][2] __devinitdata = { static unsigned char cmi8330_sb_init_values[][2] = {
{ SB_DSP4_MASTER_DEV + 0, 0 }, { SB_DSP4_MASTER_DEV + 0, 0 },
{ SB_DSP4_MASTER_DEV + 1, 0 }, { SB_DSP4_MASTER_DEV + 1, 0 },
{ SB_DSP4_PCM_DEV + 0, 0 }, { SB_DSP4_PCM_DEV + 0, 0 },
...@@ -281,7 +281,7 @@ static unsigned char cmi8330_sb_init_values[][2] __devinitdata = { ...@@ -281,7 +281,7 @@ static unsigned char cmi8330_sb_init_values[][2] __devinitdata = {
}; };
static int __devinit cmi8330_add_sb_mixers(struct snd_sb *chip) static int cmi8330_add_sb_mixers(struct snd_sb *chip)
{ {
int idx, err; int idx, err;
unsigned long flags; unsigned long flags;
...@@ -306,7 +306,7 @@ static int __devinit cmi8330_add_sb_mixers(struct snd_sb *chip) ...@@ -306,7 +306,7 @@ static int __devinit cmi8330_add_sb_mixers(struct snd_sb *chip)
} }
#endif #endif
static int __devinit snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 *acard) static int snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 *acard)
{ {
unsigned int idx; unsigned int idx;
int err; int err;
...@@ -329,7 +329,7 @@ static int __devinit snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 ...@@ -329,7 +329,7 @@ static int __devinit snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330
} }
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard, static int snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
struct pnp_card_link *card, struct pnp_card_link *card,
const struct pnp_card_device_id *id) const struct pnp_card_device_id *id)
{ {
...@@ -437,7 +437,7 @@ static int snd_cmi8330_capture_open(struct snd_pcm_substream *substream) ...@@ -437,7 +437,7 @@ static int snd_cmi8330_capture_open(struct snd_pcm_substream *substream)
return chip->streams[SNDRV_PCM_STREAM_CAPTURE].open(substream); return chip->streams[SNDRV_PCM_STREAM_CAPTURE].open(substream);
} }
static int __devinit snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *chip) static int snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *chip)
{ {
struct snd_pcm *pcm; struct snd_pcm *pcm;
const struct snd_pcm_ops *ops; const struct snd_pcm_ops *ops;
...@@ -532,7 +532,7 @@ static int snd_cmi8330_card_new(int dev, struct snd_card **cardp) ...@@ -532,7 +532,7 @@ static int snd_cmi8330_card_new(int dev, struct snd_card **cardp)
return 0; return 0;
} }
static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev) static int snd_cmi8330_probe(struct snd_card *card, int dev)
{ {
struct snd_cmi8330 *acard; struct snd_cmi8330 *acard;
int i, err; int i, err;
...@@ -613,7 +613,7 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev) ...@@ -613,7 +613,7 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)
return snd_card_register(card); return snd_card_register(card);
} }
static int __devinit snd_cmi8330_isa_match(struct device *pdev, static int snd_cmi8330_isa_match(struct device *pdev,
unsigned int dev) unsigned int dev)
{ {
if (!enable[dev] || is_isapnp_selected(dev)) if (!enable[dev] || is_isapnp_selected(dev))
...@@ -629,7 +629,7 @@ static int __devinit snd_cmi8330_isa_match(struct device *pdev, ...@@ -629,7 +629,7 @@ static int __devinit snd_cmi8330_isa_match(struct device *pdev,
return 1; return 1;
} }
static int __devinit snd_cmi8330_isa_probe(struct device *pdev, static int snd_cmi8330_isa_probe(struct device *pdev,
unsigned int dev) unsigned int dev)
{ {
struct snd_card *card; struct snd_card *card;
...@@ -647,7 +647,7 @@ static int __devinit snd_cmi8330_isa_probe(struct device *pdev, ...@@ -647,7 +647,7 @@ static int __devinit snd_cmi8330_isa_probe(struct device *pdev,
return 0; return 0;
} }
static int __devexit snd_cmi8330_isa_remove(struct device *devptr, static int snd_cmi8330_isa_remove(struct device *devptr,
unsigned int dev) unsigned int dev)
{ {
snd_card_free(dev_get_drvdata(devptr)); snd_card_free(dev_get_drvdata(devptr));
...@@ -673,7 +673,7 @@ static int snd_cmi8330_isa_resume(struct device *dev, unsigned int n) ...@@ -673,7 +673,7 @@ static int snd_cmi8330_isa_resume(struct device *dev, unsigned int n)
static struct isa_driver snd_cmi8330_driver = { static struct isa_driver snd_cmi8330_driver = {
.match = snd_cmi8330_isa_match, .match = snd_cmi8330_isa_match,
.probe = snd_cmi8330_isa_probe, .probe = snd_cmi8330_isa_probe,
.remove = __devexit_p(snd_cmi8330_isa_remove), .remove = snd_cmi8330_isa_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_cmi8330_isa_suspend, .suspend = snd_cmi8330_isa_suspend,
.resume = snd_cmi8330_isa_resume, .resume = snd_cmi8330_isa_resume,
...@@ -685,7 +685,7 @@ static struct isa_driver snd_cmi8330_driver = { ...@@ -685,7 +685,7 @@ static struct isa_driver snd_cmi8330_driver = {
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *pcard, static int snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
static int dev; static int dev;
...@@ -717,7 +717,7 @@ static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *pcard, ...@@ -717,7 +717,7 @@ static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,
return 0; return 0;
} }
static void __devexit snd_cmi8330_pnp_remove(struct pnp_card_link * pcard) static void snd_cmi8330_pnp_remove(struct pnp_card_link *pcard)
{ {
snd_card_free(pnp_get_card_drvdata(pcard)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -740,7 +740,7 @@ static struct pnp_card_driver cmi8330_pnpc_driver = { ...@@ -740,7 +740,7 @@ static struct pnp_card_driver cmi8330_pnpc_driver = {
.name = "cmi8330", .name = "cmi8330",
.id_table = snd_cmi8330_pnpids, .id_table = snd_cmi8330_pnpids,
.probe = snd_cmi8330_pnp_detect, .probe = snd_cmi8330_pnp_detect,
.remove = __devexit_p(snd_cmi8330_pnp_remove), .remove = snd_cmi8330_pnp_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_cmi8330_pnp_suspend, .suspend = snd_cmi8330_pnp_suspend,
.resume = snd_cmi8330_pnp_resume, .resume = snd_cmi8330_pnp_resume,
......
sound/isa/cs423x/cs4231.c
View file @ 1bff292e
...@@ -68,7 +68,7 @@ MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver."); ...@@ -68,7 +68,7 @@ MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");
module_param_array(dma2, int, NULL, 0444); module_param_array(dma2, int, NULL, 0444);
MODULE_PARM_DESC(dma2, "DMA2 # for " CRD_NAME " driver."); MODULE_PARM_DESC(dma2, "DMA2 # for " CRD_NAME " driver.");
static int __devinit snd_cs4231_match(struct device *dev, unsigned int n) static int snd_cs4231_match(struct device *dev, unsigned int n)
{ {
if (!enable[n]) if (!enable[n])
return 0; return 0;
...@@ -88,7 +88,7 @@ static int __devinit snd_cs4231_match(struct device *dev, unsigned int n) ...@@ -88,7 +88,7 @@ static int __devinit snd_cs4231_match(struct device *dev, unsigned int n)
return 1; return 1;
} }
static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n) static int snd_cs4231_probe(struct device *dev, unsigned int n)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_wss *chip; struct snd_wss *chip;
...@@ -148,7 +148,7 @@ out: snd_card_free(card); ...@@ -148,7 +148,7 @@ out: snd_card_free(card);
return error; return error;
} }
static int __devexit snd_cs4231_remove(struct device *dev, unsigned int n) static int snd_cs4231_remove(struct device *dev, unsigned int n)
{ {
snd_card_free(dev_get_drvdata(dev)); snd_card_free(dev_get_drvdata(dev));
dev_set_drvdata(dev, NULL); dev_set_drvdata(dev, NULL);
...@@ -180,7 +180,7 @@ static int snd_cs4231_resume(struct device *dev, unsigned int n) ...@@ -180,7 +180,7 @@ static int snd_cs4231_resume(struct device *dev, unsigned int n)
static struct isa_driver snd_cs4231_driver = { static struct isa_driver snd_cs4231_driver = {
.match = snd_cs4231_match, .match = snd_cs4231_match,
.probe = snd_cs4231_probe, .probe = snd_cs4231_probe,
.remove = __devexit_p(snd_cs4231_remove), .remove = snd_cs4231_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_cs4231_suspend, .suspend = snd_cs4231_suspend,
.resume = snd_cs4231_resume, .resume = snd_cs4231_resume,
......
sound/isa/cs423x/cs4236.c
View file @ 1bff292e
...@@ -251,7 +251,7 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = { ...@@ -251,7 +251,7 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = {
MODULE_DEVICE_TABLE(pnp_card, snd_cs423x_pnpids); MODULE_DEVICE_TABLE(pnp_card, snd_cs423x_pnpids);
/* WSS initialization */ /* WSS initialization */
static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev) static int snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev)
{ {
if (pnp_activate_dev(pdev) < 0) { if (pnp_activate_dev(pdev) < 0) {
printk(KERN_ERR IDENT " WSS PnP configure failed for WSS (out of resources?)\n"); printk(KERN_ERR IDENT " WSS PnP configure failed for WSS (out of resources?)\n");
...@@ -272,7 +272,7 @@ static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev) ...@@ -272,7 +272,7 @@ static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev)
} }
/* CTRL initialization */ /* CTRL initialization */
static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev) static int snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev)
{ {
if (pnp_activate_dev(pdev) < 0) { if (pnp_activate_dev(pdev) < 0) {
printk(KERN_ERR IDENT " CTRL PnP configure failed for WSS (out of resources?)\n"); printk(KERN_ERR IDENT " CTRL PnP configure failed for WSS (out of resources?)\n");
...@@ -284,7 +284,7 @@ static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev) ...@@ -284,7 +284,7 @@ static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev)
} }
/* MPU initialization */ /* MPU initialization */
static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev) static int snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
{ {
if (pnp_activate_dev(pdev) < 0) { if (pnp_activate_dev(pdev) < 0) {
printk(KERN_ERR IDENT " MPU401 PnP configure failed for WSS (out of resources?)\n"); printk(KERN_ERR IDENT " MPU401 PnP configure failed for WSS (out of resources?)\n");
...@@ -303,7 +303,7 @@ static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev) ...@@ -303,7 +303,7 @@ static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
return 0; return 0;
} }
static int __devinit snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard, static int snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard,
struct pnp_dev *pdev, struct pnp_dev *pdev,
struct pnp_dev *cdev) struct pnp_dev *cdev)
{ {
...@@ -317,7 +317,7 @@ static int __devinit snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard, ...@@ -317,7 +317,7 @@ static int __devinit snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard,
return 0; return 0;
} }
static int __devinit snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard, static int snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard,
struct pnp_card_link *card, struct pnp_card_link *card,
const struct pnp_card_device_id *id) const struct pnp_card_device_id *id)
{ {
...@@ -378,7 +378,7 @@ static int snd_cs423x_card_new(int dev, struct snd_card **cardp) ...@@ -378,7 +378,7 @@ static int snd_cs423x_card_new(int dev, struct snd_card **cardp)
return 0; return 0;
} }
static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) static int snd_cs423x_probe(struct snd_card *card, int dev)
{ {
struct snd_card_cs4236 *acard; struct snd_card_cs4236 *acard;
struct snd_pcm *pcm; struct snd_pcm *pcm;
...@@ -456,7 +456,7 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) ...@@ -456,7 +456,7 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
return snd_card_register(card); return snd_card_register(card);
} }
static int __devinit snd_cs423x_isa_match(struct device *pdev, static int snd_cs423x_isa_match(struct device *pdev,
unsigned int dev) unsigned int dev)
{ {
if (!enable[dev] || is_isapnp_selected(dev)) if (!enable[dev] || is_isapnp_selected(dev))
...@@ -481,7 +481,7 @@ static int __devinit snd_cs423x_isa_match(struct device *pdev, ...@@ -481,7 +481,7 @@ static int __devinit snd_cs423x_isa_match(struct device *pdev,
return 1; return 1;
} }
static int __devinit snd_cs423x_isa_probe(struct device *pdev, static int snd_cs423x_isa_probe(struct device *pdev,
unsigned int dev) unsigned int dev)
{ {
struct snd_card *card; struct snd_card *card;
...@@ -500,7 +500,7 @@ static int __devinit snd_cs423x_isa_probe(struct device *pdev, ...@@ -500,7 +500,7 @@ static int __devinit snd_cs423x_isa_probe(struct device *pdev,
return 0; return 0;
} }
static int __devexit snd_cs423x_isa_remove(struct device *pdev, static int snd_cs423x_isa_remove(struct device *pdev,
unsigned int dev) unsigned int dev)
{ {
snd_card_free(dev_get_drvdata(pdev)); snd_card_free(dev_get_drvdata(pdev));
...@@ -540,7 +540,7 @@ static int snd_cs423x_isa_resume(struct device *dev, unsigned int n) ...@@ -540,7 +540,7 @@ static int snd_cs423x_isa_resume(struct device *dev, unsigned int n)
static struct isa_driver cs423x_isa_driver = { static struct isa_driver cs423x_isa_driver = {
.match = snd_cs423x_isa_match, .match = snd_cs423x_isa_match,
.probe = snd_cs423x_isa_probe, .probe = snd_cs423x_isa_probe,
.remove = __devexit_p(snd_cs423x_isa_remove), .remove = snd_cs423x_isa_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_cs423x_isa_suspend, .suspend = snd_cs423x_isa_suspend,
.resume = snd_cs423x_isa_resume, .resume = snd_cs423x_isa_resume,
...@@ -552,7 +552,7 @@ static struct isa_driver cs423x_isa_driver = { ...@@ -552,7 +552,7 @@ static struct isa_driver cs423x_isa_driver = {
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_cs423x_pnpbios_detect(struct pnp_dev *pdev, static int snd_cs423x_pnpbios_detect(struct pnp_dev *pdev,
const struct pnp_device_id *id) const struct pnp_device_id *id)
{ {
static int dev; static int dev;
...@@ -597,7 +597,7 @@ static int __devinit snd_cs423x_pnpbios_detect(struct pnp_dev *pdev, ...@@ -597,7 +597,7 @@ static int __devinit snd_cs423x_pnpbios_detect(struct pnp_dev *pdev,
return 0; return 0;
} }
static void __devexit snd_cs423x_pnp_remove(struct pnp_dev *pdev) static void snd_cs423x_pnp_remove(struct pnp_dev *pdev)
{ {
snd_card_free(pnp_get_drvdata(pdev)); snd_card_free(pnp_get_drvdata(pdev));
pnp_set_drvdata(pdev, NULL); pnp_set_drvdata(pdev, NULL);
...@@ -619,14 +619,14 @@ static struct pnp_driver cs423x_pnp_driver = { ...@@ -619,14 +619,14 @@ static struct pnp_driver cs423x_pnp_driver = {
.name = "cs423x-pnpbios", .name = "cs423x-pnpbios",
.id_table = snd_cs423x_pnpbiosids, .id_table = snd_cs423x_pnpbiosids,
.probe = snd_cs423x_pnpbios_detect, .probe = snd_cs423x_pnpbios_detect,
.remove = __devexit_p(snd_cs423x_pnp_remove), .remove = snd_cs423x_pnp_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_cs423x_pnp_suspend, .suspend = snd_cs423x_pnp_suspend,
.resume = snd_cs423x_pnp_resume, .resume = snd_cs423x_pnp_resume,
#endif #endif
}; };
static int __devinit snd_cs423x_pnpc_detect(struct pnp_card_link *pcard, static int snd_cs423x_pnpc_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
static int dev; static int dev;
...@@ -659,7 +659,7 @@ static int __devinit snd_cs423x_pnpc_detect(struct pnp_card_link *pcard, ...@@ -659,7 +659,7 @@ static int __devinit snd_cs423x_pnpc_detect(struct pnp_card_link *pcard,
return 0; return 0;
} }
static void __devexit snd_cs423x_pnpc_remove(struct pnp_card_link * pcard) static void snd_cs423x_pnpc_remove(struct pnp_card_link *pcard)
{ {
snd_card_free(pnp_get_card_drvdata(pcard)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -682,7 +682,7 @@ static struct pnp_card_driver cs423x_pnpc_driver = { ...@@ -682,7 +682,7 @@ static struct pnp_card_driver cs423x_pnpc_driver = {
.name = CS423X_ISAPNP_DRIVER, .name = CS423X_ISAPNP_DRIVER,
.id_table = snd_cs423x_pnpids, .id_table = snd_cs423x_pnpids,
.probe = snd_cs423x_pnpc_detect, .probe = snd_cs423x_pnpc_detect,
.remove = __devexit_p(snd_cs423x_pnpc_remove), .remove = snd_cs423x_pnpc_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_cs423x_pnpc_suspend, .suspend = snd_cs423x_pnpc_suspend,
.resume = snd_cs423x_pnpc_resume, .resume = snd_cs423x_pnpc_resume,
......
sound/isa/es1688/es1688.c
View file @ 1bff292e
...@@ -90,12 +90,12 @@ MODULE_PARM_DESC(dma8, "8-bit DMA # for " CRD_NAME " driver."); ...@@ -90,12 +90,12 @@ MODULE_PARM_DESC(dma8, "8-bit DMA # for " CRD_NAME " driver.");
#define is_isapnp_selected(dev) 0 #define is_isapnp_selected(dev) 0
#endif #endif
static int __devinit snd_es1688_match(struct device *dev, unsigned int n) static int snd_es1688_match(struct device *dev, unsigned int n)
{ {
return enable[n] && !is_isapnp_selected(n); return enable[n] && !is_isapnp_selected(n);
} }
static int __devinit snd_es1688_legacy_create(struct snd_card *card, static int snd_es1688_legacy_create(struct snd_card *card,
struct device *dev, unsigned int n) struct device *dev, unsigned int n)
{ {
struct snd_es1688 *chip = card->private_data; struct snd_es1688 *chip = card->private_data;
...@@ -134,7 +134,7 @@ static int __devinit snd_es1688_legacy_create(struct snd_card *card, ...@@ -134,7 +134,7 @@ static int __devinit snd_es1688_legacy_create(struct snd_card *card,
return error; return error;
} }
static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n) static int snd_es1688_probe(struct snd_card *card, unsigned int n)
{ {
struct snd_es1688 *chip = card->private_data; struct snd_es1688 *chip = card->private_data;
struct snd_opl3 *opl3; struct snd_opl3 *opl3;
...@@ -182,7 +182,7 @@ static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n) ...@@ -182,7 +182,7 @@ static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n)
return snd_card_register(card); return snd_card_register(card);
} }
static int __devinit snd_es1688_isa_probe(struct device *dev, unsigned int n) static int snd_es1688_isa_probe(struct device *dev, unsigned int n)
{ {
struct snd_card *card; struct snd_card *card;
int error; int error;
...@@ -210,7 +210,7 @@ static int __devinit snd_es1688_isa_probe(struct device *dev, unsigned int n) ...@@ -210,7 +210,7 @@ static int __devinit snd_es1688_isa_probe(struct device *dev, unsigned int n)
return error; return error;
} }
static int __devexit snd_es1688_isa_remove(struct device *dev, unsigned int n) static int snd_es1688_isa_remove(struct device *dev, unsigned int n)
{ {
snd_card_free(dev_get_drvdata(dev)); snd_card_free(dev_get_drvdata(dev));
dev_set_drvdata(dev, NULL); dev_set_drvdata(dev, NULL);
...@@ -220,7 +220,7 @@ static int __devexit snd_es1688_isa_remove(struct device *dev, unsigned int n) ...@@ -220,7 +220,7 @@ static int __devexit snd_es1688_isa_remove(struct device *dev, unsigned int n)
static struct isa_driver snd_es1688_driver = { static struct isa_driver snd_es1688_driver = {
.match = snd_es1688_match, .match = snd_es1688_match,
.probe = snd_es1688_isa_probe, .probe = snd_es1688_isa_probe,
.remove = __devexit_p(snd_es1688_isa_remove), .remove = snd_es1688_isa_remove,
#if 0 /* FIXME */ #if 0 /* FIXME */
.suspend = snd_es1688_suspend, .suspend = snd_es1688_suspend,
.resume = snd_es1688_resume, .resume = snd_es1688_resume,
...@@ -233,7 +233,7 @@ static struct isa_driver snd_es1688_driver = { ...@@ -233,7 +233,7 @@ static struct isa_driver snd_es1688_driver = {
static int snd_es968_pnp_is_probed; static int snd_es968_pnp_is_probed;
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_card_es968_pnp(struct snd_card *card, unsigned int n, static int snd_card_es968_pnp(struct snd_card *card, unsigned int n,
struct pnp_card_link *pcard, struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
...@@ -258,7 +258,7 @@ static int __devinit snd_card_es968_pnp(struct snd_card *card, unsigned int n, ...@@ -258,7 +258,7 @@ static int __devinit snd_card_es968_pnp(struct snd_card *card, unsigned int n,
mpu_irq[n], dma8[n], ES1688_HW_AUTO); mpu_irq[n], dma8[n], ES1688_HW_AUTO);
} }
static int __devinit snd_es968_pnp_detect(struct pnp_card_link *pcard, static int snd_es968_pnp_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
struct snd_card *card; struct snd_card *card;
...@@ -295,7 +295,7 @@ static int __devinit snd_es968_pnp_detect(struct pnp_card_link *pcard, ...@@ -295,7 +295,7 @@ static int __devinit snd_es968_pnp_detect(struct pnp_card_link *pcard,
return 0; return 0;
} }
static void __devexit snd_es968_pnp_remove(struct pnp_card_link * pcard) static void snd_es968_pnp_remove(struct pnp_card_link *pcard)
{ {
snd_card_free(pnp_get_card_drvdata(pcard)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -338,7 +338,7 @@ static struct pnp_card_driver es968_pnpc_driver = { ...@@ -338,7 +338,7 @@ static struct pnp_card_driver es968_pnpc_driver = {
.name = DEV_NAME " PnP", .name = DEV_NAME " PnP",
.id_table = snd_es968_pnpids, .id_table = snd_es968_pnpids,
.probe = snd_es968_pnp_detect, .probe = snd_es968_pnp_detect,
.remove = __devexit_p(snd_es968_pnp_remove), .remove = snd_es968_pnp_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_es968_pnp_suspend, .suspend = snd_es968_pnp_suspend,
.resume = snd_es968_pnp_resume, .resume = snd_es968_pnp_resume,
......
sound/isa/es18xx.c
View file @ 1bff292e
...@@ -348,7 +348,7 @@ static inline int snd_es18xx_mixer_writable(struct snd_es18xx *chip, unsigned ch ...@@ -348,7 +348,7 @@ static inline int snd_es18xx_mixer_writable(struct snd_es18xx *chip, unsigned ch
} }
static int __devinit snd_es18xx_reset(struct snd_es18xx *chip) static int snd_es18xx_reset(struct snd_es18xx *chip)
{ {
int i; int i;
outb(0x03, chip->port + 0x06); outb(0x03, chip->port + 0x06);
...@@ -1363,7 +1363,7 @@ static struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = { ...@@ -1363,7 +1363,7 @@ static struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = {
ES18XX_SINGLE("Hardware Master Volume Split", 0, 0x64, 7, 1, 0), ES18XX_SINGLE("Hardware Master Volume Split", 0, 0x64, 7, 1, 0),
}; };
static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg) static int snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg)
{ {
int data; int data;
...@@ -1372,7 +1372,7 @@ static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned ch ...@@ -1372,7 +1372,7 @@ static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned ch
return data; return data;
} }
static void __devinit snd_es18xx_config_write(struct snd_es18xx *chip, static void snd_es18xx_config_write(struct snd_es18xx *chip,
unsigned char reg, unsigned char data) unsigned char reg, unsigned char data)
{ {
/* No need for spinlocks, this function is used only in /* No need for spinlocks, this function is used only in
...@@ -1384,7 +1384,7 @@ static void __devinit snd_es18xx_config_write(struct snd_es18xx *chip, ...@@ -1384,7 +1384,7 @@ static void __devinit snd_es18xx_config_write(struct snd_es18xx *chip,
#endif #endif
} }
static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip, static int snd_es18xx_initialize(struct snd_es18xx *chip,
unsigned long mpu_port, unsigned long mpu_port,
unsigned long fm_port) unsigned long fm_port)
{ {
...@@ -1549,7 +1549,7 @@ static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip, ...@@ -1549,7 +1549,7 @@ static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip,
return 0; return 0;
} }
static int __devinit snd_es18xx_identify(struct snd_es18xx *chip) static int snd_es18xx_identify(struct snd_es18xx *chip)
{ {
int hi,lo; int hi,lo;
...@@ -1618,7 +1618,7 @@ static int __devinit snd_es18xx_identify(struct snd_es18xx *chip) ...@@ -1618,7 +1618,7 @@ static int __devinit snd_es18xx_identify(struct snd_es18xx *chip)
return 0; return 0;
} }
static int __devinit snd_es18xx_probe(struct snd_es18xx *chip, static int snd_es18xx_probe(struct snd_es18xx *chip,
unsigned long mpu_port, unsigned long mpu_port,
unsigned long fm_port) unsigned long fm_port)
{ {
...@@ -1680,7 +1680,7 @@ static struct snd_pcm_ops snd_es18xx_capture_ops = { ...@@ -1680,7 +1680,7 @@ static struct snd_pcm_ops snd_es18xx_capture_ops = {
.pointer = snd_es18xx_capture_pointer, .pointer = snd_es18xx_capture_pointer,
}; };
static int __devinit snd_es18xx_pcm(struct snd_card *card, int device, static int snd_es18xx_pcm(struct snd_card *card, int device,
struct snd_pcm **rpcm) struct snd_pcm **rpcm)
{ {
struct snd_es18xx *chip = card->private_data; struct snd_es18xx *chip = card->private_data;
...@@ -1777,7 +1777,7 @@ static int snd_es18xx_dev_free(struct snd_device *device) ...@@ -1777,7 +1777,7 @@ static int snd_es18xx_dev_free(struct snd_device *device)
return snd_es18xx_free(device->card); return snd_es18xx_free(device->card);
} }
static int __devinit snd_es18xx_new_device(struct snd_card *card, static int snd_es18xx_new_device(struct snd_card *card,
unsigned long port, unsigned long port,
unsigned long mpu_port, unsigned long mpu_port,
unsigned long fm_port, unsigned long fm_port,
...@@ -1839,7 +1839,7 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card, ...@@ -1839,7 +1839,7 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card,
return 0; return 0;
} }
static int __devinit snd_es18xx_mixer(struct snd_card *card) static int snd_es18xx_mixer(struct snd_card *card)
{ {
struct snd_es18xx *chip = card->private_data; struct snd_es18xx *chip = card->private_data;
int err; int err;
...@@ -2016,7 +2016,7 @@ static struct pnp_device_id snd_audiodrive_pnpbiosids[] = { ...@@ -2016,7 +2016,7 @@ static struct pnp_device_id snd_audiodrive_pnpbiosids[] = {
MODULE_DEVICE_TABLE(pnp, snd_audiodrive_pnpbiosids); MODULE_DEVICE_TABLE(pnp, snd_audiodrive_pnpbiosids);
/* PnP main device initialization */ /* PnP main device initialization */
static int __devinit snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev) static int snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev)
{ {
if (pnp_activate_dev(pdev) < 0) { if (pnp_activate_dev(pdev) < 0) {
snd_printk(KERN_ERR PFX "PnP configure failure (out of resources?)\n"); snd_printk(KERN_ERR PFX "PnP configure failure (out of resources?)\n");
...@@ -2043,7 +2043,7 @@ static int __devinit snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev) ...@@ -2043,7 +2043,7 @@ static int __devinit snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev)
return 0; return 0;
} }
static int __devinit snd_audiodrive_pnp(int dev, struct snd_es18xx *chip, static int snd_audiodrive_pnp(int dev, struct snd_es18xx *chip,
struct pnp_dev *pdev) struct pnp_dev *pdev)
{ {
chip->dev = pdev; chip->dev = pdev;
...@@ -2073,7 +2073,7 @@ static struct pnp_card_device_id snd_audiodrive_pnpids[] = { ...@@ -2073,7 +2073,7 @@ static struct pnp_card_device_id snd_audiodrive_pnpids[] = {
MODULE_DEVICE_TABLE(pnp_card, snd_audiodrive_pnpids); MODULE_DEVICE_TABLE(pnp_card, snd_audiodrive_pnpids);
static int __devinit snd_audiodrive_pnpc(int dev, struct snd_es18xx *chip, static int snd_audiodrive_pnpc(int dev, struct snd_es18xx *chip,
struct pnp_card_link *card, struct pnp_card_link *card,
const struct pnp_card_device_id *id) const struct pnp_card_device_id *id)
{ {
...@@ -2111,7 +2111,7 @@ static int snd_es18xx_card_new(int dev, struct snd_card **cardp) ...@@ -2111,7 +2111,7 @@ static int snd_es18xx_card_new(int dev, struct snd_card **cardp)
sizeof(struct snd_es18xx), cardp); sizeof(struct snd_es18xx), cardp);
} }
static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev) static int snd_audiodrive_probe(struct snd_card *card, int dev)
{ {
struct snd_es18xx *chip = card->private_data; struct snd_es18xx *chip = card->private_data;
struct snd_opl3 *opl3; struct snd_opl3 *opl3;
...@@ -2169,12 +2169,12 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev) ...@@ -2169,12 +2169,12 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)
return snd_card_register(card); return snd_card_register(card);
} }
static int __devinit snd_es18xx_isa_match(struct device *pdev, unsigned int dev) static int snd_es18xx_isa_match(struct device *pdev, unsigned int dev)
{ {
return enable[dev] && !is_isapnp_selected(dev); return enable[dev] && !is_isapnp_selected(dev);
} }
static int __devinit snd_es18xx_isa_probe1(int dev, struct device *devptr) static int snd_es18xx_isa_probe1(int dev, struct device *devptr)
{ {
struct snd_card *card; struct snd_card *card;
int err; int err;
...@@ -2191,7 +2191,7 @@ static int __devinit snd_es18xx_isa_probe1(int dev, struct device *devptr) ...@@ -2191,7 +2191,7 @@ static int __devinit snd_es18xx_isa_probe1(int dev, struct device *devptr)
return 0; return 0;
} }
static int __devinit snd_es18xx_isa_probe(struct device *pdev, unsigned int dev) static int snd_es18xx_isa_probe(struct device *pdev, unsigned int dev)
{ {
int err; int err;
static int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1}; static int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1};
...@@ -2231,7 +2231,7 @@ static int __devinit snd_es18xx_isa_probe(struct device *pdev, unsigned int dev) ...@@ -2231,7 +2231,7 @@ static int __devinit snd_es18xx_isa_probe(struct device *pdev, unsigned int dev)
} }
} }
static int __devexit snd_es18xx_isa_remove(struct device *devptr, static int snd_es18xx_isa_remove(struct device *devptr,
unsigned int dev) unsigned int dev)
{ {
snd_card_free(dev_get_drvdata(devptr)); snd_card_free(dev_get_drvdata(devptr));
...@@ -2257,7 +2257,7 @@ static int snd_es18xx_isa_resume(struct device *dev, unsigned int n) ...@@ -2257,7 +2257,7 @@ static int snd_es18xx_isa_resume(struct device *dev, unsigned int n)
static struct isa_driver snd_es18xx_isa_driver = { static struct isa_driver snd_es18xx_isa_driver = {
.match = snd_es18xx_isa_match, .match = snd_es18xx_isa_match,
.probe = snd_es18xx_isa_probe, .probe = snd_es18xx_isa_probe,
.remove = __devexit_p(snd_es18xx_isa_remove), .remove = snd_es18xx_isa_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_es18xx_isa_suspend, .suspend = snd_es18xx_isa_suspend,
.resume = snd_es18xx_isa_resume, .resume = snd_es18xx_isa_resume,
...@@ -2269,7 +2269,7 @@ static struct isa_driver snd_es18xx_isa_driver = { ...@@ -2269,7 +2269,7 @@ static struct isa_driver snd_es18xx_isa_driver = {
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_audiodrive_pnp_detect(struct pnp_dev *pdev, static int snd_audiodrive_pnp_detect(struct pnp_dev *pdev,
const struct pnp_device_id *id) const struct pnp_device_id *id)
{ {
static int dev; static int dev;
...@@ -2302,7 +2302,7 @@ static int __devinit snd_audiodrive_pnp_detect(struct pnp_dev *pdev, ...@@ -2302,7 +2302,7 @@ static int __devinit snd_audiodrive_pnp_detect(struct pnp_dev *pdev,
return 0; return 0;
} }
static void __devexit snd_audiodrive_pnp_remove(struct pnp_dev * pdev) static void snd_audiodrive_pnp_remove(struct pnp_dev *pdev)
{ {
snd_card_free(pnp_get_drvdata(pdev)); snd_card_free(pnp_get_drvdata(pdev));
pnp_set_drvdata(pdev, NULL); pnp_set_drvdata(pdev, NULL);
...@@ -2323,14 +2323,14 @@ static struct pnp_driver es18xx_pnp_driver = { ...@@ -2323,14 +2323,14 @@ static struct pnp_driver es18xx_pnp_driver = {
.name = "es18xx-pnpbios", .name = "es18xx-pnpbios",
.id_table = snd_audiodrive_pnpbiosids, .id_table = snd_audiodrive_pnpbiosids,
.probe = snd_audiodrive_pnp_detect, .probe = snd_audiodrive_pnp_detect,
.remove = __devexit_p(snd_audiodrive_pnp_remove), .remove = snd_audiodrive_pnp_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_audiodrive_pnp_suspend, .suspend = snd_audiodrive_pnp_suspend,
.resume = snd_audiodrive_pnp_resume, .resume = snd_audiodrive_pnp_resume,
#endif #endif
}; };
static int __devinit snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard, static int snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
static int dev; static int dev;
...@@ -2363,7 +2363,7 @@ static int __devinit snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard, ...@@ -2363,7 +2363,7 @@ static int __devinit snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard,
return 0; return 0;
} }
static void __devexit snd_audiodrive_pnpc_remove(struct pnp_card_link * pcard) static void snd_audiodrive_pnpc_remove(struct pnp_card_link *pcard)
{ {
snd_card_free(pnp_get_card_drvdata(pcard)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -2387,7 +2387,7 @@ static struct pnp_card_driver es18xx_pnpc_driver = { ...@@ -2387,7 +2387,7 @@ static struct pnp_card_driver es18xx_pnpc_driver = {
.name = "es18xx", .name = "es18xx",
.id_table = snd_audiodrive_pnpids, .id_table = snd_audiodrive_pnpids,
.probe = snd_audiodrive_pnpc_detect, .probe = snd_audiodrive_pnpc_detect,
.remove = __devexit_p(snd_audiodrive_pnpc_remove), .remove = snd_audiodrive_pnpc_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_audiodrive_pnpc_suspend, .suspend = snd_audiodrive_pnpc_suspend,
.resume = snd_audiodrive_pnpc_resume, .resume = snd_audiodrive_pnpc_resume,
......
sound/isa/galaxy/galaxy.c
View file @ 1bff292e
...@@ -84,7 +84,7 @@ MODULE_PARM_DESC(dma2, "Capture DMA # for " CRD_NAME " driver."); ...@@ -84,7 +84,7 @@ MODULE_PARM_DESC(dma2, "Capture DMA # for " CRD_NAME " driver.");
#define DSP_COMMAND_GET_VERSION 0xe1 #define DSP_COMMAND_GET_VERSION 0xe1
static int __devinit dsp_get_byte(void __iomem *port, u8 *val) static int dsp_get_byte(void __iomem *port, u8 *val)
{ {
int loops = 1000; int loops = 1000;
...@@ -97,7 +97,7 @@ static int __devinit dsp_get_byte(void __iomem *port, u8 *val) ...@@ -97,7 +97,7 @@ static int __devinit dsp_get_byte(void __iomem *port, u8 *val)
return 0; return 0;
} }
static int __devinit dsp_reset(void __iomem *port) static int dsp_reset(void __iomem *port)
{ {
u8 val; u8 val;
...@@ -111,7 +111,7 @@ static int __devinit dsp_reset(void __iomem *port) ...@@ -111,7 +111,7 @@ static int __devinit dsp_reset(void __iomem *port)
return 0; return 0;
} }
static int __devinit dsp_command(void __iomem *port, u8 cmd) static int dsp_command(void __iomem *port, u8 cmd)
{ {
int loops = 1000; int loops = 1000;
...@@ -124,7 +124,7 @@ static int __devinit dsp_command(void __iomem *port, u8 cmd) ...@@ -124,7 +124,7 @@ static int __devinit dsp_command(void __iomem *port, u8 cmd)
return 0; return 0;
} }
static int __devinit dsp_get_version(void __iomem *port, u8 *major, u8 *minor) static int dsp_get_version(void __iomem *port, u8 *major, u8 *minor)
{ {
int err; int err;
...@@ -161,7 +161,7 @@ static int __devinit dsp_get_version(void __iomem *port, u8 *major, u8 *minor) ...@@ -161,7 +161,7 @@ static int __devinit dsp_get_version(void __iomem *port, u8 *major, u8 *minor)
#define WSS_SIGNATURE 4 #define WSS_SIGNATURE 4
static int __devinit wss_detect(void __iomem *wss_port) static int wss_detect(void __iomem *wss_port)
{ {
if ((ioread8(wss_port + WSS_PORT_SIGNATURE) & 0x3f) != WSS_SIGNATURE) if ((ioread8(wss_port + WSS_PORT_SIGNATURE) & 0x3f) != WSS_SIGNATURE)
return -ENODEV; return -ENODEV;
...@@ -204,7 +204,7 @@ struct snd_galaxy { ...@@ -204,7 +204,7 @@ struct snd_galaxy {
static u32 config[SNDRV_CARDS]; static u32 config[SNDRV_CARDS];
static u8 wss_config[SNDRV_CARDS]; static u8 wss_config[SNDRV_CARDS];
static int __devinit snd_galaxy_match(struct device *dev, unsigned int n) static int snd_galaxy_match(struct device *dev, unsigned int n)
{ {
if (!enable[n]) if (!enable[n])
return 0; return 0;
...@@ -379,7 +379,7 @@ static int __devinit snd_galaxy_match(struct device *dev, unsigned int n) ...@@ -379,7 +379,7 @@ static int __devinit snd_galaxy_match(struct device *dev, unsigned int n)
return 1; return 1;
} }
static int __devinit galaxy_init(struct snd_galaxy *galaxy, u8 *type) static int galaxy_init(struct snd_galaxy *galaxy, u8 *type)
{ {
u8 major; u8 major;
u8 minor; u8 minor;
...@@ -411,7 +411,7 @@ static int __devinit galaxy_init(struct snd_galaxy *galaxy, u8 *type) ...@@ -411,7 +411,7 @@ static int __devinit galaxy_init(struct snd_galaxy *galaxy, u8 *type)
return 0; return 0;
} }
static int __devinit galaxy_set_mode(struct snd_galaxy *galaxy, u8 mode) static int galaxy_set_mode(struct snd_galaxy *galaxy, u8 mode)
{ {
int err; int err;
...@@ -449,7 +449,7 @@ static void galaxy_set_config(struct snd_galaxy *galaxy, u32 config) ...@@ -449,7 +449,7 @@ static void galaxy_set_config(struct snd_galaxy *galaxy, u32 config)
msleep(10); msleep(10);
} }
static void __devinit galaxy_config(struct snd_galaxy *galaxy, u32 config) static void galaxy_config(struct snd_galaxy *galaxy, u32 config)
{ {
int i; int i;
...@@ -461,7 +461,7 @@ static void __devinit galaxy_config(struct snd_galaxy *galaxy, u32 config) ...@@ -461,7 +461,7 @@ static void __devinit galaxy_config(struct snd_galaxy *galaxy, u32 config)
galaxy_set_config(galaxy, config); galaxy_set_config(galaxy, config);
} }
static int __devinit galaxy_wss_config(struct snd_galaxy *galaxy, u8 wss_config) static int galaxy_wss_config(struct snd_galaxy *galaxy, u8 wss_config)
{ {
int err; int err;
...@@ -498,7 +498,7 @@ static void snd_galaxy_free(struct snd_card *card) ...@@ -498,7 +498,7 @@ static void snd_galaxy_free(struct snd_card *card)
} }
} }
static int __devinit snd_galaxy_probe(struct device *dev, unsigned int n) static int snd_galaxy_probe(struct device *dev, unsigned int n)
{ {
struct snd_galaxy *galaxy; struct snd_galaxy *galaxy;
struct snd_wss *chip; struct snd_wss *chip;
...@@ -620,7 +620,7 @@ static int __devinit snd_galaxy_probe(struct device *dev, unsigned int n) ...@@ -620,7 +620,7 @@ static int __devinit snd_galaxy_probe(struct device *dev, unsigned int n)
return err; return err;
} }
static int __devexit snd_galaxy_remove(struct device *dev, unsigned int n) static int snd_galaxy_remove(struct device *dev, unsigned int n)
{ {
snd_card_free(dev_get_drvdata(dev)); snd_card_free(dev_get_drvdata(dev));
dev_set_drvdata(dev, NULL); dev_set_drvdata(dev, NULL);
...@@ -630,7 +630,7 @@ static int __devexit snd_galaxy_remove(struct device *dev, unsigned int n) ...@@ -630,7 +630,7 @@ static int __devexit snd_galaxy_remove(struct device *dev, unsigned int n)
static struct isa_driver snd_galaxy_driver = { static struct isa_driver snd_galaxy_driver = {
.match = snd_galaxy_match, .match = snd_galaxy_match,
.probe = snd_galaxy_probe, .probe = snd_galaxy_probe,
.remove = __devexit_p(snd_galaxy_remove), .remove = snd_galaxy_remove,
.driver = { .driver = {
.name = DEV_NAME .name = DEV_NAME
......
sound/isa/gus/gusclassic.c
View file @ 1bff292e
...@@ -73,13 +73,14 @@ MODULE_PARM_DESC(channels, "GF1 channels for " CRD_NAME " driver."); ...@@ -73,13 +73,14 @@ MODULE_PARM_DESC(channels, "GF1 channels for " CRD_NAME " driver.");
module_param_array(pcm_channels, int, NULL, 0444); module_param_array(pcm_channels, int, NULL, 0444);
MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver."); MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver.");
static int __devinit snd_gusclassic_match(struct device *dev, unsigned int n) static int snd_gusclassic_match(struct device *dev, unsigned int n)
{ {
return enable[n]; return enable[n];
} }
static int __devinit snd_gusclassic_create(struct snd_card *card, static int snd_gusclassic_create(struct snd_card *card,
struct device *dev, unsigned int n, struct snd_gus_card **rgus) struct device *dev, unsigned int n,
struct snd_gus_card **rgus)
{ {
static long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260}; static long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260};
static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1}; static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};
...@@ -123,7 +124,7 @@ static int __devinit snd_gusclassic_create(struct snd_card *card, ...@@ -123,7 +124,7 @@ static int __devinit snd_gusclassic_create(struct snd_card *card,
return error; return error;
} }
static int __devinit snd_gusclassic_detect(struct snd_gus_card *gus) static int snd_gusclassic_detect(struct snd_gus_card *gus)
{ {
unsigned char d; unsigned char d;
...@@ -142,7 +143,7 @@ static int __devinit snd_gusclassic_detect(struct snd_gus_card *gus) ...@@ -142,7 +143,7 @@ static int __devinit snd_gusclassic_detect(struct snd_gus_card *gus)
return 0; return 0;
} }
static int __devinit snd_gusclassic_probe(struct device *dev, unsigned int n) static int snd_gusclassic_probe(struct device *dev, unsigned int n)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_gus_card *gus; struct snd_gus_card *gus;
...@@ -211,7 +212,7 @@ out: snd_card_free(card); ...@@ -211,7 +212,7 @@ out: snd_card_free(card);
return error; return error;
} }
static int __devexit snd_gusclassic_remove(struct device *dev, unsigned int n) static int snd_gusclassic_remove(struct device *dev, unsigned int n)
{ {
snd_card_free(dev_get_drvdata(dev)); snd_card_free(dev_get_drvdata(dev));
dev_set_drvdata(dev, NULL); dev_set_drvdata(dev, NULL);
...@@ -221,7 +222,7 @@ static int __devexit snd_gusclassic_remove(struct device *dev, unsigned int n) ...@@ -221,7 +222,7 @@ static int __devexit snd_gusclassic_remove(struct device *dev, unsigned int n)
static struct isa_driver snd_gusclassic_driver = { static struct isa_driver snd_gusclassic_driver = {
.match = snd_gusclassic_match, .match = snd_gusclassic_match,
.probe = snd_gusclassic_probe, .probe = snd_gusclassic_probe,
.remove = __devexit_p(snd_gusclassic_remove), .remove = snd_gusclassic_remove,
#if 0 /* FIXME */ #if 0 /* FIXME */
.suspend = snd_gusclassic_suspend, .suspend = snd_gusclassic_suspend,
.remove = snd_gusclassic_remove, .remove = snd_gusclassic_remove,
......
sound/isa/gus/gusextreme.c
View file @ 1bff292e
...@@ -89,13 +89,14 @@ MODULE_PARM_DESC(channels, "GF1 channels for " CRD_NAME " driver."); ...@@ -89,13 +89,14 @@ MODULE_PARM_DESC(channels, "GF1 channels for " CRD_NAME " driver.");
module_param_array(pcm_channels, int, NULL, 0444); module_param_array(pcm_channels, int, NULL, 0444);
MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver."); MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver.");
static int __devinit snd_gusextreme_match(struct device *dev, unsigned int n) static int snd_gusextreme_match(struct device *dev, unsigned int n)
{ {
return enable[n]; return enable[n];
} }
static int __devinit snd_gusextreme_es1688_create(struct snd_card *card, static int snd_gusextreme_es1688_create(struct snd_card *card,
struct snd_es1688 *chip, struct device *dev, unsigned int n) struct snd_es1688 *chip,
struct device *dev, unsigned int n)
{ {
static long possible_ports[] = {0x220, 0x240, 0x260}; static long possible_ports[] = {0x220, 0x240, 0x260};
static int possible_irqs[] = {5, 9, 10, 7, -1}; static int possible_irqs[] = {5, 9, 10, 7, -1};
...@@ -132,8 +133,9 @@ static int __devinit snd_gusextreme_es1688_create(struct snd_card *card, ...@@ -132,8 +133,9 @@ static int __devinit snd_gusextreme_es1688_create(struct snd_card *card,
return error; return error;
} }
static int __devinit snd_gusextreme_gus_card_create(struct snd_card *card, static int snd_gusextreme_gus_card_create(struct snd_card *card,
struct device *dev, unsigned int n, struct snd_gus_card **rgus) struct device *dev, unsigned int n,
struct snd_gus_card **rgus)
{ {
static int possible_irqs[] = {11, 12, 15, 9, 5, 7, 3, -1}; static int possible_irqs[] = {11, 12, 15, 9, 5, 7, 3, -1};
static int possible_dmas[] = {5, 6, 7, 3, 1, -1}; static int possible_dmas[] = {5, 6, 7, 3, 1, -1};
...@@ -156,7 +158,7 @@ static int __devinit snd_gusextreme_gus_card_create(struct snd_card *card, ...@@ -156,7 +158,7 @@ static int __devinit snd_gusextreme_gus_card_create(struct snd_card *card,
0, channels[n], pcm_channels[n], 0, rgus); 0, channels[n], pcm_channels[n], 0, rgus);
} }
static int __devinit snd_gusextreme_detect(struct snd_gus_card *gus, static int snd_gusextreme_detect(struct snd_gus_card *gus,
struct snd_es1688 *es1688) struct snd_es1688 *es1688)
{ {
unsigned long flags; unsigned long flags;
...@@ -206,7 +208,7 @@ static int __devinit snd_gusextreme_detect(struct snd_gus_card *gus, ...@@ -206,7 +208,7 @@ static int __devinit snd_gusextreme_detect(struct snd_gus_card *gus,
return 0; return 0;
} }
static int __devinit snd_gusextreme_mixer(struct snd_card *card) static int snd_gusextreme_mixer(struct snd_card *card)
{ {
struct snd_ctl_elem_id id1, id2; struct snd_ctl_elem_id id1, id2;
int error; int error;
...@@ -232,7 +234,7 @@ static int __devinit snd_gusextreme_mixer(struct snd_card *card) ...@@ -232,7 +234,7 @@ static int __devinit snd_gusextreme_mixer(struct snd_card *card)
return 0; return 0;
} }
static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n) static int snd_gusextreme_probe(struct device *dev, unsigned int n)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_gus_card *gus; struct snd_gus_card *gus;
...@@ -339,7 +341,7 @@ out: snd_card_free(card); ...@@ -339,7 +341,7 @@ out: snd_card_free(card);
return error; return error;
} }
static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n) static int snd_gusextreme_remove(struct device *dev, unsigned int n)
{ {
snd_card_free(dev_get_drvdata(dev)); snd_card_free(dev_get_drvdata(dev));
dev_set_drvdata(dev, NULL); dev_set_drvdata(dev, NULL);
...@@ -349,7 +351,7 @@ static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n) ...@@ -349,7 +351,7 @@ static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n)
static struct isa_driver snd_gusextreme_driver = { static struct isa_driver snd_gusextreme_driver = {
.match = snd_gusextreme_match, .match = snd_gusextreme_match,
.probe = snd_gusextreme_probe, .probe = snd_gusextreme_probe,
.remove = __devexit_p(snd_gusextreme_remove), .remove = snd_gusextreme_remove,
#if 0 /* FIXME */ #if 0 /* FIXME */
.suspend = snd_gusextreme_suspend, .suspend = snd_gusextreme_suspend,
.resume = snd_gusextreme_resume, .resume = snd_gusextreme_resume,
......
sound/isa/gus/gusmax.c
View file @ 1bff292e
...@@ -82,7 +82,7 @@ struct snd_gusmax { ...@@ -82,7 +82,7 @@ struct snd_gusmax {
#define PFX "gusmax: " #define PFX "gusmax: "
static int __devinit snd_gusmax_detect(struct snd_gus_card * gus) static int snd_gusmax_detect(struct snd_gus_card *gus)
{ {
unsigned char d; unsigned char d;
...@@ -124,8 +124,8 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id) ...@@ -124,8 +124,8 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id)
return IRQ_RETVAL(handled); return IRQ_RETVAL(handled);
} }
static void __devinit snd_gusmax_init(int dev, struct snd_card *card, static void snd_gusmax_init(int dev, struct snd_card *card,
struct snd_gus_card * gus) struct snd_gus_card *gus)
{ {
gus->equal_irq = 1; gus->equal_irq = 1;
gus->codec_flag = 1; gus->codec_flag = 1;
...@@ -140,7 +140,7 @@ static void __devinit snd_gusmax_init(int dev, struct snd_card *card, ...@@ -140,7 +140,7 @@ static void __devinit snd_gusmax_init(int dev, struct snd_card *card,
outb(gus->max_cntrl_val, GUSP(gus, MAXCNTRLPORT)); outb(gus->max_cntrl_val, GUSP(gus, MAXCNTRLPORT));
} }
static int __devinit snd_gusmax_mixer(struct snd_wss *chip) static int snd_gusmax_mixer(struct snd_wss *chip)
{ {
struct snd_card *card = chip->card; struct snd_card *card = chip->card;
struct snd_ctl_elem_id id1, id2; struct snd_ctl_elem_id id1, id2;
...@@ -199,12 +199,12 @@ static void snd_gusmax_free(struct snd_card *card) ...@@ -199,12 +199,12 @@ static void snd_gusmax_free(struct snd_card *card)
free_irq(maxcard->irq, (void *)maxcard); free_irq(maxcard->irq, (void *)maxcard);
} }
static int __devinit snd_gusmax_match(struct device *pdev, unsigned int dev) static int snd_gusmax_match(struct device *pdev, unsigned int dev)
{ {
return enable[dev]; return enable[dev];
} }
static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev) static int snd_gusmax_probe(struct device *pdev, unsigned int dev)
{ {
static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1}; static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
static int possible_dmas[] = {5, 6, 7, 1, 3, -1}; static int possible_dmas[] = {5, 6, 7, 1, 3, -1};
...@@ -354,7 +354,7 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev) ...@@ -354,7 +354,7 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)
return err; return err;
} }
static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev) static int snd_gusmax_remove(struct device *devptr, unsigned int dev)
{ {
snd_card_free(dev_get_drvdata(devptr)); snd_card_free(dev_get_drvdata(devptr));
dev_set_drvdata(devptr, NULL); dev_set_drvdata(devptr, NULL);
...@@ -366,7 +366,7 @@ static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev) ...@@ -366,7 +366,7 @@ static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev)
static struct isa_driver snd_gusmax_driver = { static struct isa_driver snd_gusmax_driver = {
.match = snd_gusmax_match, .match = snd_gusmax_match,
.probe = snd_gusmax_probe, .probe = snd_gusmax_probe,
.remove = __devexit_p(snd_gusmax_remove), .remove = snd_gusmax_remove,
/* FIXME: suspend/resume */ /* FIXME: suspend/resume */
.driver = { .driver = {
.name = DEV_NAME .name = DEV_NAME
......
sound/isa/gus/interwave.c
View file @ 1bff292e
...@@ -207,8 +207,8 @@ static struct snd_i2c_bit_ops snd_interwave_i2c_bit_ops = { ...@@ -207,8 +207,8 @@ static struct snd_i2c_bit_ops snd_interwave_i2c_bit_ops = {
.getdata = snd_interwave_i2c_getdataline, .getdata = snd_interwave_i2c_getdataline,
}; };
static int __devinit snd_interwave_detect_stb(struct snd_interwave *iwcard, static int snd_interwave_detect_stb(struct snd_interwave *iwcard,
struct snd_gus_card * gus, int dev, struct snd_gus_card *gus, int dev,
struct snd_i2c_bus **rbus) struct snd_i2c_bus **rbus)
{ {
unsigned long port; unsigned long port;
...@@ -249,8 +249,8 @@ static int __devinit snd_interwave_detect_stb(struct snd_interwave *iwcard, ...@@ -249,8 +249,8 @@ static int __devinit snd_interwave_detect_stb(struct snd_interwave *iwcard,
} }
#endif #endif
static int __devinit snd_interwave_detect(struct snd_interwave *iwcard, static int snd_interwave_detect(struct snd_interwave *iwcard,
struct snd_gus_card * gus, struct snd_gus_card *gus,
int dev int dev
#ifdef SNDRV_STB #ifdef SNDRV_STB
, struct snd_i2c_bus **rbus , struct snd_i2c_bus **rbus
...@@ -318,7 +318,7 @@ static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id) ...@@ -318,7 +318,7 @@ static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id)
return IRQ_RETVAL(handled); return IRQ_RETVAL(handled);
} }
static void __devinit snd_interwave_reset(struct snd_gus_card * gus) static void snd_interwave_reset(struct snd_gus_card *gus)
{ {
snd_gf1_write8(gus, SNDRV_GF1_GB_RESET, 0x00); snd_gf1_write8(gus, SNDRV_GF1_GB_RESET, 0x00);
udelay(160); udelay(160);
...@@ -326,7 +326,7 @@ static void __devinit snd_interwave_reset(struct snd_gus_card * gus) ...@@ -326,7 +326,7 @@ static void __devinit snd_interwave_reset(struct snd_gus_card * gus)
udelay(160); udelay(160);
} }
static void __devinit snd_interwave_bank_sizes(struct snd_gus_card * gus, int *sizes) static void snd_interwave_bank_sizes(struct snd_gus_card *gus, int *sizes)
{ {
unsigned int idx; unsigned int idx;
unsigned int local; unsigned int local;
...@@ -377,7 +377,7 @@ struct rom_hdr { ...@@ -377,7 +377,7 @@ struct rom_hdr {
/* 511 */ unsigned char csum; /* 511 */ unsigned char csum;
}; };
static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus) static void snd_interwave_detect_memory(struct snd_gus_card *gus)
{ {
static unsigned int lmc[13] = static unsigned int lmc[13] =
{ {
...@@ -475,7 +475,7 @@ static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus) ...@@ -475,7 +475,7 @@ static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus)
snd_interwave_reset(gus); snd_interwave_reset(gus);
} }
static void __devinit snd_interwave_init(int dev, struct snd_gus_card * gus) static void snd_interwave_init(int dev, struct snd_gus_card *gus)
{ {
unsigned long flags; unsigned long flags;
...@@ -508,7 +508,7 @@ WSS_DOUBLE("Mic Playback Volume", 0, ...@@ -508,7 +508,7 @@ WSS_DOUBLE("Mic Playback Volume", 0,
CS4231_LEFT_MIC_INPUT, CS4231_RIGHT_MIC_INPUT, 0, 0, 31, 1) CS4231_LEFT_MIC_INPUT, CS4231_RIGHT_MIC_INPUT, 0, 0, 31, 1)
}; };
static int __devinit snd_interwave_mixer(struct snd_wss *chip) static int snd_interwave_mixer(struct snd_wss *chip)
{ {
struct snd_card *card = chip->card; struct snd_card *card = chip->card;
struct snd_ctl_elem_id id1, id2; struct snd_ctl_elem_id id1, id2;
...@@ -558,7 +558,7 @@ static int __devinit snd_interwave_mixer(struct snd_wss *chip) ...@@ -558,7 +558,7 @@ static int __devinit snd_interwave_mixer(struct snd_wss *chip)
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_interwave_pnp(int dev, struct snd_interwave *iwcard, static int snd_interwave_pnp(int dev, struct snd_interwave *iwcard,
struct pnp_card_link *card, struct pnp_card_link *card,
const struct pnp_card_device_id *id) const struct pnp_card_device_id *id)
{ {
...@@ -644,7 +644,7 @@ static int snd_interwave_card_new(int dev, struct snd_card **cardp) ...@@ -644,7 +644,7 @@ static int snd_interwave_card_new(int dev, struct snd_card **cardp)
return 0; return 0;
} }
static int __devinit snd_interwave_probe(struct snd_card *card, int dev) static int snd_interwave_probe(struct snd_card *card, int dev)
{ {
int xirq, xdma1, xdma2; int xirq, xdma1, xdma2;
struct snd_interwave *iwcard = card->private_data; struct snd_interwave *iwcard = card->private_data;
...@@ -775,7 +775,7 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev) ...@@ -775,7 +775,7 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
return 0; return 0;
} }
static int __devinit snd_interwave_isa_probe1(int dev, struct device *devptr) static int snd_interwave_isa_probe1(int dev, struct device *devptr)
{ {
struct snd_card *card; struct snd_card *card;
int err; int err;
...@@ -793,7 +793,7 @@ static int __devinit snd_interwave_isa_probe1(int dev, struct device *devptr) ...@@ -793,7 +793,7 @@ static int __devinit snd_interwave_isa_probe1(int dev, struct device *devptr)
return 0; return 0;
} }
static int __devinit snd_interwave_isa_match(struct device *pdev, static int snd_interwave_isa_match(struct device *pdev,
unsigned int dev) unsigned int dev)
{ {
if (!enable[dev]) if (!enable[dev])
...@@ -805,7 +805,7 @@ static int __devinit snd_interwave_isa_match(struct device *pdev, ...@@ -805,7 +805,7 @@ static int __devinit snd_interwave_isa_match(struct device *pdev,
return 1; return 1;
} }
static int __devinit snd_interwave_isa_probe(struct device *pdev, static int snd_interwave_isa_probe(struct device *pdev,
unsigned int dev) unsigned int dev)
{ {
int err; int err;
...@@ -846,7 +846,7 @@ static int __devinit snd_interwave_isa_probe(struct device *pdev, ...@@ -846,7 +846,7 @@ static int __devinit snd_interwave_isa_probe(struct device *pdev,
} }
} }
static int __devexit snd_interwave_isa_remove(struct device *devptr, unsigned int dev) static int snd_interwave_isa_remove(struct device *devptr, unsigned int dev)
{ {
snd_card_free(dev_get_drvdata(devptr)); snd_card_free(dev_get_drvdata(devptr));
dev_set_drvdata(devptr, NULL); dev_set_drvdata(devptr, NULL);
...@@ -856,7 +856,7 @@ static int __devexit snd_interwave_isa_remove(struct device *devptr, unsigned in ...@@ -856,7 +856,7 @@ static int __devexit snd_interwave_isa_remove(struct device *devptr, unsigned in
static struct isa_driver snd_interwave_driver = { static struct isa_driver snd_interwave_driver = {
.match = snd_interwave_isa_match, .match = snd_interwave_isa_match,
.probe = snd_interwave_isa_probe, .probe = snd_interwave_isa_probe,
.remove = __devexit_p(snd_interwave_isa_remove), .remove = snd_interwave_isa_remove,
/* FIXME: suspend,resume */ /* FIXME: suspend,resume */
.driver = { .driver = {
.name = INTERWAVE_DRIVER .name = INTERWAVE_DRIVER
...@@ -864,7 +864,7 @@ static struct isa_driver snd_interwave_driver = { ...@@ -864,7 +864,7 @@ static struct isa_driver snd_interwave_driver = {
}; };
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard, static int snd_interwave_pnp_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
static int dev; static int dev;
...@@ -896,7 +896,7 @@ static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard, ...@@ -896,7 +896,7 @@ static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard,
return 0; return 0;
} }
static void __devexit snd_interwave_pnp_remove(struct pnp_card_link * pcard) static void snd_interwave_pnp_remove(struct pnp_card_link *pcard)
{ {
snd_card_free(pnp_get_card_drvdata(pcard)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -907,7 +907,7 @@ static struct pnp_card_driver interwave_pnpc_driver = { ...@@ -907,7 +907,7 @@ static struct pnp_card_driver interwave_pnpc_driver = {
.name = INTERWAVE_PNP_DRIVER, .name = INTERWAVE_PNP_DRIVER,
.id_table = snd_interwave_pnpids, .id_table = snd_interwave_pnpids,
.probe = snd_interwave_pnp_detect, .probe = snd_interwave_pnp_detect,
.remove = __devexit_p(snd_interwave_pnp_remove), .remove = snd_interwave_pnp_remove,
/* FIXME: suspend,resume */ /* FIXME: suspend,resume */
}; };
......
sound/isa/msnd/msnd.h
View file @ 1bff292e
...@@ -303,6 +303,6 @@ int snd_msndmidi_new(struct snd_card *card, int device); ...@@ -303,6 +303,6 @@ int snd_msndmidi_new(struct snd_card *card, int device);
void snd_msndmidi_input_read(void *mpu); void snd_msndmidi_input_read(void *mpu);
void snd_msndmix_setup(struct snd_msnd *chip); void snd_msndmix_setup(struct snd_msnd *chip);
int __devinit snd_msndmix_new(struct snd_card *card); int snd_msndmix_new(struct snd_card *card);
int snd_msndmix_force_recsrc(struct snd_msnd *chip, int recsrc); int snd_msndmix_force_recsrc(struct snd_msnd *chip, int recsrc);
#endif /* __MSND_H */ #endif /* __MSND_H */
sound/isa/msnd/msnd_pinnacle.c
View file @ 1bff292e
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
# define LOGNAME "snd_msnd_pinnacle" # define LOGNAME "snd_msnd_pinnacle"
#endif #endif
static void __devinit set_default_audio_parameters(struct snd_msnd *chip) static void set_default_audio_parameters(struct snd_msnd *chip)
{ {
chip->play_sample_size = DEFSAMPLESIZE; chip->play_sample_size = DEFSAMPLESIZE;
chip->play_sample_rate = DEFSAMPLERATE; chip->play_sample_rate = DEFSAMPLERATE;
...@@ -213,7 +213,7 @@ static int snd_msnd_reset_dsp(long io, unsigned char *info) ...@@ -213,7 +213,7 @@ static int snd_msnd_reset_dsp(long io, unsigned char *info)
return -EIO; return -EIO;
} }
static int __devinit snd_msnd_probe(struct snd_card *card) static int snd_msnd_probe(struct snd_card *card)
{ {
struct snd_msnd *chip = card->private_data; struct snd_msnd *chip = card->private_data;
unsigned char info; unsigned char info;
...@@ -497,7 +497,7 @@ static int snd_msnd_send_dsp_cmd_chk(struct snd_msnd *chip, u8 cmd) ...@@ -497,7 +497,7 @@ static int snd_msnd_send_dsp_cmd_chk(struct snd_msnd *chip, u8 cmd)
return snd_msnd_send_dsp_cmd(chip, cmd); return snd_msnd_send_dsp_cmd(chip, cmd);
} }
static int __devinit snd_msnd_calibrate_adc(struct snd_msnd *chip, u16 srate) static int snd_msnd_calibrate_adc(struct snd_msnd *chip, u16 srate)
{ {
snd_printdd("snd_msnd_calibrate_adc(%i)\n", srate); snd_printdd("snd_msnd_calibrate_adc(%i)\n", srate);
writew(srate, chip->SMA + SMA_wCalFreqAtoD); writew(srate, chip->SMA + SMA_wCalFreqAtoD);
...@@ -535,7 +535,7 @@ static void snd_msnd_mpu401_close(struct snd_mpu401 *mpu) ...@@ -535,7 +535,7 @@ static void snd_msnd_mpu401_close(struct snd_mpu401 *mpu)
static long mpu_io[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; static long mpu_io[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;
static int __devinit snd_msnd_attach(struct snd_card *card) static int snd_msnd_attach(struct snd_card *card)
{ {
struct snd_msnd *chip = card->private_data; struct snd_msnd *chip = card->private_data;
int err; int err;
...@@ -634,7 +634,7 @@ static int __devinit snd_msnd_attach(struct snd_card *card) ...@@ -634,7 +634,7 @@ static int __devinit snd_msnd_attach(struct snd_card *card)
} }
static void __devexit snd_msnd_unload(struct snd_card *card) static void snd_msnd_unload(struct snd_card *card)
{ {
struct snd_msnd *chip = card->private_data; struct snd_msnd *chip = card->private_data;
...@@ -649,7 +649,7 @@ static void __devexit snd_msnd_unload(struct snd_card *card) ...@@ -649,7 +649,7 @@ static void __devexit snd_msnd_unload(struct snd_card *card)
/* Pinnacle/Fiji Logical Device Configuration */ /* Pinnacle/Fiji Logical Device Configuration */
static int __devinit snd_msnd_write_cfg(int cfg, int reg, int value) static int snd_msnd_write_cfg(int cfg, int reg, int value)
{ {
outb(reg, cfg); outb(reg, cfg);
outb(value, cfg + 1); outb(value, cfg + 1);
...@@ -660,7 +660,7 @@ static int __devinit snd_msnd_write_cfg(int cfg, int reg, int value) ...@@ -660,7 +660,7 @@ static int __devinit snd_msnd_write_cfg(int cfg, int reg, int value)
return 0; return 0;
} }
static int __devinit snd_msnd_write_cfg_io0(int cfg, int num, u16 io) static int snd_msnd_write_cfg_io0(int cfg, int num, u16 io)
{ {
if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))
return -EIO; return -EIO;
...@@ -671,7 +671,7 @@ static int __devinit snd_msnd_write_cfg_io0(int cfg, int num, u16 io) ...@@ -671,7 +671,7 @@ static int __devinit snd_msnd_write_cfg_io0(int cfg, int num, u16 io)
return 0; return 0;
} }
static int __devinit snd_msnd_write_cfg_io1(int cfg, int num, u16 io) static int snd_msnd_write_cfg_io1(int cfg, int num, u16 io)
{ {
if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))
return -EIO; return -EIO;
...@@ -682,7 +682,7 @@ static int __devinit snd_msnd_write_cfg_io1(int cfg, int num, u16 io) ...@@ -682,7 +682,7 @@ static int __devinit snd_msnd_write_cfg_io1(int cfg, int num, u16 io)
return 0; return 0;
} }
static int __devinit snd_msnd_write_cfg_irq(int cfg, int num, u16 irq) static int snd_msnd_write_cfg_irq(int cfg, int num, u16 irq)
{ {
if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))
return -EIO; return -EIO;
...@@ -693,7 +693,7 @@ static int __devinit snd_msnd_write_cfg_irq(int cfg, int num, u16 irq) ...@@ -693,7 +693,7 @@ static int __devinit snd_msnd_write_cfg_irq(int cfg, int num, u16 irq)
return 0; return 0;
} }
static int __devinit snd_msnd_write_cfg_mem(int cfg, int num, int mem) static int snd_msnd_write_cfg_mem(int cfg, int num, int mem)
{ {
u16 wmem; u16 wmem;
...@@ -711,7 +711,7 @@ static int __devinit snd_msnd_write_cfg_mem(int cfg, int num, int mem) ...@@ -711,7 +711,7 @@ static int __devinit snd_msnd_write_cfg_mem(int cfg, int num, int mem)
return 0; return 0;
} }
static int __devinit snd_msnd_activate_logical(int cfg, int num) static int snd_msnd_activate_logical(int cfg, int num)
{ {
if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))
return -EIO; return -EIO;
...@@ -720,7 +720,7 @@ static int __devinit snd_msnd_activate_logical(int cfg, int num) ...@@ -720,7 +720,7 @@ static int __devinit snd_msnd_activate_logical(int cfg, int num)
return 0; return 0;
} }
static int __devinit snd_msnd_write_cfg_logical(int cfg, int num, u16 io0, static int snd_msnd_write_cfg_logical(int cfg, int num, u16 io0,
u16 io1, u16 irq, int mem) u16 io1, u16 irq, int mem)
{ {
if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))
...@@ -738,7 +738,7 @@ static int __devinit snd_msnd_write_cfg_logical(int cfg, int num, u16 io0, ...@@ -738,7 +738,7 @@ static int __devinit snd_msnd_write_cfg_logical(int cfg, int num, u16 io0,
return 0; return 0;
} }
static int __devinit snd_msnd_pinnacle_cfg_reset(int cfg) static int snd_msnd_pinnacle_cfg_reset(int cfg)
{ {
int i; int i;
...@@ -818,7 +818,7 @@ module_param_array(joystick_io, long, NULL, S_IRUGO); ...@@ -818,7 +818,7 @@ module_param_array(joystick_io, long, NULL, S_IRUGO);
#endif #endif
static int __devinit snd_msnd_isa_match(struct device *pdev, unsigned int i) static int snd_msnd_isa_match(struct device *pdev, unsigned int i)
{ {
if (io[i] == SNDRV_AUTO_PORT) if (io[i] == SNDRV_AUTO_PORT)
return 0; return 0;
...@@ -888,7 +888,7 @@ static int __devinit snd_msnd_isa_match(struct device *pdev, unsigned int i) ...@@ -888,7 +888,7 @@ static int __devinit snd_msnd_isa_match(struct device *pdev, unsigned int i)
return 1; return 1;
} }
static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx) static int snd_msnd_isa_probe(struct device *pdev, unsigned int idx)
{ {
int err; int err;
struct snd_card *card; struct snd_card *card;
...@@ -1061,7 +1061,7 @@ static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx) ...@@ -1061,7 +1061,7 @@ static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx)
#endif #endif
} }
static int __devexit snd_msnd_isa_remove(struct device *pdev, unsigned int dev) static int snd_msnd_isa_remove(struct device *pdev, unsigned int dev)
{ {
snd_msnd_unload(dev_get_drvdata(pdev)); snd_msnd_unload(dev_get_drvdata(pdev));
dev_set_drvdata(pdev, NULL); dev_set_drvdata(pdev, NULL);
...@@ -1073,7 +1073,7 @@ static int __devexit snd_msnd_isa_remove(struct device *pdev, unsigned int dev) ...@@ -1073,7 +1073,7 @@ static int __devexit snd_msnd_isa_remove(struct device *pdev, unsigned int dev)
static struct isa_driver snd_msnd_driver = { static struct isa_driver snd_msnd_driver = {
.match = snd_msnd_isa_match, .match = snd_msnd_isa_match,
.probe = snd_msnd_isa_probe, .probe = snd_msnd_isa_probe,
.remove = __devexit_p(snd_msnd_isa_remove), .remove = snd_msnd_isa_remove,
/* FIXME: suspend, resume */ /* FIXME: suspend, resume */
.driver = { .driver = {
.name = DEV_NAME .name = DEV_NAME
...@@ -1081,7 +1081,7 @@ static struct isa_driver snd_msnd_driver = { ...@@ -1081,7 +1081,7 @@ static struct isa_driver snd_msnd_driver = {
}; };
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_msnd_pnp_detect(struct pnp_card_link *pcard, static int snd_msnd_pnp_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
static int idx; static int idx;
...@@ -1185,7 +1185,7 @@ static int __devinit snd_msnd_pnp_detect(struct pnp_card_link *pcard, ...@@ -1185,7 +1185,7 @@ static int __devinit snd_msnd_pnp_detect(struct pnp_card_link *pcard,
return ret; return ret;
} }
static void __devexit snd_msnd_pnp_remove(struct pnp_card_link *pcard) static void snd_msnd_pnp_remove(struct pnp_card_link *pcard)
{ {
snd_msnd_unload(pnp_get_card_drvdata(pcard)); snd_msnd_unload(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -1207,7 +1207,7 @@ static struct pnp_card_driver msnd_pnpc_driver = { ...@@ -1207,7 +1207,7 @@ static struct pnp_card_driver msnd_pnpc_driver = {
.name = "msnd_pinnacle", .name = "msnd_pinnacle",
.id_table = msnd_pnpids, .id_table = msnd_pnpids,
.probe = snd_msnd_pnp_detect, .probe = snd_msnd_pnp_detect,
.remove = __devexit_p(snd_msnd_pnp_remove), .remove = snd_msnd_pnp_remove,
}; };
#endif /* CONFIG_PNP */ #endif /* CONFIG_PNP */
......
sound/isa/msnd/msnd_pinnacle_mixer.c
View file @ 1bff292e
...@@ -302,7 +302,7 @@ DUMMY_VOLUME("Monitor", 0, MSND_MIXER_IMIX), ...@@ -302,7 +302,7 @@ DUMMY_VOLUME("Monitor", 0, MSND_MIXER_IMIX),
}; };
int __devinit snd_msndmix_new(struct snd_card *card) int snd_msndmix_new(struct snd_card *card)
{ {
struct snd_msnd *chip = card->private_data; struct snd_msnd *chip = card->private_data;
unsigned int idx; unsigned int idx;
......
sound/isa/opl3sa2.c
View file @ 1bff292e
...@@ -221,7 +221,7 @@ static void snd_opl3sa2_write(struct snd_opl3sa2 *chip, unsigned char reg, unsig ...@@ -221,7 +221,7 @@ static void snd_opl3sa2_write(struct snd_opl3sa2 *chip, unsigned char reg, unsig
spin_unlock_irqrestore(&chip->reg_lock, flags); spin_unlock_irqrestore(&chip->reg_lock, flags);
} }
static int __devinit snd_opl3sa2_detect(struct snd_card *card) static int snd_opl3sa2_detect(struct snd_card *card)
{ {
struct snd_opl3sa2 *chip = card->private_data; struct snd_opl3sa2 *chip = card->private_data;
unsigned long port; unsigned long port;
...@@ -496,7 +496,7 @@ static void snd_opl3sa2_master_free(struct snd_kcontrol *kcontrol) ...@@ -496,7 +496,7 @@ static void snd_opl3sa2_master_free(struct snd_kcontrol *kcontrol)
chip->master_volume = NULL; chip->master_volume = NULL;
} }
static int __devinit snd_opl3sa2_mixer(struct snd_card *card) static int snd_opl3sa2_mixer(struct snd_card *card)
{ {
struct snd_opl3sa2 *chip = card->private_data; struct snd_opl3sa2 *chip = card->private_data;
struct snd_ctl_elem_id id1, id2; struct snd_ctl_elem_id id1, id2;
...@@ -596,7 +596,7 @@ static int snd_opl3sa2_resume(struct snd_card *card) ...@@ -596,7 +596,7 @@ static int snd_opl3sa2_resume(struct snd_card *card)
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip, static int snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,
struct pnp_dev *pdev) struct pnp_dev *pdev)
{ {
if (pnp_activate_dev(pdev) < 0) { if (pnp_activate_dev(pdev) < 0) {
...@@ -647,7 +647,7 @@ static int snd_opl3sa2_card_new(int dev, struct snd_card **cardp) ...@@ -647,7 +647,7 @@ static int snd_opl3sa2_card_new(int dev, struct snd_card **cardp)
return 0; return 0;
} }
static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev) static int snd_opl3sa2_probe(struct snd_card *card, int dev)
{ {
int xirq, xdma1, xdma2; int xirq, xdma1, xdma2;
struct snd_opl3sa2 *chip; struct snd_opl3sa2 *chip;
...@@ -721,7 +721,7 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev) ...@@ -721,7 +721,7 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)
} }
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_opl3sa2_pnp_detect(struct pnp_dev *pdev, static int snd_opl3sa2_pnp_detect(struct pnp_dev *pdev,
const struct pnp_device_id *id) const struct pnp_device_id *id)
{ {
static int dev; static int dev;
...@@ -754,7 +754,7 @@ static int __devinit snd_opl3sa2_pnp_detect(struct pnp_dev *pdev, ...@@ -754,7 +754,7 @@ static int __devinit snd_opl3sa2_pnp_detect(struct pnp_dev *pdev,
return 0; return 0;
} }
static void __devexit snd_opl3sa2_pnp_remove(struct pnp_dev * pdev) static void snd_opl3sa2_pnp_remove(struct pnp_dev *pdev)
{ {
snd_card_free(pnp_get_drvdata(pdev)); snd_card_free(pnp_get_drvdata(pdev));
pnp_set_drvdata(pdev, NULL); pnp_set_drvdata(pdev, NULL);
...@@ -775,14 +775,14 @@ static struct pnp_driver opl3sa2_pnp_driver = { ...@@ -775,14 +775,14 @@ static struct pnp_driver opl3sa2_pnp_driver = {
.name = "snd-opl3sa2-pnpbios", .name = "snd-opl3sa2-pnpbios",
.id_table = snd_opl3sa2_pnpbiosids, .id_table = snd_opl3sa2_pnpbiosids,
.probe = snd_opl3sa2_pnp_detect, .probe = snd_opl3sa2_pnp_detect,
.remove = __devexit_p(snd_opl3sa2_pnp_remove), .remove = snd_opl3sa2_pnp_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_opl3sa2_pnp_suspend, .suspend = snd_opl3sa2_pnp_suspend,
.resume = snd_opl3sa2_pnp_resume, .resume = snd_opl3sa2_pnp_resume,
#endif #endif
}; };
static int __devinit snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard, static int snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *id) const struct pnp_card_device_id *id)
{ {
static int dev; static int dev;
...@@ -820,7 +820,7 @@ static int __devinit snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard, ...@@ -820,7 +820,7 @@ static int __devinit snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard,
return 0; return 0;
} }
static void __devexit snd_opl3sa2_pnp_cremove(struct pnp_card_link * pcard) static void snd_opl3sa2_pnp_cremove(struct pnp_card_link *pcard)
{ {
snd_card_free(pnp_get_card_drvdata(pcard)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -842,7 +842,7 @@ static struct pnp_card_driver opl3sa2_pnpc_driver = { ...@@ -842,7 +842,7 @@ static struct pnp_card_driver opl3sa2_pnpc_driver = {
.name = "snd-opl3sa2-cpnp", .name = "snd-opl3sa2-cpnp",
.id_table = snd_opl3sa2_pnpids, .id_table = snd_opl3sa2_pnpids,
.probe = snd_opl3sa2_pnp_cdetect, .probe = snd_opl3sa2_pnp_cdetect,
.remove = __devexit_p(snd_opl3sa2_pnp_cremove), .remove = snd_opl3sa2_pnp_cremove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_opl3sa2_pnp_csuspend, .suspend = snd_opl3sa2_pnp_csuspend,
.resume = snd_opl3sa2_pnp_cresume, .resume = snd_opl3sa2_pnp_cresume,
...@@ -850,7 +850,7 @@ static struct pnp_card_driver opl3sa2_pnpc_driver = { ...@@ -850,7 +850,7 @@ static struct pnp_card_driver opl3sa2_pnpc_driver = {
}; };
#endif /* CONFIG_PNP */ #endif /* CONFIG_PNP */
static int __devinit snd_opl3sa2_isa_match(struct device *pdev, static int snd_opl3sa2_isa_match(struct device *pdev,
unsigned int dev) unsigned int dev)
{ {
if (!enable[dev]) if (!enable[dev])
...@@ -878,7 +878,7 @@ static int __devinit snd_opl3sa2_isa_match(struct device *pdev, ...@@ -878,7 +878,7 @@ static int __devinit snd_opl3sa2_isa_match(struct device *pdev,
return 1; return 1;
} }
static int __devinit snd_opl3sa2_isa_probe(struct device *pdev, static int snd_opl3sa2_isa_probe(struct device *pdev,
unsigned int dev) unsigned int dev)
{ {
struct snd_card *card; struct snd_card *card;
...@@ -896,7 +896,7 @@ static int __devinit snd_opl3sa2_isa_probe(struct device *pdev, ...@@ -896,7 +896,7 @@ static int __devinit snd_opl3sa2_isa_probe(struct device *pdev,
return 0; return 0;
} }
static int __devexit snd_opl3sa2_isa_remove(struct device *devptr, static int snd_opl3sa2_isa_remove(struct device *devptr,
unsigned int dev) unsigned int dev)
{ {
snd_card_free(dev_get_drvdata(devptr)); snd_card_free(dev_get_drvdata(devptr));
...@@ -922,7 +922,7 @@ static int snd_opl3sa2_isa_resume(struct device *dev, unsigned int n) ...@@ -922,7 +922,7 @@ static int snd_opl3sa2_isa_resume(struct device *dev, unsigned int n)
static struct isa_driver snd_opl3sa2_isa_driver = { static struct isa_driver snd_opl3sa2_isa_driver = {
.match = snd_opl3sa2_isa_match, .match = snd_opl3sa2_isa_match,
.probe = snd_opl3sa2_isa_probe, .probe = snd_opl3sa2_isa_probe,
.remove = __devexit_p(snd_opl3sa2_isa_remove), .remove = snd_opl3sa2_isa_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_opl3sa2_isa_suspend, .suspend = snd_opl3sa2_isa_suspend,
.resume = snd_opl3sa2_isa_resume, .resume = snd_opl3sa2_isa_resume,
......
sound/isa/opti9xx/miro.c
View file @ 1bff292e
...@@ -587,7 +587,7 @@ static int snd_miro_put_double(struct snd_kcontrol *kcontrol, ...@@ -587,7 +587,7 @@ static int snd_miro_put_double(struct snd_kcontrol *kcontrol,
return change; return change;
} }
static struct snd_kcontrol_new snd_miro_controls[] __devinitdata = { static struct snd_kcontrol_new snd_miro_controls[] = {
MIRO_DOUBLE("Master Playback Volume", 0, ACI_GET_MASTER, ACI_SET_MASTER), MIRO_DOUBLE("Master Playback Volume", 0, ACI_GET_MASTER, ACI_SET_MASTER),
MIRO_DOUBLE("Mic Playback Volume", 1, ACI_GET_MIC, ACI_SET_MIC), MIRO_DOUBLE("Mic Playback Volume", 1, ACI_GET_MIC, ACI_SET_MIC),
MIRO_DOUBLE("Line Playback Volume", 1, ACI_GET_LINE, ACI_SET_LINE), MIRO_DOUBLE("Line Playback Volume", 1, ACI_GET_LINE, ACI_SET_LINE),
...@@ -599,7 +599,7 @@ MIRO_DOUBLE("Aux Playback Volume", 2, ACI_GET_LINE2, ACI_SET_LINE2), ...@@ -599,7 +599,7 @@ MIRO_DOUBLE("Aux Playback Volume", 2, ACI_GET_LINE2, ACI_SET_LINE2),
/* Equalizer with seven bands (only PCM20) /* Equalizer with seven bands (only PCM20)
from -12dB up to +12dB on each band */ from -12dB up to +12dB on each band */
static struct snd_kcontrol_new snd_miro_eq_controls[] __devinitdata = { static struct snd_kcontrol_new snd_miro_eq_controls[] = {
MIRO_DOUBLE("Tone Control - 28 Hz", 0, ACI_GET_EQ1, ACI_SET_EQ1), MIRO_DOUBLE("Tone Control - 28 Hz", 0, ACI_GET_EQ1, ACI_SET_EQ1),
MIRO_DOUBLE("Tone Control - 160 Hz", 0, ACI_GET_EQ2, ACI_SET_EQ2), MIRO_DOUBLE("Tone Control - 160 Hz", 0, ACI_GET_EQ2, ACI_SET_EQ2),
MIRO_DOUBLE("Tone Control - 400 Hz", 0, ACI_GET_EQ3, ACI_SET_EQ3), MIRO_DOUBLE("Tone Control - 400 Hz", 0, ACI_GET_EQ3, ACI_SET_EQ3),
...@@ -609,15 +609,15 @@ MIRO_DOUBLE("Tone Control - 6.3 kHz", 0, ACI_GET_EQ6, ACI_SET_EQ6), ...@@ -609,15 +609,15 @@ MIRO_DOUBLE("Tone Control - 6.3 kHz", 0, ACI_GET_EQ6, ACI_SET_EQ6),
MIRO_DOUBLE("Tone Control - 16 kHz", 0, ACI_GET_EQ7, ACI_SET_EQ7), MIRO_DOUBLE("Tone Control - 16 kHz", 0, ACI_GET_EQ7, ACI_SET_EQ7),
}; };
static struct snd_kcontrol_new snd_miro_radio_control[] __devinitdata = { static struct snd_kcontrol_new snd_miro_radio_control[] = {
MIRO_DOUBLE("Radio Playback Volume", 0, ACI_GET_LINE1, ACI_SET_LINE1), MIRO_DOUBLE("Radio Playback Volume", 0, ACI_GET_LINE1, ACI_SET_LINE1),
}; };
static struct snd_kcontrol_new snd_miro_line_control[] __devinitdata = { static struct snd_kcontrol_new snd_miro_line_control[] = {
MIRO_DOUBLE("Line Playback Volume", 2, ACI_GET_LINE1, ACI_SET_LINE1), MIRO_DOUBLE("Line Playback Volume", 2, ACI_GET_LINE1, ACI_SET_LINE1),
}; };
static struct snd_kcontrol_new snd_miro_preamp_control[] __devinitdata = { static struct snd_kcontrol_new snd_miro_preamp_control[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Mic Boost", .name = "Mic Boost",
...@@ -627,7 +627,7 @@ static struct snd_kcontrol_new snd_miro_preamp_control[] __devinitdata = { ...@@ -627,7 +627,7 @@ static struct snd_kcontrol_new snd_miro_preamp_control[] __devinitdata = {
.put = snd_miro_put_preamp, .put = snd_miro_put_preamp,
}}; }};
static struct snd_kcontrol_new snd_miro_amp_control[] __devinitdata = { static struct snd_kcontrol_new snd_miro_amp_control[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Line Boost", .name = "Line Boost",
...@@ -637,7 +637,7 @@ static struct snd_kcontrol_new snd_miro_amp_control[] __devinitdata = { ...@@ -637,7 +637,7 @@ static struct snd_kcontrol_new snd_miro_amp_control[] __devinitdata = {
.put = snd_miro_put_amp, .put = snd_miro_put_amp,
}}; }};
static struct snd_kcontrol_new snd_miro_capture_control[] __devinitdata = { static struct snd_kcontrol_new snd_miro_capture_control[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "PCM Capture Switch", .name = "PCM Capture Switch",
...@@ -647,7 +647,7 @@ static struct snd_kcontrol_new snd_miro_capture_control[] __devinitdata = { ...@@ -647,7 +647,7 @@ static struct snd_kcontrol_new snd_miro_capture_control[] __devinitdata = {
.put = snd_miro_put_capture, .put = snd_miro_put_capture,
}}; }};
static unsigned char aci_init_values[][2] __devinitdata = { static unsigned char aci_init_values[][2] = {
{ ACI_SET_MUTE, 0x00 }, { ACI_SET_MUTE, 0x00 },
{ ACI_SET_POWERAMP, 0x00 }, { ACI_SET_POWERAMP, 0x00 },
{ ACI_SET_PREAMP, 0x00 }, { ACI_SET_PREAMP, 0x00 },
...@@ -670,7 +670,7 @@ static unsigned char aci_init_values[][2] __devinitdata = { ...@@ -670,7 +670,7 @@ static unsigned char aci_init_values[][2] __devinitdata = {
{ ACI_SET_MASTER + 1, 0x20 }, { ACI_SET_MASTER + 1, 0x20 },
}; };
static int __devinit snd_set_aci_init_values(struct snd_miro *miro) static int snd_set_aci_init_values(struct snd_miro *miro)
{ {
int idx, error; int idx, error;
struct snd_miro_aci *aci = miro->aci; struct snd_miro_aci *aci = miro->aci;
...@@ -713,7 +713,7 @@ static int __devinit snd_set_aci_init_values(struct snd_miro *miro) ...@@ -713,7 +713,7 @@ static int __devinit snd_set_aci_init_values(struct snd_miro *miro)
return 0; return 0;
} }
static int __devinit snd_miro_mixer(struct snd_card *card, static int snd_miro_mixer(struct snd_card *card,
struct snd_miro *miro) struct snd_miro *miro)
{ {
unsigned int idx; unsigned int idx;
...@@ -771,7 +771,7 @@ static int __devinit snd_miro_mixer(struct snd_card *card, ...@@ -771,7 +771,7 @@ static int __devinit snd_miro_mixer(struct snd_card *card,
return 0; return 0;
} }
static int __devinit snd_miro_init(struct snd_miro *chip, static int snd_miro_init(struct snd_miro *chip,
unsigned short hardware) unsigned short hardware)
{ {
static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2}; static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};
...@@ -989,7 +989,7 @@ static void snd_miro_proc_read(struct snd_info_entry * entry, ...@@ -989,7 +989,7 @@ static void snd_miro_proc_read(struct snd_info_entry * entry,
snd_iprintf(buffer, " preamp : 0x%x\n", aci->aci_preamp); snd_iprintf(buffer, " preamp : 0x%x\n", aci->aci_preamp);
} }
static void __devinit snd_miro_proc_init(struct snd_card *card, static void snd_miro_proc_init(struct snd_card *card,
struct snd_miro *miro) struct snd_miro *miro)
{ {
struct snd_info_entry *entry; struct snd_info_entry *entry;
...@@ -1002,7 +1002,7 @@ static void __devinit snd_miro_proc_init(struct snd_card *card, ...@@ -1002,7 +1002,7 @@ static void __devinit snd_miro_proc_init(struct snd_card *card,
* Init * Init
*/ */
static int __devinit snd_miro_configure(struct snd_miro *chip) static int snd_miro_configure(struct snd_miro *chip)
{ {
unsigned char wss_base_bits; unsigned char wss_base_bits;
unsigned char irq_bits; unsigned char irq_bits;
...@@ -1162,7 +1162,7 @@ static int __devinit snd_miro_configure(struct snd_miro *chip) ...@@ -1162,7 +1162,7 @@ static int __devinit snd_miro_configure(struct snd_miro *chip)
return 0; return 0;
} }
static int __devinit snd_miro_opti_check(struct snd_miro *chip) static int snd_miro_opti_check(struct snd_miro *chip)
{ {
unsigned char value; unsigned char value;
...@@ -1182,7 +1182,7 @@ static int __devinit snd_miro_opti_check(struct snd_miro *chip) ...@@ -1182,7 +1182,7 @@ static int __devinit snd_miro_opti_check(struct snd_miro *chip)
return -ENODEV; return -ENODEV;
} }
static int __devinit snd_card_miro_detect(struct snd_card *card, static int snd_card_miro_detect(struct snd_card *card,
struct snd_miro *chip) struct snd_miro *chip)
{ {
int i, err; int i, err;
...@@ -1200,7 +1200,7 @@ static int __devinit snd_card_miro_detect(struct snd_card *card, ...@@ -1200,7 +1200,7 @@ static int __devinit snd_card_miro_detect(struct snd_card *card,
return -ENODEV; return -ENODEV;
} }
static int __devinit snd_card_miro_aci_detect(struct snd_card *card, static int snd_card_miro_aci_detect(struct snd_card *card,
struct snd_miro *miro) struct snd_miro *miro)
{ {
unsigned char regval; unsigned char regval;
...@@ -1265,7 +1265,7 @@ static void snd_card_miro_free(struct snd_card *card) ...@@ -1265,7 +1265,7 @@ static void snd_card_miro_free(struct snd_card *card)
release_and_free_resource(miro->res_mc_base); release_and_free_resource(miro->res_mc_base);
} }
static int __devinit snd_miro_probe(struct snd_card *card) static int snd_miro_probe(struct snd_card *card)
{ {
int error; int error;
struct snd_miro *miro = card->private_data; struct snd_miro *miro = card->private_data;
...@@ -1386,7 +1386,7 @@ static int __devinit snd_miro_probe(struct snd_card *card) ...@@ -1386,7 +1386,7 @@ static int __devinit snd_miro_probe(struct snd_card *card)
return snd_card_register(card); return snd_card_register(card);
} }
static int __devinit snd_miro_isa_match(struct device *devptr, unsigned int n) static int snd_miro_isa_match(struct device *devptr, unsigned int n)
{ {
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
if (snd_miro_pnp_is_probed) if (snd_miro_pnp_is_probed)
...@@ -1397,7 +1397,7 @@ static int __devinit snd_miro_isa_match(struct device *devptr, unsigned int n) ...@@ -1397,7 +1397,7 @@ static int __devinit snd_miro_isa_match(struct device *devptr, unsigned int n)
return 1; return 1;
} }
static int __devinit snd_miro_isa_probe(struct device *devptr, unsigned int n) static int snd_miro_isa_probe(struct device *devptr, unsigned int n)
{ {
static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1}; static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};
static long possible_mpu_ports[] = {0x330, 0x300, 0x310, 0x320, -1}; static long possible_mpu_ports[] = {0x330, 0x300, 0x310, 0x320, -1};
...@@ -1491,7 +1491,7 @@ static int __devinit snd_miro_isa_probe(struct device *devptr, unsigned int n) ...@@ -1491,7 +1491,7 @@ static int __devinit snd_miro_isa_probe(struct device *devptr, unsigned int n)
return 0; return 0;
} }
static int __devexit snd_miro_isa_remove(struct device *devptr, static int snd_miro_isa_remove(struct device *devptr,
unsigned int dev) unsigned int dev)
{ {
snd_card_free(dev_get_drvdata(devptr)); snd_card_free(dev_get_drvdata(devptr));
...@@ -1504,7 +1504,7 @@ static int __devexit snd_miro_isa_remove(struct device *devptr, ...@@ -1504,7 +1504,7 @@ static int __devexit snd_miro_isa_remove(struct device *devptr,
static struct isa_driver snd_miro_driver = { static struct isa_driver snd_miro_driver = {
.match = snd_miro_isa_match, .match = snd_miro_isa_match,
.probe = snd_miro_isa_probe, .probe = snd_miro_isa_probe,
.remove = __devexit_p(snd_miro_isa_remove), .remove = snd_miro_isa_remove,
/* FIXME: suspend/resume */ /* FIXME: suspend/resume */
.driver = { .driver = {
.name = DEV_NAME .name = DEV_NAME
...@@ -1513,7 +1513,7 @@ static struct isa_driver snd_miro_driver = { ...@@ -1513,7 +1513,7 @@ static struct isa_driver snd_miro_driver = {
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_card_miro_pnp(struct snd_miro *chip, static int snd_card_miro_pnp(struct snd_miro *chip,
struct pnp_card_link *card, struct pnp_card_link *card,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
...@@ -1574,7 +1574,7 @@ static int __devinit snd_card_miro_pnp(struct snd_miro *chip, ...@@ -1574,7 +1574,7 @@ static int __devinit snd_card_miro_pnp(struct snd_miro *chip,
return 0; return 0;
} }
static int __devinit snd_miro_pnp_probe(struct pnp_card_link *pcard, static int snd_miro_pnp_probe(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
struct snd_card *card; struct snd_card *card;
...@@ -1624,7 +1624,7 @@ static int __devinit snd_miro_pnp_probe(struct pnp_card_link *pcard, ...@@ -1624,7 +1624,7 @@ static int __devinit snd_miro_pnp_probe(struct pnp_card_link *pcard,
return 0; return 0;
} }
static void __devexit snd_miro_pnp_remove(struct pnp_card_link * pcard) static void snd_miro_pnp_remove(struct pnp_card_link *pcard)
{ {
snd_card_free(pnp_get_card_drvdata(pcard)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -1636,7 +1636,7 @@ static struct pnp_card_driver miro_pnpc_driver = { ...@@ -1636,7 +1636,7 @@ static struct pnp_card_driver miro_pnpc_driver = {
.name = "miro", .name = "miro",
.id_table = snd_miro_pnpids, .id_table = snd_miro_pnpids,
.probe = snd_miro_pnp_probe, .probe = snd_miro_pnp_probe,
.remove = __devexit_p(snd_miro_pnp_remove), .remove = snd_miro_pnp_remove,
}; };
#endif #endif
......
sound/isa/opti9xx/opti92x-ad1848.c
View file @ 1bff292e
...@@ -186,7 +186,7 @@ static char * snd_opti9xx_names[] = { ...@@ -186,7 +186,7 @@ static char * snd_opti9xx_names[] = {
"82C930", "82C931", "82C933" "82C930", "82C931", "82C933"
}; };
static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip, static int snd_opti9xx_init(struct snd_opti9xx *chip,
unsigned short hardware) unsigned short hardware)
{ {
static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2}; static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};
...@@ -593,7 +593,7 @@ WSS_DOUBLE_TLV("Aux Playback Volume", 0, ...@@ -593,7 +593,7 @@ WSS_DOUBLE_TLV("Aux Playback Volume", 0,
db_scale_4bit_12db_max), db_scale_4bit_12db_max),
}; };
static int __devinit snd_opti93x_mixer(struct snd_wss *chip) static int snd_opti93x_mixer(struct snd_wss *chip)
{ {
struct snd_card *card; struct snd_card *card;
unsigned int idx; unsigned int idx;
...@@ -666,7 +666,7 @@ static irqreturn_t snd_opti93x_interrupt(int irq, void *dev_id) ...@@ -666,7 +666,7 @@ static irqreturn_t snd_opti93x_interrupt(int irq, void *dev_id)
#endif /* OPTi93X */ #endif /* OPTi93X */
static int __devinit snd_opti9xx_read_check(struct snd_opti9xx *chip) static int snd_opti9xx_read_check(struct snd_opti9xx *chip)
{ {
unsigned char value; unsigned char value;
#ifdef OPTi93X #ifdef OPTi93X
...@@ -707,7 +707,7 @@ static int __devinit snd_opti9xx_read_check(struct snd_opti9xx *chip) ...@@ -707,7 +707,7 @@ static int __devinit snd_opti9xx_read_check(struct snd_opti9xx *chip)
return -ENODEV; return -ENODEV;
} }
static int __devinit snd_card_opti9xx_detect(struct snd_card *card, static int snd_card_opti9xx_detect(struct snd_card *card,
struct snd_opti9xx *chip) struct snd_opti9xx *chip)
{ {
int i, err; int i, err;
...@@ -732,7 +732,7 @@ static int __devinit snd_card_opti9xx_detect(struct snd_card *card, ...@@ -732,7 +732,7 @@ static int __devinit snd_card_opti9xx_detect(struct snd_card *card,
} }
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip, static int snd_card_opti9xx_pnp(struct snd_opti9xx *chip,
struct pnp_card_link *card, struct pnp_card_link *card,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
...@@ -817,7 +817,7 @@ static void snd_card_opti9xx_free(struct snd_card *card) ...@@ -817,7 +817,7 @@ static void snd_card_opti9xx_free(struct snd_card *card)
} }
} }
static int __devinit snd_opti9xx_probe(struct snd_card *card) static int snd_opti9xx_probe(struct snd_card *card)
{ {
static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1}; static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};
int error; int error;
...@@ -952,7 +952,7 @@ static int snd_opti9xx_card_new(struct snd_card **cardp) ...@@ -952,7 +952,7 @@ static int snd_opti9xx_card_new(struct snd_card **cardp)
return 0; return 0;
} }
static int __devinit snd_opti9xx_isa_match(struct device *devptr, static int snd_opti9xx_isa_match(struct device *devptr,
unsigned int dev) unsigned int dev)
{ {
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
...@@ -964,7 +964,7 @@ static int __devinit snd_opti9xx_isa_match(struct device *devptr, ...@@ -964,7 +964,7 @@ static int __devinit snd_opti9xx_isa_match(struct device *devptr,
return 1; return 1;
} }
static int __devinit snd_opti9xx_isa_probe(struct device *devptr, static int snd_opti9xx_isa_probe(struct device *devptr,
unsigned int dev) unsigned int dev)
{ {
struct snd_card *card; struct snd_card *card;
...@@ -1031,7 +1031,7 @@ static int __devinit snd_opti9xx_isa_probe(struct device *devptr, ...@@ -1031,7 +1031,7 @@ static int __devinit snd_opti9xx_isa_probe(struct device *devptr,
return 0; return 0;
} }
static int __devexit snd_opti9xx_isa_remove(struct device *devptr, static int snd_opti9xx_isa_remove(struct device *devptr,
unsigned int dev) unsigned int dev)
{ {
snd_card_free(dev_get_drvdata(devptr)); snd_card_free(dev_get_drvdata(devptr));
...@@ -1083,7 +1083,7 @@ static int snd_opti9xx_isa_resume(struct device *dev, unsigned int n) ...@@ -1083,7 +1083,7 @@ static int snd_opti9xx_isa_resume(struct device *dev, unsigned int n)
static struct isa_driver snd_opti9xx_driver = { static struct isa_driver snd_opti9xx_driver = {
.match = snd_opti9xx_isa_match, .match = snd_opti9xx_isa_match,
.probe = snd_opti9xx_isa_probe, .probe = snd_opti9xx_isa_probe,
.remove = __devexit_p(snd_opti9xx_isa_remove), .remove = snd_opti9xx_isa_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_opti9xx_isa_suspend, .suspend = snd_opti9xx_isa_suspend,
.resume = snd_opti9xx_isa_resume, .resume = snd_opti9xx_isa_resume,
...@@ -1094,7 +1094,7 @@ static struct isa_driver snd_opti9xx_driver = { ...@@ -1094,7 +1094,7 @@ static struct isa_driver snd_opti9xx_driver = {
}; };
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_opti9xx_pnp_probe(struct pnp_card_link *pcard, static int snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
struct snd_card *card; struct snd_card *card;
...@@ -1146,7 +1146,7 @@ static int __devinit snd_opti9xx_pnp_probe(struct pnp_card_link *pcard, ...@@ -1146,7 +1146,7 @@ static int __devinit snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,
return 0; return 0;
} }
static void __devexit snd_opti9xx_pnp_remove(struct pnp_card_link * pcard) static void snd_opti9xx_pnp_remove(struct pnp_card_link *pcard)
{ {
snd_card_free(pnp_get_card_drvdata(pcard)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -1171,7 +1171,7 @@ static struct pnp_card_driver opti9xx_pnpc_driver = { ...@@ -1171,7 +1171,7 @@ static struct pnp_card_driver opti9xx_pnpc_driver = {
.name = "opti9xx", .name = "opti9xx",
.id_table = snd_opti9xx_pnpids, .id_table = snd_opti9xx_pnpids,
.probe = snd_opti9xx_pnp_probe, .probe = snd_opti9xx_pnp_probe,
.remove = __devexit_p(snd_opti9xx_pnp_remove), .remove = snd_opti9xx_pnp_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_opti9xx_pnp_suspend, .suspend = snd_opti9xx_pnp_suspend,
.resume = snd_opti9xx_pnp_resume, .resume = snd_opti9xx_pnp_resume,
......
sound/isa/sb/emu8000.c
View file @ 1bff292e
...@@ -131,7 +131,7 @@ snd_emu8000_dma_chan(struct snd_emu8000 *emu, int ch, int mode) ...@@ -131,7 +131,7 @@ snd_emu8000_dma_chan(struct snd_emu8000 *emu, int ch, int mode)
/* /*
*/ */
static void __devinit static void
snd_emu8000_read_wait(struct snd_emu8000 *emu) snd_emu8000_read_wait(struct snd_emu8000 *emu)
{ {
while ((EMU8000_SMALR_READ(emu) & 0x80000000) != 0) { while ((EMU8000_SMALR_READ(emu) & 0x80000000) != 0) {
...@@ -143,7 +143,7 @@ snd_emu8000_read_wait(struct snd_emu8000 *emu) ...@@ -143,7 +143,7 @@ snd_emu8000_read_wait(struct snd_emu8000 *emu)
/* /*
*/ */
static void __devinit static void
snd_emu8000_write_wait(struct snd_emu8000 *emu) snd_emu8000_write_wait(struct snd_emu8000 *emu)
{ {
while ((EMU8000_SMALW_READ(emu) & 0x80000000) != 0) { while ((EMU8000_SMALW_READ(emu) & 0x80000000) != 0) {
...@@ -156,7 +156,7 @@ snd_emu8000_write_wait(struct snd_emu8000 *emu) ...@@ -156,7 +156,7 @@ snd_emu8000_write_wait(struct snd_emu8000 *emu)
/* /*
* detect a card at the given port * detect a card at the given port
*/ */
static int __devinit static int
snd_emu8000_detect(struct snd_emu8000 *emu) snd_emu8000_detect(struct snd_emu8000 *emu)
{ {
/* Initialise */ /* Initialise */
...@@ -182,7 +182,7 @@ snd_emu8000_detect(struct snd_emu8000 *emu) ...@@ -182,7 +182,7 @@ snd_emu8000_detect(struct snd_emu8000 *emu)
/* /*
* intiailize audio channels * intiailize audio channels
*/ */
static void __devinit static void
init_audio(struct snd_emu8000 *emu) init_audio(struct snd_emu8000 *emu)
{ {
int ch; int ch;
...@@ -223,7 +223,7 @@ init_audio(struct snd_emu8000 *emu) ...@@ -223,7 +223,7 @@ init_audio(struct snd_emu8000 *emu)
/* /*
* initialize DMA address * initialize DMA address
*/ */
static void __devinit static void
init_dma(struct snd_emu8000 *emu) init_dma(struct snd_emu8000 *emu)
{ {
EMU8000_SMALR_WRITE(emu, 0); EMU8000_SMALR_WRITE(emu, 0);
...@@ -327,7 +327,7 @@ static unsigned short init4[128] /*__devinitdata*/ = { ...@@ -327,7 +327,7 @@ static unsigned short init4[128] /*__devinitdata*/ = {
* Taken from the oss driver, not obvious from the doc how this * Taken from the oss driver, not obvious from the doc how this
* is meant to work * is meant to work
*/ */
static void __devinit static void
send_array(struct snd_emu8000 *emu, unsigned short *data, int size) send_array(struct snd_emu8000 *emu, unsigned short *data, int size)
{ {
int i; int i;
...@@ -349,7 +349,7 @@ send_array(struct snd_emu8000 *emu, unsigned short *data, int size) ...@@ -349,7 +349,7 @@ send_array(struct snd_emu8000 *emu, unsigned short *data, int size)
* Send initialization arrays to start up, this just follows the * Send initialization arrays to start up, this just follows the
* initialisation sequence in the adip. * initialisation sequence in the adip.
*/ */
static void __devinit static void
init_arrays(struct snd_emu8000 *emu) init_arrays(struct snd_emu8000 *emu)
{ {
send_array(emu, init1, ARRAY_SIZE(init1)/4); send_array(emu, init1, ARRAY_SIZE(init1)/4);
...@@ -375,7 +375,7 @@ init_arrays(struct snd_emu8000 *emu) ...@@ -375,7 +375,7 @@ init_arrays(struct snd_emu8000 *emu)
* seems that the only way to do this is to use the one channel and keep * seems that the only way to do this is to use the one channel and keep
* reallocating between read and write. * reallocating between read and write.
*/ */
static void __devinit static void
size_dram(struct snd_emu8000 *emu) size_dram(struct snd_emu8000 *emu)
{ {
int i, size, detected_size; int i, size, detected_size;
...@@ -512,7 +512,7 @@ snd_emu8000_init_fm(struct snd_emu8000 *emu) ...@@ -512,7 +512,7 @@ snd_emu8000_init_fm(struct snd_emu8000 *emu)
/* /*
* The main initialization routine. * The main initialization routine.
*/ */
static void __devinit static void
snd_emu8000_init_hw(struct snd_emu8000 *emu) snd_emu8000_init_hw(struct snd_emu8000 *emu)
{ {
int i; int i;
...@@ -1031,7 +1031,7 @@ static struct snd_kcontrol_new *mixer_defs[EMU8000_NUM_CONTROLS] = { ...@@ -1031,7 +1031,7 @@ static struct snd_kcontrol_new *mixer_defs[EMU8000_NUM_CONTROLS] = {
/* /*
* create and attach mixer elements for WaveTable treble/bass controls * create and attach mixer elements for WaveTable treble/bass controls
*/ */
static int __devinit static int
snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu) snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu)
{ {
int i, err = 0; int i, err = 0;
...@@ -1082,7 +1082,7 @@ static int snd_emu8000_dev_free(struct snd_device *device) ...@@ -1082,7 +1082,7 @@ static int snd_emu8000_dev_free(struct snd_device *device)
/* /*
* initialize and register emu8000 synth device. * initialize and register emu8000 synth device.
*/ */
int __devinit int
snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports, snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports,
struct snd_seq_device **awe_ret) struct snd_seq_device **awe_ret)
{ {
......
sound/isa/sb/jazz16.c
View file @ 1bff292e
...@@ -78,7 +78,7 @@ static irqreturn_t jazz16_interrupt(int irq, void *chip) ...@@ -78,7 +78,7 @@ static irqreturn_t jazz16_interrupt(int irq, void *chip)
return snd_sb8dsp_interrupt(chip); return snd_sb8dsp_interrupt(chip);
} }
static int __devinit jazz16_configure_ports(unsigned long port, static int jazz16_configure_ports(unsigned long port,
unsigned long mpu_port, int idx) unsigned long mpu_port, int idx)
{ {
unsigned char val; unsigned char val;
...@@ -99,7 +99,7 @@ static int __devinit jazz16_configure_ports(unsigned long port, ...@@ -99,7 +99,7 @@ static int __devinit jazz16_configure_ports(unsigned long port,
return 0; return 0;
} }
static int __devinit jazz16_detect_board(unsigned long port, static int jazz16_detect_board(unsigned long port,
unsigned long mpu_port) unsigned long mpu_port)
{ {
int err; int err;
...@@ -156,7 +156,7 @@ static int __devinit jazz16_detect_board(unsigned long port, ...@@ -156,7 +156,7 @@ static int __devinit jazz16_detect_board(unsigned long port,
return err; return err;
} }
static int __devinit jazz16_configure_board(struct snd_sb *chip, int mpu_irq) static int jazz16_configure_board(struct snd_sb *chip, int mpu_irq)
{ {
static unsigned char jazz_irq_bits[] = { 0, 0, 2, 3, 0, 1, 0, 4, static unsigned char jazz_irq_bits[] = { 0, 0, 2, 3, 0, 1, 0, 4,
0, 2, 5, 0, 0, 0, 0, 6 }; 0, 2, 5, 0, 0, 0, 0, 6 };
...@@ -183,7 +183,7 @@ static int __devinit jazz16_configure_board(struct snd_sb *chip, int mpu_irq) ...@@ -183,7 +183,7 @@ static int __devinit jazz16_configure_board(struct snd_sb *chip, int mpu_irq)
return 0; return 0;
} }
static int __devinit snd_jazz16_match(struct device *devptr, unsigned int dev) static int snd_jazz16_match(struct device *devptr, unsigned int dev)
{ {
if (!enable[dev]) if (!enable[dev])
return 0; return 0;
...@@ -218,7 +218,7 @@ static int __devinit snd_jazz16_match(struct device *devptr, unsigned int dev) ...@@ -218,7 +218,7 @@ static int __devinit snd_jazz16_match(struct device *devptr, unsigned int dev)
return 1; return 1;
} }
static int __devinit snd_jazz16_probe(struct device *devptr, unsigned int dev) static int snd_jazz16_probe(struct device *devptr, unsigned int dev)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_card_jazz16 *jazz16; struct snd_card_jazz16 *jazz16;
...@@ -341,7 +341,7 @@ static int __devinit snd_jazz16_probe(struct device *devptr, unsigned int dev) ...@@ -341,7 +341,7 @@ static int __devinit snd_jazz16_probe(struct device *devptr, unsigned int dev)
return err; return err;
} }
static int __devexit snd_jazz16_remove(struct device *devptr, unsigned int dev) static int snd_jazz16_remove(struct device *devptr, unsigned int dev)
{ {
struct snd_card *card = dev_get_drvdata(devptr); struct snd_card *card = dev_get_drvdata(devptr);
...@@ -380,7 +380,7 @@ static int snd_jazz16_resume(struct device *pdev, unsigned int n) ...@@ -380,7 +380,7 @@ static int snd_jazz16_resume(struct device *pdev, unsigned int n)
static struct isa_driver snd_jazz16_driver = { static struct isa_driver snd_jazz16_driver = {
.match = snd_jazz16_match, .match = snd_jazz16_match,
.probe = snd_jazz16_probe, .probe = snd_jazz16_probe,
.remove = __devexit_p(snd_jazz16_remove), .remove = snd_jazz16_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_jazz16_suspend, .suspend = snd_jazz16_suspend,
.resume = snd_jazz16_resume, .resume = snd_jazz16_resume,
......
sound/isa/sb/sb16.c
View file @ 1bff292e
...@@ -250,7 +250,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_sb16_pnpids); ...@@ -250,7 +250,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_sb16_pnpids);
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard, static int snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,
struct pnp_card_link *card, struct pnp_card_link *card,
const struct pnp_card_device_id *id) const struct pnp_card_device_id *id)
{ {
...@@ -337,7 +337,7 @@ static int snd_sb16_card_new(int dev, struct snd_card **cardp) ...@@ -337,7 +337,7 @@ static int snd_sb16_card_new(int dev, struct snd_card **cardp)
return 0; return 0;
} }
static int __devinit snd_sb16_probe(struct snd_card *card, int dev) static int snd_sb16_probe(struct snd_card *card, int dev)
{ {
int xirq, xdma8, xdma16; int xirq, xdma8, xdma16;
struct snd_sb *chip; struct snd_sb *chip;
...@@ -487,7 +487,7 @@ static int snd_sb16_resume(struct snd_card *card) ...@@ -487,7 +487,7 @@ static int snd_sb16_resume(struct snd_card *card)
} }
#endif #endif
static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev) static int snd_sb16_isa_probe1(int dev, struct device *pdev)
{ {
struct snd_card_sb16 *acard; struct snd_card_sb16 *acard;
struct snd_card *card; struct snd_card *card;
...@@ -517,12 +517,12 @@ static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev) ...@@ -517,12 +517,12 @@ static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev)
} }
static int __devinit snd_sb16_isa_match(struct device *pdev, unsigned int dev) static int snd_sb16_isa_match(struct device *pdev, unsigned int dev)
{ {
return enable[dev] && !is_isapnp_selected(dev); return enable[dev] && !is_isapnp_selected(dev);
} }
static int __devinit snd_sb16_isa_probe(struct device *pdev, unsigned int dev) static int snd_sb16_isa_probe(struct device *pdev, unsigned int dev)
{ {
int err; int err;
static int possible_irqs[] = {5, 9, 10, 7, -1}; static int possible_irqs[] = {5, 9, 10, 7, -1};
...@@ -563,7 +563,7 @@ static int __devinit snd_sb16_isa_probe(struct device *pdev, unsigned int dev) ...@@ -563,7 +563,7 @@ static int __devinit snd_sb16_isa_probe(struct device *pdev, unsigned int dev)
} }
} }
static int __devexit snd_sb16_isa_remove(struct device *pdev, unsigned int dev) static int snd_sb16_isa_remove(struct device *pdev, unsigned int dev)
{ {
snd_card_free(dev_get_drvdata(pdev)); snd_card_free(dev_get_drvdata(pdev));
dev_set_drvdata(pdev, NULL); dev_set_drvdata(pdev, NULL);
...@@ -592,7 +592,7 @@ static int snd_sb16_isa_resume(struct device *dev, unsigned int n) ...@@ -592,7 +592,7 @@ static int snd_sb16_isa_resume(struct device *dev, unsigned int n)
static struct isa_driver snd_sb16_isa_driver = { static struct isa_driver snd_sb16_isa_driver = {
.match = snd_sb16_isa_match, .match = snd_sb16_isa_match,
.probe = snd_sb16_isa_probe, .probe = snd_sb16_isa_probe,
.remove = __devexit_p(snd_sb16_isa_remove), .remove = snd_sb16_isa_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_sb16_isa_suspend, .suspend = snd_sb16_isa_suspend,
.resume = snd_sb16_isa_resume, .resume = snd_sb16_isa_resume,
...@@ -604,7 +604,7 @@ static struct isa_driver snd_sb16_isa_driver = { ...@@ -604,7 +604,7 @@ static struct isa_driver snd_sb16_isa_driver = {
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard, static int snd_sb16_pnp_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
static int dev; static int dev;
...@@ -631,7 +631,7 @@ static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard, ...@@ -631,7 +631,7 @@ static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard,
return -ENODEV; return -ENODEV;
} }
static void __devexit snd_sb16_pnp_remove(struct pnp_card_link * pcard) static void snd_sb16_pnp_remove(struct pnp_card_link *pcard)
{ {
snd_card_free(pnp_get_card_drvdata(pcard)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -657,7 +657,7 @@ static struct pnp_card_driver sb16_pnpc_driver = { ...@@ -657,7 +657,7 @@ static struct pnp_card_driver sb16_pnpc_driver = {
#endif #endif
.id_table = snd_sb16_pnpids, .id_table = snd_sb16_pnpids,
.probe = snd_sb16_pnp_detect, .probe = snd_sb16_pnp_detect,
.remove = __devexit_p(snd_sb16_pnp_remove), .remove = snd_sb16_pnp_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_sb16_pnp_suspend, .suspend = snd_sb16_pnp_suspend,
.resume = snd_sb16_pnp_resume, .resume = snd_sb16_pnp_resume,
......
sound/isa/sb/sb8.c
View file @ 1bff292e
...@@ -79,7 +79,7 @@ static void snd_sb8_free(struct snd_card *card) ...@@ -79,7 +79,7 @@ static void snd_sb8_free(struct snd_card *card)
release_and_free_resource(acard->fm_res); release_and_free_resource(acard->fm_res);
} }
static int __devinit snd_sb8_match(struct device *pdev, unsigned int dev) static int snd_sb8_match(struct device *pdev, unsigned int dev)
{ {
if (!enable[dev]) if (!enable[dev])
return 0; return 0;
...@@ -94,7 +94,7 @@ static int __devinit snd_sb8_match(struct device *pdev, unsigned int dev) ...@@ -94,7 +94,7 @@ static int __devinit snd_sb8_match(struct device *pdev, unsigned int dev)
return 1; return 1;
} }
static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev) static int snd_sb8_probe(struct device *pdev, unsigned int dev)
{ {
struct snd_sb *chip; struct snd_sb *chip;
struct snd_card *card; struct snd_card *card;
...@@ -205,7 +205,7 @@ static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev) ...@@ -205,7 +205,7 @@ static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev)
return err; return err;
} }
static int __devexit snd_sb8_remove(struct device *pdev, unsigned int dev) static int snd_sb8_remove(struct device *pdev, unsigned int dev)
{ {
snd_card_free(dev_get_drvdata(pdev)); snd_card_free(dev_get_drvdata(pdev));
dev_set_drvdata(pdev, NULL); dev_set_drvdata(pdev, NULL);
...@@ -244,7 +244,7 @@ static int snd_sb8_resume(struct device *dev, unsigned int n) ...@@ -244,7 +244,7 @@ static int snd_sb8_resume(struct device *dev, unsigned int n)
static struct isa_driver snd_sb8_driver = { static struct isa_driver snd_sb8_driver = {
.match = snd_sb8_match, .match = snd_sb8_match,
.probe = snd_sb8_probe, .probe = snd_sb8_probe,
.remove = __devexit_p(snd_sb8_remove), .remove = snd_sb8_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_sb8_suspend, .suspend = snd_sb8_suspend,
.resume = snd_sb8_resume, .resume = snd_sb8_resume,
......
sound/isa/sc6000.c
View file @ 1bff292e
...@@ -121,7 +121,7 @@ MODULE_PARM_DESC(joystick, "Enable gameport."); ...@@ -121,7 +121,7 @@ MODULE_PARM_DESC(joystick, "Enable gameport.");
/* /*
* sc6000_irq_to_softcfg - Decode irq number into cfg code. * sc6000_irq_to_softcfg - Decode irq number into cfg code.
*/ */
static __devinit unsigned char sc6000_irq_to_softcfg(int irq) static unsigned char sc6000_irq_to_softcfg(int irq)
{ {
unsigned char val = 0; unsigned char val = 0;
...@@ -150,7 +150,7 @@ static __devinit unsigned char sc6000_irq_to_softcfg(int irq) ...@@ -150,7 +150,7 @@ static __devinit unsigned char sc6000_irq_to_softcfg(int irq)
/* /*
* sc6000_dma_to_softcfg - Decode dma number into cfg code. * sc6000_dma_to_softcfg - Decode dma number into cfg code.
*/ */
static __devinit unsigned char sc6000_dma_to_softcfg(int dma) static unsigned char sc6000_dma_to_softcfg(int dma)
{ {
unsigned char val = 0; unsigned char val = 0;
...@@ -173,7 +173,7 @@ static __devinit unsigned char sc6000_dma_to_softcfg(int dma) ...@@ -173,7 +173,7 @@ static __devinit unsigned char sc6000_dma_to_softcfg(int dma)
/* /*
* sc6000_mpu_irq_to_softcfg - Decode MPU-401 irq number into cfg code. * sc6000_mpu_irq_to_softcfg - Decode MPU-401 irq number into cfg code.
*/ */
static __devinit unsigned char sc6000_mpu_irq_to_softcfg(int mpu_irq) static unsigned char sc6000_mpu_irq_to_softcfg(int mpu_irq)
{ {
unsigned char val = 0; unsigned char val = 0;
...@@ -242,7 +242,7 @@ static int sc6000_write(char __iomem *vport, int cmd) ...@@ -242,7 +242,7 @@ static int sc6000_write(char __iomem *vport, int cmd)
return -EIO; return -EIO;
} }
static int __devinit sc6000_dsp_get_answer(char __iomem *vport, int command, static int sc6000_dsp_get_answer(char __iomem *vport, int command,
char *data, int data_len) char *data, int data_len)
{ {
int len = 0; int len = 0;
...@@ -269,7 +269,7 @@ static int __devinit sc6000_dsp_get_answer(char __iomem *vport, int command, ...@@ -269,7 +269,7 @@ static int __devinit sc6000_dsp_get_answer(char __iomem *vport, int command,
return len ? len : -EIO; return len ? len : -EIO;
} }
static int __devinit sc6000_dsp_reset(char __iomem *vport) static int sc6000_dsp_reset(char __iomem *vport)
{ {
iowrite8(1, vport + DSP_RESET); iowrite8(1, vport + DSP_RESET);
udelay(10); udelay(10);
...@@ -281,7 +281,7 @@ static int __devinit sc6000_dsp_reset(char __iomem *vport) ...@@ -281,7 +281,7 @@ static int __devinit sc6000_dsp_reset(char __iomem *vport)
} }
/* detection and initialization */ /* detection and initialization */
static int __devinit sc6000_hw_cfg_write(char __iomem *vport, const int *cfg) static int sc6000_hw_cfg_write(char __iomem *vport, const int *cfg)
{ {
if (sc6000_write(vport, COMMAND_6C) < 0) { if (sc6000_write(vport, COMMAND_6C) < 0) {
snd_printk(KERN_WARNING "CMD 0x%x: failed!\n", COMMAND_6C); snd_printk(KERN_WARNING "CMD 0x%x: failed!\n", COMMAND_6C);
...@@ -345,7 +345,7 @@ static int sc6000_setup_board(char __iomem *vport, int config) ...@@ -345,7 +345,7 @@ static int sc6000_setup_board(char __iomem *vport, int config)
return 0; return 0;
} }
static int __devinit sc6000_init_mss(char __iomem *vport, int config, static int sc6000_init_mss(char __iomem *vport, int config,
char __iomem *vmss_port, int mss_config) char __iomem *vmss_port, int mss_config)
{ {
if (sc6000_write(vport, DSP_INIT_MSS)) { if (sc6000_write(vport, DSP_INIT_MSS)) {
...@@ -364,7 +364,7 @@ static int __devinit sc6000_init_mss(char __iomem *vport, int config, ...@@ -364,7 +364,7 @@ static int __devinit sc6000_init_mss(char __iomem *vport, int config,
return 0; return 0;
} }
static void __devinit sc6000_hw_cfg_encode(char __iomem *vport, int *cfg, static void sc6000_hw_cfg_encode(char __iomem *vport, int *cfg,
long xport, long xmpu, long xport, long xmpu,
long xmss_port, int joystick) long xmss_port, int joystick)
{ {
...@@ -386,7 +386,7 @@ static void __devinit sc6000_hw_cfg_encode(char __iomem *vport, int *cfg, ...@@ -386,7 +386,7 @@ static void __devinit sc6000_hw_cfg_encode(char __iomem *vport, int *cfg,
snd_printd("hw cfg %x, %x\n", cfg[0], cfg[1]); snd_printd("hw cfg %x, %x\n", cfg[0], cfg[1]);
} }
static int __devinit sc6000_init_board(char __iomem *vport, static int sc6000_init_board(char __iomem *vport,
char __iomem *vmss_port, int dev) char __iomem *vmss_port, int dev)
{ {
char answer[15]; char answer[15];
...@@ -467,7 +467,7 @@ static int __devinit sc6000_init_board(char __iomem *vport, ...@@ -467,7 +467,7 @@ static int __devinit sc6000_init_board(char __iomem *vport,
return 0; return 0;
} }
static int __devinit snd_sc6000_mixer(struct snd_wss *chip) static int snd_sc6000_mixer(struct snd_wss *chip)
{ {
struct snd_card *card = chip->card; struct snd_card *card = chip->card;
struct snd_ctl_elem_id id1, id2; struct snd_ctl_elem_id id1, id2;
...@@ -502,7 +502,7 @@ static int __devinit snd_sc6000_mixer(struct snd_wss *chip) ...@@ -502,7 +502,7 @@ static int __devinit snd_sc6000_mixer(struct snd_wss *chip)
return 0; return 0;
} }
static int __devinit snd_sc6000_match(struct device *devptr, unsigned int dev) static int snd_sc6000_match(struct device *devptr, unsigned int dev)
{ {
if (!enable[dev]) if (!enable[dev])
return 0; return 0;
...@@ -545,7 +545,7 @@ static int __devinit snd_sc6000_match(struct device *devptr, unsigned int dev) ...@@ -545,7 +545,7 @@ static int __devinit snd_sc6000_match(struct device *devptr, unsigned int dev)
return 1; return 1;
} }
static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev) static int snd_sc6000_probe(struct device *devptr, unsigned int dev)
{ {
static int possible_irqs[] = { 5, 7, 9, 10, 11, -1 }; static int possible_irqs[] = { 5, 7, 9, 10, 11, -1 };
static int possible_dmas[] = { 1, 3, 0, -1 }; static int possible_dmas[] = { 1, 3, 0, -1 };
...@@ -687,7 +687,7 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev) ...@@ -687,7 +687,7 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev)
return err; return err;
} }
static int __devexit snd_sc6000_remove(struct device *devptr, unsigned int dev) static int snd_sc6000_remove(struct device *devptr, unsigned int dev)
{ {
struct snd_card *card = dev_get_drvdata(devptr); struct snd_card *card = dev_get_drvdata(devptr);
char __iomem **vport = card->private_data; char __iomem **vport = card->private_data;
...@@ -706,7 +706,7 @@ static int __devexit snd_sc6000_remove(struct device *devptr, unsigned int dev) ...@@ -706,7 +706,7 @@ static int __devexit snd_sc6000_remove(struct device *devptr, unsigned int dev)
static struct isa_driver snd_sc6000_driver = { static struct isa_driver snd_sc6000_driver = {
.match = snd_sc6000_match, .match = snd_sc6000_match,
.probe = snd_sc6000_probe, .probe = snd_sc6000_probe,
.remove = __devexit_p(snd_sc6000_remove), .remove = snd_sc6000_remove,
/* FIXME: suspend/resume */ /* FIXME: suspend/resume */
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
......
sound/isa/sscape.c
View file @ 1bff292e
...@@ -683,7 +683,7 @@ static struct snd_kcontrol_new midi_mixer_ctl = { ...@@ -683,7 +683,7 @@ static struct snd_kcontrol_new midi_mixer_ctl = {
* These IRQs are encoded as bit patterns so that they can be * These IRQs are encoded as bit patterns so that they can be
* written to the control registers. * written to the control registers.
*/ */
static unsigned __devinit get_irq_config(int sscape_type, int irq) static unsigned get_irq_config(int sscape_type, int irq)
{ {
static const int valid_irq[] = { 9, 5, 7, 10 }; static const int valid_irq[] = { 9, 5, 7, 10 };
static const int old_irq[] = { 9, 7, 5, 15 }; static const int old_irq[] = { 9, 7, 5, 15 };
...@@ -706,7 +706,7 @@ static unsigned __devinit get_irq_config(int sscape_type, int irq) ...@@ -706,7 +706,7 @@ static unsigned __devinit get_irq_config(int sscape_type, int irq)
* Perform certain arcane port-checks to see whether there * Perform certain arcane port-checks to see whether there
* is a SoundScape board lurking behind the given ports. * is a SoundScape board lurking behind the given ports.
*/ */
static int __devinit detect_sscape(struct soundscape *s, long wss_io) static int detect_sscape(struct soundscape *s, long wss_io)
{ {
unsigned long flags; unsigned long flags;
unsigned d; unsigned d;
...@@ -817,7 +817,7 @@ static int mpu401_open(struct snd_mpu401 *mpu) ...@@ -817,7 +817,7 @@ static int mpu401_open(struct snd_mpu401 *mpu)
/* /*
* Initialse an MPU-401 subdevice for MIDI support on the SoundScape. * Initialse an MPU-401 subdevice for MIDI support on the SoundScape.
*/ */
static int __devinit create_mpu401(struct snd_card *card, int devnum, static int create_mpu401(struct snd_card *card, int devnum,
unsigned long port, int irq) unsigned long port, int irq)
{ {
struct soundscape *sscape = get_card_soundscape(card); struct soundscape *sscape = get_card_soundscape(card);
...@@ -845,7 +845,7 @@ static int __devinit create_mpu401(struct snd_card *card, int devnum, ...@@ -845,7 +845,7 @@ static int __devinit create_mpu401(struct snd_card *card, int devnum,
* try to support at least some of the extra bits by overriding * try to support at least some of the extra bits by overriding
* some of the CS4231 callback. * some of the CS4231 callback.
*/ */
static int __devinit create_ad1845(struct snd_card *card, unsigned port, static int create_ad1845(struct snd_card *card, unsigned port,
int irq, int dma1, int dma2) int irq, int dma1, int dma2)
{ {
register struct soundscape *sscape = get_card_soundscape(card); register struct soundscape *sscape = get_card_soundscape(card);
...@@ -937,7 +937,7 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port, ...@@ -937,7 +937,7 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port,
* Create an ALSA soundcard entry for the SoundScape, using * Create an ALSA soundcard entry for the SoundScape, using
* the given list of port, IRQ and DMA resources. * the given list of port, IRQ and DMA resources.
*/ */
static int __devinit create_sscape(int dev, struct snd_card *card) static int create_sscape(int dev, struct snd_card *card)
{ {
struct soundscape *sscape = get_card_soundscape(card); struct soundscape *sscape = get_card_soundscape(card);
unsigned dma_cfg; unsigned dma_cfg;
...@@ -1143,7 +1143,7 @@ static int __devinit create_sscape(int dev, struct snd_card *card) ...@@ -1143,7 +1143,7 @@ static int __devinit create_sscape(int dev, struct snd_card *card)
} }
static int __devinit snd_sscape_match(struct device *pdev, unsigned int i) static int snd_sscape_match(struct device *pdev, unsigned int i)
{ {
/* /*
* Make sure we were given ALL of the other parameters. * Make sure we were given ALL of the other parameters.
...@@ -1163,7 +1163,7 @@ static int __devinit snd_sscape_match(struct device *pdev, unsigned int i) ...@@ -1163,7 +1163,7 @@ static int __devinit snd_sscape_match(struct device *pdev, unsigned int i)
return 1; return 1;
} }
static int __devinit snd_sscape_probe(struct device *pdev, unsigned int dev) static int snd_sscape_probe(struct device *pdev, unsigned int dev)
{ {
struct snd_card *card; struct snd_card *card;
struct soundscape *sscape; struct soundscape *sscape;
...@@ -1197,7 +1197,7 @@ static int __devinit snd_sscape_probe(struct device *pdev, unsigned int dev) ...@@ -1197,7 +1197,7 @@ static int __devinit snd_sscape_probe(struct device *pdev, unsigned int dev)
return ret; return ret;
} }
static int __devexit snd_sscape_remove(struct device *devptr, unsigned int dev) static int snd_sscape_remove(struct device *devptr, unsigned int dev)
{ {
snd_card_free(dev_get_drvdata(devptr)); snd_card_free(dev_get_drvdata(devptr));
dev_set_drvdata(devptr, NULL); dev_set_drvdata(devptr, NULL);
...@@ -1209,7 +1209,7 @@ static int __devexit snd_sscape_remove(struct device *devptr, unsigned int dev) ...@@ -1209,7 +1209,7 @@ static int __devexit snd_sscape_remove(struct device *devptr, unsigned int dev)
static struct isa_driver snd_sscape_driver = { static struct isa_driver snd_sscape_driver = {
.match = snd_sscape_match, .match = snd_sscape_match,
.probe = snd_sscape_probe, .probe = snd_sscape_probe,
.remove = __devexit_p(snd_sscape_remove), .remove = snd_sscape_remove,
/* FIXME: suspend/resume */ /* FIXME: suspend/resume */
.driver = { .driver = {
.name = DEV_NAME .name = DEV_NAME
...@@ -1217,7 +1217,7 @@ static struct isa_driver snd_sscape_driver = { ...@@ -1217,7 +1217,7 @@ static struct isa_driver snd_sscape_driver = {
}; };
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static inline int __devinit get_next_autoindex(int i) static inline int get_next_autoindex(int i)
{ {
while (i < SNDRV_CARDS && port[i] != SNDRV_AUTO_PORT) while (i < SNDRV_CARDS && port[i] != SNDRV_AUTO_PORT)
++i; ++i;
...@@ -1225,7 +1225,7 @@ static inline int __devinit get_next_autoindex(int i) ...@@ -1225,7 +1225,7 @@ static inline int __devinit get_next_autoindex(int i)
} }
static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard, static int sscape_pnp_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
static int idx = 0; static int idx = 0;
...@@ -1310,7 +1310,7 @@ static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard, ...@@ -1310,7 +1310,7 @@ static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard,
return ret; return ret;
} }
static void __devexit sscape_pnp_remove(struct pnp_card_link * pcard) static void sscape_pnp_remove(struct pnp_card_link *pcard)
{ {
snd_card_free(pnp_get_card_drvdata(pcard)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -1321,7 +1321,7 @@ static struct pnp_card_driver sscape_pnpc_driver = { ...@@ -1321,7 +1321,7 @@ static struct pnp_card_driver sscape_pnpc_driver = {
.name = "sscape", .name = "sscape",
.id_table = sscape_pnpids, .id_table = sscape_pnpids,
.probe = sscape_pnp_detect, .probe = sscape_pnp_detect,
.remove = __devexit_p(sscape_pnp_remove), .remove = sscape_pnp_remove,
}; };
#endif /* CONFIG_PNP */ #endif /* CONFIG_PNP */
......
sound/isa/wavefront/wavefront.c
View file @ 1bff292e
...@@ -98,7 +98,7 @@ static struct pnp_card_device_id snd_wavefront_pnpids[] = { ...@@ -98,7 +98,7 @@ static struct pnp_card_device_id snd_wavefront_pnpids[] = {
MODULE_DEVICE_TABLE(pnp_card, snd_wavefront_pnpids); MODULE_DEVICE_TABLE(pnp_card, snd_wavefront_pnpids);
static int __devinit static int
snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *card, snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *card,
const struct pnp_card_device_id *id) const struct pnp_card_device_id *id)
{ {
...@@ -231,8 +231,7 @@ static irqreturn_t snd_wavefront_ics2115_interrupt(int irq, void *dev_id) ...@@ -231,8 +231,7 @@ static irqreturn_t snd_wavefront_ics2115_interrupt(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static struct snd_hwdep * __devinit static struct snd_hwdep *snd_wavefront_new_synth(struct snd_card *card,
snd_wavefront_new_synth (struct snd_card *card,
int hw_dev, int hw_dev,
snd_wavefront_card_t *acard) snd_wavefront_card_t *acard)
{ {
...@@ -257,8 +256,7 @@ snd_wavefront_new_synth (struct snd_card *card, ...@@ -257,8 +256,7 @@ snd_wavefront_new_synth (struct snd_card *card,
return wavefront_synth; return wavefront_synth;
} }
static struct snd_hwdep * __devinit static struct snd_hwdep *snd_wavefront_new_fx(struct snd_card *card,
snd_wavefront_new_fx (struct snd_card *card,
int hw_dev, int hw_dev,
snd_wavefront_card_t *acard, snd_wavefront_card_t *acard,
unsigned long port) unsigned long port)
...@@ -284,8 +282,7 @@ snd_wavefront_new_fx (struct snd_card *card, ...@@ -284,8 +282,7 @@ snd_wavefront_new_fx (struct snd_card *card,
static snd_wavefront_mpu_id internal_id = internal_mpu; static snd_wavefront_mpu_id internal_id = internal_mpu;
static snd_wavefront_mpu_id external_id = external_mpu; static snd_wavefront_mpu_id external_id = external_mpu;
static struct snd_rawmidi *__devinit static struct snd_rawmidi *snd_wavefront_new_midi(struct snd_card *card,
snd_wavefront_new_midi (struct snd_card *card,
int midi_dev, int midi_dev,
snd_wavefront_card_t *acard, snd_wavefront_card_t *acard,
unsigned long port, unsigned long port,
...@@ -361,7 +358,7 @@ static int snd_wavefront_card_new(int dev, struct snd_card **cardp) ...@@ -361,7 +358,7 @@ static int snd_wavefront_card_new(int dev, struct snd_card **cardp)
return 0; return 0;
} }
static int __devinit static int
snd_wavefront_probe (struct snd_card *card, int dev) snd_wavefront_probe (struct snd_card *card, int dev)
{ {
snd_wavefront_card_t *acard = card->private_data; snd_wavefront_card_t *acard = card->private_data;
...@@ -541,7 +538,7 @@ snd_wavefront_probe (struct snd_card *card, int dev) ...@@ -541,7 +538,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)
return snd_card_register(card); return snd_card_register(card);
} }
static int __devinit snd_wavefront_isa_match(struct device *pdev, static int snd_wavefront_isa_match(struct device *pdev,
unsigned int dev) unsigned int dev)
{ {
if (!enable[dev]) if (!enable[dev])
...@@ -561,7 +558,7 @@ static int __devinit snd_wavefront_isa_match(struct device *pdev, ...@@ -561,7 +558,7 @@ static int __devinit snd_wavefront_isa_match(struct device *pdev,
return 1; return 1;
} }
static int __devinit snd_wavefront_isa_probe(struct device *pdev, static int snd_wavefront_isa_probe(struct device *pdev,
unsigned int dev) unsigned int dev)
{ {
struct snd_card *card; struct snd_card *card;
...@@ -580,7 +577,7 @@ static int __devinit snd_wavefront_isa_probe(struct device *pdev, ...@@ -580,7 +577,7 @@ static int __devinit snd_wavefront_isa_probe(struct device *pdev,
return 0; return 0;
} }
static int __devexit snd_wavefront_isa_remove(struct device *devptr, static int snd_wavefront_isa_remove(struct device *devptr,
unsigned int dev) unsigned int dev)
{ {
snd_card_free(dev_get_drvdata(devptr)); snd_card_free(dev_get_drvdata(devptr));
...@@ -593,7 +590,7 @@ static int __devexit snd_wavefront_isa_remove(struct device *devptr, ...@@ -593,7 +590,7 @@ static int __devexit snd_wavefront_isa_remove(struct device *devptr,
static struct isa_driver snd_wavefront_driver = { static struct isa_driver snd_wavefront_driver = {
.match = snd_wavefront_isa_match, .match = snd_wavefront_isa_match,
.probe = snd_wavefront_isa_probe, .probe = snd_wavefront_isa_probe,
.remove = __devexit_p(snd_wavefront_isa_remove), .remove = snd_wavefront_isa_remove,
/* FIXME: suspend, resume */ /* FIXME: suspend, resume */
.driver = { .driver = {
.name = DEV_NAME .name = DEV_NAME
...@@ -602,7 +599,7 @@ static struct isa_driver snd_wavefront_driver = { ...@@ -602,7 +599,7 @@ static struct isa_driver snd_wavefront_driver = {
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard, static int snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
static int dev; static int dev;
...@@ -637,7 +634,7 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard, ...@@ -637,7 +634,7 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
return 0; return 0;
} }
static void __devexit snd_wavefront_pnp_remove(struct pnp_card_link * pcard) static void snd_wavefront_pnp_remove(struct pnp_card_link *pcard)
{ {
snd_card_free(pnp_get_card_drvdata(pcard)); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL); pnp_set_card_drvdata(pcard, NULL);
...@@ -648,7 +645,7 @@ static struct pnp_card_driver wavefront_pnpc_driver = { ...@@ -648,7 +645,7 @@ static struct pnp_card_driver wavefront_pnpc_driver = {
.name = "wavefront", .name = "wavefront",
.id_table = snd_wavefront_pnpids, .id_table = snd_wavefront_pnpids,
.probe = snd_wavefront_pnp_detect, .probe = snd_wavefront_pnp_detect,
.remove = __devexit_p(snd_wavefront_pnp_remove), .remove = snd_wavefront_pnp_remove,
/* FIXME: suspend,resume */ /* FIXME: suspend,resume */
}; };
......
sound/isa/wavefront/wavefront_fx.c
View file @ 1bff292e
...@@ -240,7 +240,7 @@ snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file, ...@@ -240,7 +240,7 @@ snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file,
that outputs it. that outputs it.
*/ */
int __devinit int
snd_wavefront_fx_start (snd_wavefront_t *dev) snd_wavefront_fx_start (snd_wavefront_t *dev)
{ {
unsigned int i; unsigned int i;
......
sound/isa/wavefront/wavefront_midi.c
View file @ 1bff292e
...@@ -481,7 +481,7 @@ snd_wavefront_midi_disable_virtual (snd_wavefront_card_t *card) ...@@ -481,7 +481,7 @@ snd_wavefront_midi_disable_virtual (snd_wavefront_card_t *card)
spin_unlock_irqrestore (&card->wavefront.midi.virtual, flags); spin_unlock_irqrestore (&card->wavefront.midi.virtual, flags);
} }
int __devinit int
snd_wavefront_midi_start (snd_wavefront_card_t *card) snd_wavefront_midi_start (snd_wavefront_card_t *card)
{ {
......
sound/isa/wavefront/wavefront_synth.c
View file @ 1bff292e
...@@ -1739,7 +1739,7 @@ snd_wavefront_internal_interrupt (snd_wavefront_card_t *card) ...@@ -1739,7 +1739,7 @@ snd_wavefront_internal_interrupt (snd_wavefront_card_t *card)
7 Unused 7 Unused
*/ */
static int __devinit static int
snd_wavefront_interrupt_bits (int irq) snd_wavefront_interrupt_bits (int irq)
{ {
...@@ -1767,7 +1767,7 @@ snd_wavefront_interrupt_bits (int irq) ...@@ -1767,7 +1767,7 @@ snd_wavefront_interrupt_bits (int irq)
return bits; return bits;
} }
static void __devinit static void
wavefront_should_cause_interrupt (snd_wavefront_t *dev, wavefront_should_cause_interrupt (snd_wavefront_t *dev,
int val, int port, unsigned long timeout) int val, int port, unsigned long timeout)
...@@ -1786,7 +1786,7 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev, ...@@ -1786,7 +1786,7 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev,
} }
} }
static int __devinit static int
wavefront_reset_to_cleanliness (snd_wavefront_t *dev) wavefront_reset_to_cleanliness (snd_wavefront_t *dev)
{ {
...@@ -1937,7 +1937,7 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev) ...@@ -1937,7 +1937,7 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev)
return (1); return (1);
} }
static int __devinit static int
wavefront_download_firmware (snd_wavefront_t *dev, char *path) wavefront_download_firmware (snd_wavefront_t *dev, char *path)
{ {
...@@ -2010,7 +2010,7 @@ wavefront_download_firmware (snd_wavefront_t *dev, char *path) ...@@ -2010,7 +2010,7 @@ wavefront_download_firmware (snd_wavefront_t *dev, char *path)
} }
static int __devinit static int
wavefront_do_reset (snd_wavefront_t *dev) wavefront_do_reset (snd_wavefront_t *dev)
{ {
...@@ -2099,7 +2099,7 @@ wavefront_do_reset (snd_wavefront_t *dev) ...@@ -2099,7 +2099,7 @@ wavefront_do_reset (snd_wavefront_t *dev)
return 1; return 1;
} }
int __devinit int
snd_wavefront_start (snd_wavefront_t *dev) snd_wavefront_start (snd_wavefront_t *dev)
{ {
...@@ -2141,7 +2141,7 @@ snd_wavefront_start (snd_wavefront_t *dev) ...@@ -2141,7 +2141,7 @@ snd_wavefront_start (snd_wavefront_t *dev)
return (0); return (0);
} }
int __devinit int
snd_wavefront_detect (snd_wavefront_card_t *card) snd_wavefront_detect (snd_wavefront_card_t *card)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7