CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/tegra/tegra_i2s.c

 /*
  * tegra_i2s.c - Tegra I2S driver
  *
  * Author: Stephen Warren <swarren@nvidia.com>
  * Copyright (C) 2010 - NVIDIA, Inc.
  *
  * Based on code copyright/by:
  *
  * Copyright (c) 2009-2010, NVIDIA Corporation.
  * Scott Peterson <speterson@nvidia.com>
@@ skipping 86 matching lines @@
         .read    = seq_read,
         .llseek  = seq_lseek,
         .release = single_release,
 };
 
 static void tegra_i2s_debug_add(struct tegra_i2s *i2s, int id)
 {
         char name[] = DRV_NAME ".0";
 
         snprintf(name, sizeof(name), DRV_NAME".%1d", id);
-        i2s->debug = debugfs_create_file(name, S_IRUGO, asoc_debugfs_root,
+        i2s->debug = debugfs_create_file(name, S_IRUGO, snd_soc_debugfs_root,
                                                 i2s, &tegra_i2s_debug_fops);
 }
 
 static void tegra_i2s_debug_remove(struct tegra_i2s *i2s)
 {
         if (i2s->debug)
                 debugfs_remove(i2s->debug);
 }
 #else
 static inline void tegra_i2s_debug_add(struct tegra_i2s *i2s)
@@ skipping 261 matching lines @@
         if (!i2s) {
                 dev_err(&pdev->dev, "Can't allocate tegra_i2s\n");
                 ret = -ENOMEM;
                 goto exit;
         }
         dev_set_drvdata(&pdev->dev, i2s);
 
         snprintf(clk_name, sizeof(clk_name), DRV_NAME ".%d", pdev->id);
         i2s->clk_i2s = clk_get_sys(clk_name, NULL);
         if (IS_ERR(i2s->clk_i2s)) {
-                pr_err("Can't retrieve i2s clock\n");
+                dev_err(&pdev->dev, "Can't retrieve i2s clock\n");
                 ret = PTR_ERR(i2s->clk_i2s);
                 goto err_free;
         }
 
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!mem) {
                 dev_err(&pdev->dev, "No memory resource\n");
                 ret = -ENODEV;
                 goto err_clk_put;
         }
@@ skipping 93 matching lines @@
 
 static void __exit snd_tegra_i2s_exit(void)
 {
         platform_driver_unregister(&tegra_i2s_driver);
 }
 module_exit(snd_tegra_i2s_exit);
 
 MODULE_AUTHOR("Stephen Warren <swarren@nvidia.com>");
 MODULE_DESCRIPTION("Tegra I2S ASoC driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);