git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: atmel: ac97: Convert to platform remove callback returning void
[sfrench/cifs-2.6.git]
/
sound
/
atmel
/
ac97c.c
diff --git
a/sound/atmel/ac97c.c
b/sound/atmel/ac97c.c
index 66ecbd4d034e805263359760aa7796893b4649cd..c8912b8a1dc5b5ab2c1640cf9cf3d847295a162e 100644
(file)
--- a/
sound/atmel/ac97c.c
+++ b/
sound/atmel/ac97c.c
@@
-843,7
+843,7
@@
static SIMPLE_DEV_PM_OPS(atmel_ac97c_pm, atmel_ac97c_suspend, atmel_ac97c_resume
#define ATMEL_AC97C_PM_OPS NULL
#endif
#define ATMEL_AC97C_PM_OPS NULL
#endif
-static
int
atmel_ac97c_remove(struct platform_device *pdev)
+static
void
atmel_ac97c_remove(struct platform_device *pdev)
{
struct snd_card *card = platform_get_drvdata(pdev);
struct atmel_ac97c *chip = get_chip(card);
{
struct snd_card *card = platform_get_drvdata(pdev);
struct atmel_ac97c *chip = get_chip(card);
@@
-858,13
+858,11
@@
static int atmel_ac97c_remove(struct platform_device *pdev)
free_irq(chip->irq, chip);
snd_card_free(card);
free_irq(chip->irq, chip);
snd_card_free(card);
-
- return 0;
}
static struct platform_driver atmel_ac97c_driver = {
.probe = atmel_ac97c_probe,
}
static struct platform_driver atmel_ac97c_driver = {
.probe = atmel_ac97c_probe,
- .remove
= atmel_ac97c_remove,
+ .remove
_new
= atmel_ac97c_remove,
.driver = {
.name = "atmel_ac97c",
.pm = ATMEL_AC97C_PM_OPS,
.driver = {
.name = "atmel_ac97c",
.pm = ATMEL_AC97C_PM_OPS,