From 73db4e836560ec2af172cb1387897c12fdfdd94d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Jun 2009 15:46:03 -0700 Subject: [PATCH] --- yaml --- r: 155413 b: refs/heads/master c: 864e1e8db436dfd784340d0aef18ea303d157bcb h: refs/heads/master i: 155411: 777fd4e6879e816474b83715ea532953063552ee v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8988.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ea4c1ff8d08b..6f83fad7c3e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 909662e1e7290945fa3bca038bc3b7bb5d19499f +refs/heads/master: 864e1e8db436dfd784340d0aef18ea303d157bcb diff --git a/trunk/sound/soc/codecs/wm8988.c b/trunk/sound/soc/codecs/wm8988.c index c05f71803aa8..8c0fdf84aac3 100644 --- a/trunk/sound/soc/codecs/wm8988.c +++ b/trunk/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; - 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) { - struct wm8988_priv *wm8988 = spi->dev.driver_data; + struct wm8988_priv *wm8988 = dev_get_drvdata(&spi->dev); wm8988_unregister(wm8988);