ASoC: fsi: reorder code to make a forward declaration superfluous (3b6281cf) · Commits · e / devices / android_kernel_teracube_2e

sound/soc/sh/fsi.c

+34 −35

Original line number	Original line	Diff line number	Diff line
	@@ -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)		static int fsi_probe(struct platform_device *pdev)
	{		{
	struct fsi_master *master;		struct fsi_master *master;
	@@ -2072,40 +2105,6 @@ static struct dev_pm_ops fsi_pm_ops = {
	.resume = fsi_resume,		.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 = {		static struct platform_driver fsi_driver = {
	.driver = {		.driver = {
	.name = "fsi-pcm-audio",		.name = "fsi-pcm-audio",