Skip to contentSkip to conversation

ASoC: cq93vc: fix cq93vc_get_regmap build error

PATCH In review Arnd Bergmann 3 participants 3 messages Apr 30, 2014 – May 1, 2014

Subsystems (2)
Sound ASoC
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 ASoC: cq93vc: fix cq93vc_get_regmap build error

49101a25acd69c "ASoC: cq93vc: Remove the set_cache_io() entirely from ASoC probe" introduced the cq93vc_get_regmap function that has an obvious build error referring to the 'codec' variable that is not declared anywhere"

sound/soc/codecs/cq93vc.c: In function 'cq93vc_get_regmap':
sound/soc/codecs/cq93vc.c:157:34: error: 'codec' undeclared (first use in this function)

  struct davinci_vc *davinci_vc = codec->dev->platform_data;
                                  ^

This changes the code to compile again, presumably in the way it was intended. Not tested.

Signed-off-by Arnd Bergmann <[email protected]>
Cc Xiubo Li <[email protected]>
sound/soc/codecs/cq93vc.c +1 -1
index 5ee48c8..537327c 100644
@@ -154,7 +154,7 @@ static int cq93vc_remove(struct snd_soc_codec *codec)
 
 static struct regmap *cq93vc_get_regmap(struct device *dev)
 {
-	struct davinci_vc *davinci_vc = codec->dev->platform_data;
+	struct davinci_vc *davinci_vc = dev->platform_data;
 
 	return davinci_vc->regmap;
 }
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines

Subject: [PATCH] ASoC: cq93vc: fix cq93vc_get_regmap build error

49101a25acd69c "ASoC: cq93vc: Remove the set_cache_io() entirely from ASoC probe" introduced the cq93vc_get_regmap function that has an obvious build error referring to the 'codec' variable that is not declared anywhere"

Quoted 9 lines

sound/soc/codecs/cq93vc.c: In function 'cq93vc_get_regmap':
sound/soc/codecs/cq93vc.c:157:34: error: 'codec' undeclared (first use in this function)

  struct davinci_vc *davinci_vc = codec->dev->platform_data;
                                  ^

This changes the code to compile again, presumably in the way it was intended. Not tested.

Reviewed-by Xiubo Li <[email protected]>

Thanks,

Quoted 16 lines
Signed-off-by Arnd Bergmann <[email protected]>
Cc Xiubo Li <[email protected]>
sound/soc/codecs/cq93vc.c +1 -1
index 5ee48c8..537327c 100644
@@ -154,7 +154,7 @@ static int cq93vc_remove(struct snd_soc_codec *codec)
 
 static struct regmap *cq93vc_get_regmap(struct device *dev)
 {
-	struct davinci_vc *davinci_vc = codec->dev->platform_data;
+	struct davinci_vc *davinci_vc = dev->platform_data;
 
 	return davinci_vc->regmap;
 }
maintainer
#2 lore raw
In reply to Arnd Bergmann
Quoted 4 lines · Arnd Bergmann

49101a25acd69c "ASoC: cq93vc: Remove the set_cache_io() entirely from ASoC probe" introduced the cq93vc_get_regmap function that has an obvious build error referring to the 'codec' variable that is not declared anywhere"

Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140430/1eea7104/attachment.sig>