3 files changed, 5 insertions, 24 deletions

diff --git a/Documentation/devicetree/bindings/sound/sun4i-codec.txt b/Documentation/devicetree/bindings/sound/sun4i-codec.txt
index 680144b74ae9..c92966bd5488 100644
--- a/Documentation/devicetree/bindings/sound/sun4i-codec.txt
+++ b/Documentation/devicetree/bindings/sound/sun4i-codec.txt
@@ -13,10 +13,6 @@ Required properties:
 - clock-names: should contain followings:
    - "apb": the parent APB clock for this controller
    - "codec": the parent module clock
-- routing : A list of the connections between audio components.  Each
-  entry is a pair of strings, the first being the connection's sink,
-  the second being the connection's source.
-
 
 Example:
 codec: codec@01c22c00 {
@@ -28,6 +24,4 @@ codec: codec@01c22c00 {
         clock-names = "apb", "codec";
         dmas = <&dma 0 19>, <&dma 0 19>;
         dma-names = "rx", "tx";
-        routing = "Headphone Jack", "HP Right",
-                  "Headphone Jack", "HP Left";
 };
diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c
index ddb0203fc649..86b81a60ac52 100644
--- a/sound/soc/codecs/ssm2518.c
+++ b/sound/soc/codecs/ssm2518.c
@@ -723,17 +723,11 @@ static struct snd_soc_codec_driver ssm2518_codec_driver = {
         .num_dapm_routes = ARRAY_SIZE(ssm2518_routes),
 };
 
-static bool ssm2518_register_volatile(struct device *dev, unsigned int reg)
-{
-        return false;
-}
-
 static const struct regmap_config ssm2518_regmap_config = {
         .val_bits = 8,
         .reg_bits = 8,
 
         .max_register = SSM2518_REG_DRC_9,
-        .volatile_reg = ssm2518_register_volatile,
 
         .cache_type = REGCACHE_RBTREE,
         .reg_defaults = ssm2518_reg_defaults,
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 8d59d83b5aa4..bcbf4da168b6 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -283,7 +283,7 @@ static int sun4i_codec_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card);
         unsigned long clk_freq;
-        int hwrate;
+        int ret, hwrate;
         u32 val;
 
         if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
@@ -293,8 +293,9 @@ static int sun4i_codec_hw_params(struct snd_pcm_substream *substream,
         if (!clk_freq)
                 return -EINVAL;
 
-        if (clk_set_rate(scodec->clk_module, clk_freq))
-                return -EINVAL;
+        ret = clk_set_rate(scodec->clk_module, clk_freq);
+        if (ret)
+                return ret;
 
         hwrate = sun4i_codec_get_hw_rate(params);
         if (hwrate < 0)
@@ -388,8 +389,7 @@ static struct snd_soc_dai_driver sun4i_codec_dai = {
                 .rate_max       = 192000,
                 .rates          = SNDRV_PCM_RATE_8000_48000 |
                                   SNDRV_PCM_RATE_96000 |
-                                  SNDRV_PCM_RATE_192000 |
-                                  SNDRV_PCM_RATE_KNOT,
+                                  SNDRV_PCM_RATE_192000,
                 .formats        = SNDRV_PCM_FMTBIT_S16_LE |
                                   SNDRV_PCM_FMTBIT_S32_LE,
                 .sig_bits       = 24,
@@ -571,7 +571,6 @@ static struct snd_soc_dai_link *sun4i_codec_create_link(struct device *dev,
 static struct snd_soc_card *sun4i_codec_create_card(struct device *dev)
 {
         struct snd_soc_card *card;
-        int ret;
 
         card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
         if (!card)
@@ -584,12 +583,6 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev)
         card->dev               = dev;
         card->name              = "sun4i-codec";
 
-        ret = snd_soc_of_parse_audio_routing(card, "routing");
-        if (ret) {
-                dev_err(dev, "Failed to create our audio routing\n");
-                return NULL;
-        }
-
         return card;
 };