diff options
-rw-r--r-- | sound/soc/codecs/ab8500-codec.c | 10 | ||||
-rw-r--r-- | sound/soc/sh/rcar/ssi.c | 2 | ||||
-rw-r--r-- | sound/soc/soc-core.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 2fc89155f14a..1d4059cfc764 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c | |||
@@ -2408,28 +2408,28 @@ static void ab8500_codec_of_probe(struct device *dev, struct device_node *np, | |||
2408 | { | 2408 | { |
2409 | u32 value; | 2409 | u32 value; |
2410 | 2410 | ||
2411 | if (of_get_property(np, "stericsson,amic1-type-single-ended", NULL)) | 2411 | if (of_property_read_bool(np, "stericsson,amic1-type-single-ended")) |
2412 | codec->amics.mic1_type = AMIC_TYPE_SINGLE_ENDED; | 2412 | codec->amics.mic1_type = AMIC_TYPE_SINGLE_ENDED; |
2413 | else | 2413 | else |
2414 | codec->amics.mic1_type = AMIC_TYPE_DIFFERENTIAL; | 2414 | codec->amics.mic1_type = AMIC_TYPE_DIFFERENTIAL; |
2415 | 2415 | ||
2416 | if (of_get_property(np, "stericsson,amic2-type-single-ended", NULL)) | 2416 | if (of_property_read_bool(np, "stericsson,amic2-type-single-ended")) |
2417 | codec->amics.mic2_type = AMIC_TYPE_SINGLE_ENDED; | 2417 | codec->amics.mic2_type = AMIC_TYPE_SINGLE_ENDED; |
2418 | else | 2418 | else |
2419 | codec->amics.mic2_type = AMIC_TYPE_DIFFERENTIAL; | 2419 | codec->amics.mic2_type = AMIC_TYPE_DIFFERENTIAL; |
2420 | 2420 | ||
2421 | /* Has a non-standard Vamic been requested? */ | 2421 | /* Has a non-standard Vamic been requested? */ |
2422 | if (of_get_property(np, "stericsson,amic1a-bias-vamic2", NULL)) | 2422 | if (of_property_read_bool(np, "stericsson,amic1a-bias-vamic2")) |
2423 | codec->amics.mic1a_micbias = AMIC_MICBIAS_VAMIC2; | 2423 | codec->amics.mic1a_micbias = AMIC_MICBIAS_VAMIC2; |
2424 | else | 2424 | else |
2425 | codec->amics.mic1a_micbias = AMIC_MICBIAS_VAMIC1; | 2425 | codec->amics.mic1a_micbias = AMIC_MICBIAS_VAMIC1; |
2426 | 2426 | ||
2427 | if (of_get_property(np, "stericsson,amic1b-bias-vamic2", NULL)) | 2427 | if (of_property_read_bool(np, "stericsson,amic1b-bias-vamic2")) |
2428 | codec->amics.mic1b_micbias = AMIC_MICBIAS_VAMIC2; | 2428 | codec->amics.mic1b_micbias = AMIC_MICBIAS_VAMIC2; |
2429 | else | 2429 | else |
2430 | codec->amics.mic1b_micbias = AMIC_MICBIAS_VAMIC1; | 2430 | codec->amics.mic1b_micbias = AMIC_MICBIAS_VAMIC1; |
2431 | 2431 | ||
2432 | if (of_get_property(np, "stericsson,amic2-bias-vamic1", NULL)) | 2432 | if (of_property_read_bool(np, "stericsson,amic2-bias-vamic1")) |
2433 | codec->amics.mic2_micbias = AMIC_MICBIAS_VAMIC1; | 2433 | codec->amics.mic2_micbias = AMIC_MICBIAS_VAMIC1; |
2434 | else | 2434 | else |
2435 | codec->amics.mic2_micbias = AMIC_MICBIAS_VAMIC2; | 2435 | codec->amics.mic2_micbias = AMIC_MICBIAS_VAMIC2; |
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 5f848f054745..6cb6db005fc4 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c | |||
@@ -928,7 +928,7 @@ int rsnd_ssi_probe(struct rsnd_priv *priv) | |||
928 | } | 928 | } |
929 | 929 | ||
930 | ops = &rsnd_ssi_non_ops; | 930 | ops = &rsnd_ssi_non_ops; |
931 | if (of_get_property(np, "pio-transfer", NULL)) | 931 | if (of_property_read_bool(np, "pio-transfer")) |
932 | ops = &rsnd_ssi_pio_ops; | 932 | ops = &rsnd_ssi_pio_ops; |
933 | else | 933 | else |
934 | ops = &rsnd_ssi_dma_ops; | 934 | ops = &rsnd_ssi_dma_ops; |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 16369cad4803..ead49d032e4c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -3733,7 +3733,7 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np, | |||
3733 | * SND_SOC_DAIFMT_CLOCK_MASK area | 3733 | * SND_SOC_DAIFMT_CLOCK_MASK area |
3734 | */ | 3734 | */ |
3735 | snprintf(prop, sizeof(prop), "%scontinuous-clock", prefix); | 3735 | snprintf(prop, sizeof(prop), "%scontinuous-clock", prefix); |
3736 | if (of_get_property(np, prop, NULL)) | 3736 | if (of_property_read_bool(np, prop)) |
3737 | format |= SND_SOC_DAIFMT_CONT; | 3737 | format |= SND_SOC_DAIFMT_CONT; |
3738 | else | 3738 | else |
3739 | format |= SND_SOC_DAIFMT_GATED; | 3739 | format |= SND_SOC_DAIFMT_GATED; |