linux-kernel - Re: linux-next: sound tree build failure

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 17 Jul 2009 10:28:25 +0100
From:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Takashi Iwai <tiwai@...e.de>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Barry Song <21cnbao@...il.com>,
	Greg KH <greg@...ah.com>
Subject: Re: linux-next: sound tree build failure

On Fri, Jul 17, 2009 at 11:29:35AM +1000, Stephen Rothwell wrote:

> Caused by commit 1274738d85d0e25c4f82d83f50a6bcbe2397e9ea ("ASoC: new
> ad1938 codec driver based on asoc") interacting with commit
> 2e34003ff6237e2216396d61dc8b32ea5959de80 ("Driver core: move
> dev_get/set_drvdata to drivers/base/dd.c") from the driver-core.current
> tree (which will, I assume, be sent to Linus shortly - right, Greg?).

I've fixed this.

> New drivers need to use the (existing) API's dev_{set,get}_drvdata().

Incidentally, is there any great reason not to have the equivalent thing
for platform data?  I can supply a patch.

>From 91a0351b2d1e86f421ee9c95d07136f648d2da06 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@...nsource.wolfsonmicro.com>
Date: Fri, 17 Jul 2009 10:18:14 +0100
Subject: [PATCH] ASoC: Use driverdata accessors in ad1938

Signed-off-by: Mark Brown <broonie@...nsource.wolfsonmicro.com>
---
 sound/soc/codecs/ad1938.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/ad1938.c b/sound/soc/codecs/ad1938.c
index 3dc8091..5a7d00c 100644
--- a/sound/soc/codecs/ad1938.c
+++ b/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;
-- 
1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/