diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2009-05-27 20:08:39 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-28 05:20:26 -0400 |
commit | 449bd54dcbd0b60070ce4129fedaf0f4ae044099 (patch) | |
tree | 6904c4b60b5d8e0b781b9a4e04b7c12b52f0bfe8 | |
parent | ea8b27ad0cc2573776c6cd87617a37aaf603b8bd (diff) |
ASoC: correct print specifiers for unsigneds
Unsigned variables should use `%u' rather than `%d'.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/atmel/playpaq_wm8510.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/tlv320aic23.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/uda134x.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/wm8350.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm8400.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/wm8510.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm8580.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/wm8753.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm8900.c | 6 | ||||
-rw-r--r-- | sound/soc/codecs/wm8990.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm9713.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 4 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c-i2s-v2.c | 4 | ||||
-rw-r--r-- | sound/soc/sh/ssi.c | 2 |
14 files changed, 22 insertions, 22 deletions
diff --git a/sound/soc/atmel/playpaq_wm8510.c b/sound/soc/atmel/playpaq_wm8510.c index 70657534e6b1..9eb610c2ba91 100644 --- a/sound/soc/atmel/playpaq_wm8510.c +++ b/sound/soc/atmel/playpaq_wm8510.c | |||
@@ -117,7 +117,7 @@ static struct ssc_clock_data playpaq_wm8510_calc_ssc_clock( | |||
117 | * Find actual rate, compare to requested rate | 117 | * Find actual rate, compare to requested rate |
118 | */ | 118 | */ |
119 | actual_rate = (cd.ssc_rate / (cd.cmr_div * 2)) / (2 * (cd.period + 1)); | 119 | actual_rate = (cd.ssc_rate / (cd.cmr_div * 2)) / (2 * (cd.period + 1)); |
120 | pr_debug("playpaq_wm8510: Request rate = %d, actual rate = %d\n", | 120 | pr_debug("playpaq_wm8510: Request rate = %u, actual rate = %u\n", |
121 | rate, actual_rate); | 121 | rate, actual_rate); |
122 | 122 | ||
123 | 123 | ||
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index 21f69df9994c..9fcbb9c7766b 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c | |||
@@ -86,7 +86,7 @@ static int tlv320aic23_write(struct snd_soc_codec *codec, unsigned int reg, | |||
86 | */ | 86 | */ |
87 | 87 | ||
88 | if ((reg < 0 || reg > 9) && (reg != 15)) { | 88 | if ((reg < 0 || reg > 9) && (reg != 15)) { |
89 | printk(KERN_WARNING "%s Invalid register R%d\n", __func__, reg); | 89 | printk(KERN_WARNING "%s Invalid register R%u\n", __func__, reg); |
90 | return -1; | 90 | return -1; |
91 | } | 91 | } |
92 | 92 | ||
@@ -98,7 +98,7 @@ static int tlv320aic23_write(struct snd_soc_codec *codec, unsigned int reg, | |||
98 | if (codec->hw_write(codec->control_data, data, 2) == 2) | 98 | if (codec->hw_write(codec->control_data, data, 2) == 2) |
99 | return 0; | 99 | return 0; |
100 | 100 | ||
101 | printk(KERN_ERR "%s cannot write %03x to register R%d\n", __func__, | 101 | printk(KERN_ERR "%s cannot write %03x to register R%u\n", __func__, |
102 | value, reg); | 102 | value, reg); |
103 | 103 | ||
104 | return -EIO; | 104 | return -EIO; |
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index ddefb8f80145..269b108e1de6 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c | |||
@@ -101,7 +101,7 @@ static int uda134x_write(struct snd_soc_codec *codec, unsigned int reg, | |||
101 | pr_debug("%s reg: %02X, value:%02X\n", __func__, reg, value); | 101 | pr_debug("%s reg: %02X, value:%02X\n", __func__, reg, value); |
102 | 102 | ||
103 | if (reg >= UDA134X_REGS_NUM) { | 103 | if (reg >= UDA134X_REGS_NUM) { |
104 | printk(KERN_ERR "%s unkown register: reg: %d", | 104 | printk(KERN_ERR "%s unkown register: reg: %u", |
105 | __func__, reg); | 105 | __func__, reg); |
106 | return -EINVAL; | 106 | return -EINVAL; |
107 | } | 107 | } |
@@ -296,7 +296,7 @@ static int uda134x_set_dai_sysclk(struct snd_soc_dai *codec_dai, | |||
296 | struct snd_soc_codec *codec = codec_dai->codec; | 296 | struct snd_soc_codec *codec = codec_dai->codec; |
297 | struct uda134x_priv *uda134x = codec->private_data; | 297 | struct uda134x_priv *uda134x = codec->private_data; |
298 | 298 | ||
299 | pr_debug("%s clk_id: %d, freq: %d, dir: %d\n", __func__, | 299 | pr_debug("%s clk_id: %d, freq: %u, dir: %d\n", __func__, |
300 | clk_id, freq, dir); | 300 | clk_id, freq, dir); |
301 | 301 | ||
302 | /* Anything between 256fs*8Khz and 512fs*48Khz should be acceptable | 302 | /* Anything between 256fs*8Khz and 512fs*48Khz should be acceptable |
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 0275321ff8ab..e7348d341b76 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c | |||
@@ -1108,7 +1108,7 @@ static int wm8350_set_fll(struct snd_soc_dai *codec_dai, | |||
1108 | if (ret < 0) | 1108 | if (ret < 0) |
1109 | return ret; | 1109 | return ret; |
1110 | dev_dbg(wm8350->dev, | 1110 | dev_dbg(wm8350->dev, |
1111 | "FLL in %d FLL out %d N 0x%x K 0x%x div %d ratio %d", | 1111 | "FLL in %u FLL out %u N 0x%x K 0x%x div %d ratio %d", |
1112 | freq_in, freq_out, fll_div.n, fll_div.k, fll_div.div, | 1112 | freq_in, freq_out, fll_div.n, fll_div.k, fll_div.div, |
1113 | fll_div.ratio); | 1113 | fll_div.ratio); |
1114 | 1114 | ||
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index e4547de8eec2..502eefac1ecd 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c | |||
@@ -954,7 +954,7 @@ static int fll_factors(struct wm8400_priv *wm8400, struct fll_factors *factors, | |||
954 | factors->outdiv *= 2; | 954 | factors->outdiv *= 2; |
955 | if (factors->outdiv > 32) { | 955 | if (factors->outdiv > 32) { |
956 | dev_err(wm8400->wm8400->dev, | 956 | dev_err(wm8400->wm8400->dev, |
957 | "Unsupported FLL output frequency %dHz\n", | 957 | "Unsupported FLL output frequency %uHz\n", |
958 | Fout); | 958 | Fout); |
959 | return -EINVAL; | 959 | return -EINVAL; |
960 | } | 960 | } |
@@ -1003,7 +1003,7 @@ static int fll_factors(struct wm8400_priv *wm8400, struct fll_factors *factors, | |||
1003 | factors->k = K / 10; | 1003 | factors->k = K / 10; |
1004 | 1004 | ||
1005 | dev_dbg(wm8400->wm8400->dev, | 1005 | dev_dbg(wm8400->wm8400->dev, |
1006 | "FLL: Fref=%d Fout=%d N=%x K=%x, FRATIO=%x OUTDIV=%x\n", | 1006 | "FLL: Fref=%u Fout=%u N=%x K=%x, FRATIO=%x OUTDIV=%x\n", |
1007 | Fref, Fout, | 1007 | Fref, Fout, |
1008 | factors->n, factors->k, factors->fratio, factors->outdiv); | 1008 | factors->n, factors->k, factors->fratio, factors->outdiv); |
1009 | 1009 | ||
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 6a4cea09c45d..c8b8dba85890 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c | |||
@@ -298,7 +298,7 @@ static void pll_factors(unsigned int target, unsigned int source) | |||
298 | 298 | ||
299 | if ((Ndiv < 6) || (Ndiv > 12)) | 299 | if ((Ndiv < 6) || (Ndiv > 12)) |
300 | printk(KERN_WARNING | 300 | printk(KERN_WARNING |
301 | "WM8510 N value %d outwith recommended range!d\n", | 301 | "WM8510 N value %u outwith recommended range!d\n", |
302 | Ndiv); | 302 | Ndiv); |
303 | 303 | ||
304 | pll_div.n = Ndiv; | 304 | pll_div.n = Ndiv; |
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 9f6be3d31ac0..86c4b24db817 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c | |||
@@ -415,7 +415,7 @@ static int pll_factors(struct _pll_div *pll_div, unsigned int target, | |||
415 | unsigned int K, Ndiv, Nmod; | 415 | unsigned int K, Ndiv, Nmod; |
416 | int i; | 416 | int i; |
417 | 417 | ||
418 | pr_debug("wm8580: PLL %dHz->%dHz\n", source, target); | 418 | pr_debug("wm8580: PLL %uHz->%uHz\n", source, target); |
419 | 419 | ||
420 | /* Scale the output frequency up; the PLL should run in the | 420 | /* Scale the output frequency up; the PLL should run in the |
421 | * region of 90-100MHz. | 421 | * region of 90-100MHz. |
@@ -447,7 +447,7 @@ static int pll_factors(struct _pll_div *pll_div, unsigned int target, | |||
447 | 447 | ||
448 | if ((Ndiv < 5) || (Ndiv > 13)) { | 448 | if ((Ndiv < 5) || (Ndiv > 13)) { |
449 | printk(KERN_ERR | 449 | printk(KERN_ERR |
450 | "WM8580 N=%d outside supported range\n", Ndiv); | 450 | "WM8580 N=%u outside supported range\n", Ndiv); |
451 | return -EINVAL; | 451 | return -EINVAL; |
452 | } | 452 | } |
453 | 453 | ||
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index d121e58cae2b..d28eeaceb857 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c | |||
@@ -703,7 +703,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target, | |||
703 | 703 | ||
704 | if ((Ndiv < 6) || (Ndiv > 12)) | 704 | if ((Ndiv < 6) || (Ndiv > 12)) |
705 | printk(KERN_WARNING | 705 | printk(KERN_WARNING |
706 | "wm8753: unsupported N = %d\n", Ndiv); | 706 | "wm8753: unsupported N = %u\n", Ndiv); |
707 | 707 | ||
708 | pll_div->n = Ndiv; | 708 | pll_div->n = Ndiv; |
709 | Nmod = target % source; | 709 | Nmod = target % source; |
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 46c5ea1ff921..3c78945244b8 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c | |||
@@ -778,11 +778,11 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref, | |||
778 | } | 778 | } |
779 | 779 | ||
780 | if (target > 100000000) | 780 | if (target > 100000000) |
781 | printk(KERN_WARNING "wm8900: FLL rate %d out of range, Fref=%d" | 781 | printk(KERN_WARNING "wm8900: FLL rate %u out of range, Fref=%u" |
782 | " Fout=%d\n", target, Fref, Fout); | 782 | " Fout=%u\n", target, Fref, Fout); |
783 | if (div > 32) { | 783 | if (div > 32) { |
784 | printk(KERN_ERR "wm8900: Invalid FLL division rate %u, " | 784 | printk(KERN_ERR "wm8900: Invalid FLL division rate %u, " |
785 | "Fref=%d, Fout=%d, target=%d\n", | 785 | "Fref=%u, Fout=%u, target=%u\n", |
786 | div, Fref, Fout, target); | 786 | div, Fref, Fout, target); |
787 | return -EINVAL; | 787 | return -EINVAL; |
788 | } | 788 | } |
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 40cd274eb1ef..d029818350e9 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c | |||
@@ -998,7 +998,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target, | |||
998 | 998 | ||
999 | if ((Ndiv < 6) || (Ndiv > 12)) | 999 | if ((Ndiv < 6) || (Ndiv > 12)) |
1000 | printk(KERN_WARNING | 1000 | printk(KERN_WARNING |
1001 | "WM8990 N value outwith recommended range! N = %d\n", Ndiv); | 1001 | "WM8990 N value outwith recommended range! N = %u\n", Ndiv); |
1002 | 1002 | ||
1003 | pll_div->n = Ndiv; | 1003 | pll_div->n = Ndiv; |
1004 | Nmod = target % source; | 1004 | Nmod = target % source; |
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index d1744e96f303..abed37acf787 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c | |||
@@ -710,7 +710,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int source) | |||
710 | Ndiv = target / source; | 710 | Ndiv = target / source; |
711 | if ((Ndiv < 5) || (Ndiv > 12)) | 711 | if ((Ndiv < 5) || (Ndiv > 12)) |
712 | printk(KERN_WARNING | 712 | printk(KERN_WARNING |
713 | "WM9713 PLL N value %d out of recommended range!\n", | 713 | "WM9713 PLL N value %u out of recommended range!\n", |
714 | Ndiv); | 714 | Ndiv); |
715 | 715 | ||
716 | pll_div->n = Ndiv; | 716 | pll_div->n = Ndiv; |
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 6fc787610ad7..19c45409d94c 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c | |||
@@ -208,7 +208,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, | |||
208 | ~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS); | 208 | ~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS); |
209 | 209 | ||
210 | dev_dbg(&ssp->pdev->dev, | 210 | dev_dbg(&ssp->pdev->dev, |
211 | "pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %d\n", | 211 | "pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %u\n", |
212 | cpu_dai->id, clk_id, freq); | 212 | cpu_dai->id, clk_id, freq); |
213 | 213 | ||
214 | switch (clk_id) { | 214 | switch (clk_id) { |
@@ -357,7 +357,7 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, | |||
357 | ssacd |= (0x6 << 4); | 357 | ssacd |= (0x6 << 4); |
358 | 358 | ||
359 | dev_dbg(&ssp->pdev->dev, | 359 | dev_dbg(&ssp->pdev->dev, |
360 | "Using SSACDD %x to supply %dHz\n", | 360 | "Using SSACDD %x to supply %uHz\n", |
361 | val, freq_out); | 361 | val, freq_out); |
362 | break; | 362 | break; |
363 | } | 363 | } |
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 972c27684198..1a283170ca92 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c | |||
@@ -547,7 +547,7 @@ int s3c_i2sv2_iis_calc_rate(struct s3c_i2sv2_rate_calc *info, | |||
547 | actual = clkrate / (fsdiv * div); | 547 | actual = clkrate / (fsdiv * div); |
548 | deviation = actual - rate; | 548 | deviation = actual - rate; |
549 | 549 | ||
550 | printk(KERN_DEBUG "%dfs: div %d => result %d, deviation %d\n", | 550 | printk(KERN_DEBUG "%ufs: div %u => result %u, deviation %d\n", |
551 | fsdiv, div, actual, deviation); | 551 | fsdiv, div, actual, deviation); |
552 | 552 | ||
553 | deviation = abs(deviation); | 553 | deviation = abs(deviation); |
@@ -563,7 +563,7 @@ int s3c_i2sv2_iis_calc_rate(struct s3c_i2sv2_rate_calc *info, | |||
563 | break; | 563 | break; |
564 | } | 564 | } |
565 | 565 | ||
566 | printk(KERN_DEBUG "best: fs=%d, div=%d, rate=%d\n", | 566 | printk(KERN_DEBUG "best: fs=%u, div=%u, rate=%u\n", |
567 | best_fs, best_div, best_rate); | 567 | best_fs, best_div, best_rate); |
568 | 568 | ||
569 | info->fs_div = best_fs; | 569 | info->fs_div = best_fs; |
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c index 56fa0872abbb..b378096cadb1 100644 --- a/sound/soc/sh/ssi.c +++ b/sound/soc/sh/ssi.c | |||
@@ -145,7 +145,7 @@ static int ssi_hw_params(struct snd_pcm_substream *substream, | |||
145 | recv = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? 0 : 1; | 145 | recv = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? 0 : 1; |
146 | 146 | ||
147 | pr_debug("ssi_hw_params() enter\nssicr was %08lx\n", ssicr); | 147 | pr_debug("ssi_hw_params() enter\nssicr was %08lx\n", ssicr); |
148 | pr_debug("bits: %d channels: %d\n", bits, channels); | 148 | pr_debug("bits: %u channels: %u\n", bits, channels); |
149 | 149 | ||
150 | ssicr &= ~(CR_TRMD | CR_CHNL_MASK | CR_DWL_MASK | CR_PDTA | | 150 | ssicr &= ~(CR_TRMD | CR_CHNL_MASK | CR_DWL_MASK | CR_PDTA | |
151 | CR_SWL_MASK); | 151 | CR_SWL_MASK); |