ASoC: rockchip: coding style.

[firefly-linux-kernel-4.4.55.git] / sound / soc / codecs / hdmi_i2s.c

diff --git a/sound/soc/codecs/hdmi_i2s.c b/sound/soc/codecs/hdmi_i2s.c
index 2d790eeb7d484a2af5d3d9175a4b952079f36ed2..c9ff99c07951bac01ff3db483069ec4e64f97543 100755 (executable)
--- a/sound/soc/codecs/hdmi_i2s.c
+++ b/sound/soc/codecs/hdmi_i2s.c
@@ -1,8 +1,17 @@
 /*
  * hdmi_i2s.c  --  HDMI i2s audio for rockchip
  *
- * Copyright 2013 Rockship
- * Author: chenjq <chenjq@rock-chips.com>
+ * Copyright (C) 2015 Fuzhou Rockchip Electronics Co., Ltd
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
  */
 
 #include <linux/module.h>
@@ -14,26 +23,20 @@
 #include <sound/pcm.h>
 #include <sound/initval.h>
 
-#if 0
-#define DBG(x...) printk(KERN_INFO "hdmi i2s:"x)
-#else
-#define DBG(x...) do { } while (0)
-#endif
-
 struct snd_soc_dai_driver hdmi_i2s_dai = {
        .name = "rk-hdmi-i2s-hifi",
        .playback = {
                .stream_name = "HiFi Playback",
                .channels_min = 2,
-               .channels_max = 2,
+               .channels_max = 8,
                .rates = (SNDRV_PCM_RATE_32000 |
-                       SNDRV_PCM_RATE_44100 |
-                       SNDRV_PCM_RATE_48000 |
-                       SNDRV_PCM_RATE_96000 |
-                       SNDRV_PCM_RATE_192000),
+                         SNDRV_PCM_RATE_44100 |
+                         SNDRV_PCM_RATE_48000 |
+                         SNDRV_PCM_RATE_96000 |
+                         SNDRV_PCM_RATE_192000),
                .formats = (SNDRV_PCM_FMTBIT_S16_LE |
-                       SNDRV_PCM_FMTBIT_S20_3LE |
-                       SNDRV_PCM_FMTBIT_S24_LE),
+                           SNDRV_PCM_FMTBIT_S20_3LE |
+                           SNDRV_PCM_FMTBIT_S24_LE),
        },
 };
 
@@ -43,15 +46,12 @@ static int rockchip_hdmi_i2s_audio_probe(struct platform_device *pdev)
 {
        int ret;
 
-       //set dev name to driver->name for sound card register
-       dev_set_name(&pdev->dev, "%s", pdev->dev.driver->name);
-
        ret = snd_soc_register_codec(&pdev->dev,
-               &soc_codec_dev_hdmi_i2s,
-               &hdmi_i2s_dai, 1);
+                                    &soc_codec_dev_hdmi_i2s,
+                                    &hdmi_i2s_dai, 1);
 
        if (ret)
-               printk("%s() register card failed:%d\n", __FUNCTION__, ret);
+               dev_err(&pdev->dev, "register card failed: %d\n", ret);
 
        return ret;
 }
@@ -65,24 +65,23 @@ static int rockchip_hdmi_i2s_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_hdmi_i2s_of_match[] = {
-        { .compatible = "hdmi-i2s", },
-        {},
+       { .compatible = "hdmi-i2s", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_hdmi_i2s_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_hdmi_i2s_audio_driver = {
-        .driver         = {
-                .name   = "hdmi-i2s",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_hdmi_i2s_of_match),
-        },
-        .probe          = rockchip_hdmi_i2s_audio_probe,
-        .remove         = rockchip_hdmi_i2s_audio_remove,
+       .driver = {
+               .name = "hdmi-i2s",
+               .of_match_table = of_match_ptr(rockchip_hdmi_i2s_of_match),
+       },
+       .probe = rockchip_hdmi_i2s_audio_probe,
+       .remove = rockchip_hdmi_i2s_audio_remove,
 };
 
 module_platform_driver(rockchip_hdmi_i2s_audio_driver);
 
-MODULE_DESCRIPTION("HDMI I2S Controller Driver");
+MODULE_DESCRIPTION("Rockchip HDMI I2S Dummy Driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:hdmi-i2s");