projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[deliverable/linux.git]
/
sound
/
pci
/
als300.c
diff --git
a/sound/pci/als300.c
b/sound/pci/als300.c
index 5af3cb6b0c18d36345aadfefee3d509404bbba80..864c4310366b4da41ad891ce829d0e2fc0a10300 100644
(file)
--- a/
sound/pci/als300.c
+++ b/
sound/pci/als300.c
@@
-278,7
+278,7
@@
static irqreturn_t snd_als300plus_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static void
__devexit
snd_als300_remove(struct pci_dev *pci)
+static void snd_als300_remove(struct pci_dev *pci)
{
snd_als300_dbgcallenter();
snd_card_free(pci_get_drvdata(pci));
{
snd_als300_dbgcallenter();
snd_card_free(pci_get_drvdata(pci));
@@
-622,7
+622,7
@@
static struct snd_pcm_ops snd_als300_capture_ops = {
.pointer = snd_als300_pointer,
};
.pointer = snd_als300_pointer,
};
-static int
__devinit
snd_als300_new_pcm(struct snd_als300 *chip)
+static int snd_als300_new_pcm(struct snd_als300 *chip)
{
struct snd_pcm *pcm;
int err;
{
struct snd_pcm *pcm;
int err;
@@
-683,9
+683,9
@@
static void snd_als300_init(struct snd_als300 *chip)
snd_als300_dbgcallleave();
}
snd_als300_dbgcallleave();
}
-static int
__devinit
snd_als300_create(struct snd_card *card,
-
struct pci_dev *pci, int chip_type,
-
struct snd_als300 **rchip)
+static int snd_als300_create(struct snd_card *card,
+ struct pci_dev *pci, int chip_type,
+ struct snd_als300 **rchip)
{
struct snd_als300 *chip;
void *irq_handler;
{
struct snd_als300 *chip;
void *irq_handler;
@@
-815,7
+815,7
@@
static SIMPLE_DEV_PM_OPS(snd_als300_pm, snd_als300_suspend, snd_als300_resume);
#define SND_ALS300_PM_OPS NULL
#endif
#define SND_ALS300_PM_OPS NULL
#endif
-static int
__devinit
snd_als300_probe(struct pci_dev *pci,
+static int snd_als300_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id)
{
static int dev;
const struct pci_device_id *pci_id)
{
static int dev;
@@
-867,7
+867,7
@@
static struct pci_driver als300_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_als300_ids,
.probe = snd_als300_probe,
.name = KBUILD_MODNAME,
.id_table = snd_als300_ids,
.probe = snd_als300_probe,
- .remove =
__devexit_p(snd_als300_remove)
,
+ .remove =
snd_als300_remove
,
.driver = {
.pm = SND_ALS300_PM_OPS,
},
.driver = {
.pm = SND_ALS300_PM_OPS,
},
This page took
0.027372 seconds
and
5
git commands to generate.