diff --git a/[refs] b/[refs]
index ec6af6172e8b..82fd9f9b6efa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1274738d85d0e25c4f82d83f50a6bcbe2397e9ea
+refs/heads/master: 416c8fe3cdcd2d46a6ca12d8ec6143c62d8569d9
diff --git a/trunk/sound/soc/codecs/ad1938.c b/trunk/sound/soc/codecs/ad1938.c
index 3dc80910318a..5a7d00cad69a 100644
--- a/trunk/sound/soc/codecs/ad1938.c
+++ b/trunk/sound/soc/codecs/ad1938.c
@@ -420,14 +420,14 @@ static int __devinit ad1938_spi_probe(struct spi_device *spi)
 	codec->control_data = spi;
 	codec->dev = &spi->dev;
 
-	spi->dev.driver_data = ad1938;
+	dev_set_drvdata(&spi->dev, ad1938);
 
 	return ad1938_register(ad1938);
 }
 
 static int __devexit ad1938_spi_remove(struct spi_device *spi)
 {
-	struct ad1938_priv *ad1938 = spi->dev.driver_data;
+	struct ad1938_priv *ad1938 = dev_get_drvdata(&spi->dev);
 
 	ad1938_unregister(ad1938);
 	return 0;