Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8df6bf1c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/hotplug' into asoc-next

parents aaa3bb26 6939565f

sound/soc/codecs/max98088.c

+7 −7
Original line number Diff line number Diff line
@@ -2103,7 +2103,7 @@ static struct i2c_driver max98088_i2c_driver = { 
		.owner = THIS_MODULE,

	},

	.probe  = max98088_i2c_probe,

       .remove = __devexit_p(max98088_i2c_remove),

	.remove = max98088_i2c_remove,

	.id_table = max98088_i2c_id,

};

sound/soc/codecs/wm5100.c

+1 −1
Original line number Diff line number Diff line
@@ -1233,7 +1233,7 @@ static const struct snd_soc_dapm_route wm5100_dapm_routes[] = { 
	{ "PWM2", NULL, "PWM2 Driver" },

};



static const __devinitconst struct reg_default wm5100_reva_patches[] = {

static const struct reg_default wm5100_reva_patches[] = {

	{ WM5100_AUDIO_IF_1_10, 0 },

	{ WM5100_AUDIO_IF_1_11, 1 },

	{ WM5100_AUDIO_IF_1_12, 2 },

sound/soc/soc-core.c

+1 −1
Original line number Diff line number Diff line
@@ -4007,7 +4007,7 @@ int snd_soc_register_codec(struct device *dev, 
		codec->reg_size = reg_size;

		/* it is necessary to make a copy of the default register cache

		 * because in the case of using a compression type that requires

		 * the default register cache to be marked as __devinitconst the

		 * the default register cache to be marked as the

		 * kernel might have freed the array by the time we initialize

		 * the cache.

		 */

sound/soc/tegra/tegra20_das.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int __devexit tegra20_das_remove(struct platform_device *pdev) 
	return 0;

}



static const struct of_device_id tegra20_das_of_match[] __devinitconst = {

static const struct of_device_id tegra20_das_of_match[] = {

	{ .compatible = "nvidia,tegra20-das", },

	{},

};

sound/soc/tegra/tegra20_i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -463,12 +463,12 @@ static int __devexit tegra20_i2s_platform_remove(struct platform_device *pdev) 
	return 0;

}



static const struct of_device_id tegra20_i2s_of_match[] __devinitconst = {

static const struct of_device_id tegra20_i2s_of_match[] = {

	{ .compatible = "nvidia,tegra20-i2s", },

	{},

};



static const struct dev_pm_ops tegra20_i2s_pm_ops __devinitconst = {

static const struct dev_pm_ops tegra20_i2s_pm_ops = {

	SET_RUNTIME_PM_OPS(tegra20_i2s_runtime_suspend,

			   tegra20_i2s_runtime_resume, NULL)

};