Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[linux-2.6-block.git] / sound / soc / sh / fsi.c

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index bb20550b007cba3d419f99c773cf91cb4a21fd08..142c066eaee2ecb13dcfbee6ac01b076ce52894c 100644 (file)
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1882,7 +1882,40 @@ static void fsi_handler_init(struct fsi_priv *fsi,
        }
 }
 
-static struct of_device_id fsi_of_match[];
+static const struct fsi_core fsi1_core = {
+       .ver    = 1,
+
+       /* Interrupt */
+       .int_st = INT_ST,
+       .iemsk  = IEMSK,
+       .imsk   = IMSK,
+};
+
+static const struct fsi_core fsi2_core = {
+       .ver    = 2,
+
+       /* Interrupt */
+       .int_st = CPU_INT_ST,
+       .iemsk  = CPU_IEMSK,
+       .imsk   = CPU_IMSK,
+       .a_mclk = A_MST_CTLR,
+       .b_mclk = B_MST_CTLR,
+};
+
+static const struct of_device_id fsi_of_match[] = {
+       { .compatible = "renesas,sh_fsi",       .data = &fsi1_core},
+       { .compatible = "renesas,sh_fsi2",      .data = &fsi2_core},
+       {},
+};
+MODULE_DEVICE_TABLE(of, fsi_of_match);
+
+static const struct platform_device_id fsi_id_table[] = {
+       { "sh_fsi",     (kernel_ulong_t)&fsi1_core },
+       { "sh_fsi2",    (kernel_ulong_t)&fsi2_core },
+       {},
+};
+MODULE_DEVICE_TABLE(platform, fsi_id_table);
+
 static int fsi_probe(struct platform_device *pdev)
 {
        struct fsi_master *master;
@@ -2080,40 +2113,6 @@ static struct dev_pm_ops fsi_pm_ops = {
        .resume                 = fsi_resume,
 };
 
-static struct fsi_core fsi1_core = {
-       .ver    = 1,
-
-       /* Interrupt */
-       .int_st = INT_ST,
-       .iemsk  = IEMSK,
-       .imsk   = IMSK,
-};
-
-static struct fsi_core fsi2_core = {
-       .ver    = 2,
-
-       /* Interrupt */
-       .int_st = CPU_INT_ST,
-       .iemsk  = CPU_IEMSK,
-       .imsk   = CPU_IMSK,
-       .a_mclk = A_MST_CTLR,
-       .b_mclk = B_MST_CTLR,
-};
-
-static struct of_device_id fsi_of_match[] = {
-       { .compatible = "renesas,sh_fsi",       .data = &fsi1_core},
-       { .compatible = "renesas,sh_fsi2",      .data = &fsi2_core},
-       {},
-};
-MODULE_DEVICE_TABLE(of, fsi_of_match);
-
-static struct platform_device_id fsi_id_table[] = {
-       { "sh_fsi",     (kernel_ulong_t)&fsi1_core },
-       { "sh_fsi2",    (kernel_ulong_t)&fsi2_core },
-       {},
-};
-MODULE_DEVICE_TABLE(platform, fsi_id_table);
-
 static struct platform_driver fsi_driver = {
        .driver         = {
                .name   = "fsi-pcm-audio",
@@ -2127,7 +2126,7 @@ static struct platform_driver fsi_driver = {
 
 module_platform_driver(fsi_driver);
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("SuperH onchip FSI audio driver");
 MODULE_AUTHOR("Kuninori Morimoto <morimoto.kuninori@renesas.com>");
 MODULE_ALIAS("platform:fsi-pcm-audio");