diff options
Diffstat (limited to 'sound/soc/codecs/wm8400.c')
-rw-r--r-- | sound/soc/codecs/wm8400.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 510efa604008..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 | ||
@@ -1473,8 +1473,8 @@ static int wm8400_codec_probe(struct platform_device *dev) | |||
1473 | 1473 | ||
1474 | codec = &priv->codec; | 1474 | codec = &priv->codec; |
1475 | codec->private_data = priv; | 1475 | codec->private_data = priv; |
1476 | codec->control_data = dev->dev.driver_data; | 1476 | codec->control_data = dev_get_drvdata(&dev->dev); |
1477 | priv->wm8400 = dev->dev.driver_data; | 1477 | priv->wm8400 = dev_get_drvdata(&dev->dev); |
1478 | 1478 | ||
1479 | ret = regulator_bulk_get(priv->wm8400->dev, | 1479 | ret = regulator_bulk_get(priv->wm8400->dev, |
1480 | ARRAY_SIZE(power), &power[0]); | 1480 | ARRAY_SIZE(power), &power[0]); |