git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/misc' into for-linus
[pandora-kernel.git]
/
sound
/
soc
/
codecs
/
wm8988.c
diff --git
a/sound/soc/codecs/wm8988.c
b/sound/soc/codecs/wm8988.c
index
c05f718
..
8c0fdf8
100644
(file)
--- a/
sound/soc/codecs/wm8988.c
+++ b/
sound/soc/codecs/wm8988.c
@@
-1037,14
+1037,14
@@
static int __devinit wm8988_spi_probe(struct spi_device *spi)
codec->control_data = spi;
codec->dev = &spi->dev;
codec->control_data = spi;
codec->dev = &spi->dev;
-
spi->dev.driver_data = wm8988
;
+
dev_set_drvdata(&spi->dev, wm8988)
;
return wm8988_register(wm8988);
}
static int __devexit wm8988_spi_remove(struct spi_device *spi)
{
return wm8988_register(wm8988);
}
static int __devexit wm8988_spi_remove(struct spi_device *spi)
{
- struct wm8988_priv *wm8988 =
spi->dev.driver_data
;
+ struct wm8988_priv *wm8988 =
dev_get_drvdata(&spi->dev)
;
wm8988_unregister(wm8988);
wm8988_unregister(wm8988);