dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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

This commit is contained in:
Mark Brown 2012-12-10 00:22:10 +09:00
parent aaa3bb267c 6939565fa5
commit 8df6bf1c58
12 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/codecs/max98088.c
View File

@ -2098,13 +2098,13 @@ static const struct i2c_device_id max98088_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, max98088_i2c_id);
static struct i2c_driver max98088_i2c_driver = {
.driver = {
.name = "max98088",
.owner = THIS_MODULE,
},
.probe = max98088_i2c_probe,
.remove = __devexit_p(max98088_i2c_remove),
.id_table = max98088_i2c_id,
.driver = {
.name = "max98088",
.owner = THIS_MODULE,
},
.probe = max98088_i2c_probe,
.remove = max98088_i2c_remove,
.id_table = max98088_i2c_id,
};
module_i2c_driver(max98088_i2c_driver);

2
sound/soc/codecs/wm5100.c
View File

@ -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 },

2
sound/soc/soc-core.c
View File

@ -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.
*/

2
sound/soc/tegra/tegra20_das.c
View File

@ -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", },
{},
};

4
sound/soc/tegra/tegra20_i2s.c
View File

@ -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)
};

2
sound/soc/tegra/tegra20_spdif.c
View File

@ -373,7 +373,7 @@ static int __devexit tegra20_spdif_platform_remove(struct platform_device *pdev)
return 0;
}
static const struct dev_pm_ops tegra20_spdif_pm_ops __devinitconst = {
static const struct dev_pm_ops tegra20_spdif_pm_ops = {
SET_RUNTIME_PM_OPS(tegra20_spdif_runtime_suspend,
tegra20_spdif_runtime_resume, NULL)
};

6
sound/soc/tegra/tegra30_ahub.c
View File

@ -288,7 +288,7 @@ int tegra30_ahub_unset_rx_cif_source(enum tegra30_ahub_rxcif rxcif)
}
EXPORT_SYMBOL_GPL(tegra30_ahub_unset_rx_cif_source);
static const char * const configlink_clocks[] __devinitconst = {
static const char * const configlink_clocks[] = {
"i2s0",
"i2s1",
"i2s2",
@ -603,12 +603,12 @@ static int __devexit tegra30_ahub_remove(struct platform_device *pdev)
return 0;
}
static const struct of_device_id tegra30_ahub_of_match[] __devinitconst = {
static const struct of_device_id tegra30_ahub_of_match[] = {
{ .compatible = "nvidia,tegra30-ahub", },
{},
};
static const struct dev_pm_ops tegra30_ahub_pm_ops __devinitconst = {
static const struct dev_pm_ops tegra30_ahub_pm_ops = {
SET_RUNTIME_PM_OPS(tegra30_ahub_runtime_suspend,
tegra30_ahub_runtime_resume, NULL)
};

4
sound/soc/tegra/tegra30_i2s.c
View File

@ -508,12 +508,12 @@ static int __devexit tegra30_i2s_platform_remove(struct platform_device *pdev)
return 0;
}
static const struct of_device_id tegra30_i2s_of_match[] __devinitconst = {
static const struct of_device_id tegra30_i2s_of_match[] = {
{ .compatible = "nvidia,tegra30-i2s", },
{},
};
static const struct dev_pm_ops tegra30_i2s_pm_ops __devinitconst = {
static const struct dev_pm_ops tegra30_i2s_pm_ops = {
SET_RUNTIME_PM_OPS(tegra30_i2s_runtime_suspend,
tegra30_i2s_runtime_resume, NULL)
};

2
sound/soc/tegra/tegra_alc5632.c
View File

@ -242,7 +242,7 @@ static int __devexit tegra_alc5632_remove(struct platform_device *pdev)
return 0;
}
static const struct of_device_id tegra_alc5632_of_match[] __devinitconst = {
static const struct of_device_id tegra_alc5632_of_match[] = {
{ .compatible = "nvidia,tegra-audio-alc5632", },
{},
};

2
sound/soc/tegra/tegra_wm8753.c
View File

@ -200,7 +200,7 @@ static int __devexit tegra_wm8753_driver_remove(struct platform_device *pdev)
return 0;
}
static const struct of_device_id tegra_wm8753_of_match[] __devinitconst = {
static const struct of_device_id tegra_wm8753_of_match[] = {
{ .compatible = "nvidia,tegra-audio-wm8753", },
{},
};

2
sound/soc/tegra/tegra_wm8903.c
View File

@ -417,7 +417,7 @@ static int __devexit tegra_wm8903_driver_remove(struct platform_device *pdev)
return 0;
}
static const struct of_device_id tegra_wm8903_of_match[] __devinitconst = {
static const struct of_device_id tegra_wm8903_of_match[] = {
{ .compatible = "nvidia,tegra-audio-wm8903", },
{},
};

2
sound/soc/tegra/trimslice.c
View File

@ -195,7 +195,7 @@ static int __devexit tegra_snd_trimslice_remove(struct platform_device *pdev)
return 0;
}
static const struct of_device_id trimslice_of_match[] __devinitconst = {
static const struct of_device_id trimslice_of_match[] = {
{ .compatible = "nvidia,tegra-audio-trimslice", },
{},
};