ASoC: fsi: reorder code to make a forward declaration superfluous

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

1 files changed, 34 insertions, 35 deletions

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 936c02d4e385..5d26f8c98650 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1876,7 +1876,40 @@ static void fsi_handler_init(struct fsi_priv *fsi,
         }
 }
 
-static const struct of_device_id fsi_of_match[];
+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 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 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;
@@ -2072,40 +2105,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 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 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",