ASoC: remove use of __devinitconst

CONFIG_HOTPLUG is going away as an option so __devinitconst is no
longer needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Bill Pemberton 2012-11-19 13:25:33 -05:00 committed by Mark Brown
parent f4a75d2eb7
commit f6e6574499
11 changed files with 15 additions and 15 deletions

View File

@ -1233,7 +1233,7 @@ static const struct snd_soc_dapm_route wm5100_dapm_routes[] = {
{ "PWM2", NULL, "PWM2 Driver" }, { "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_10, 0 },
{ WM5100_AUDIO_IF_1_11, 1 }, { WM5100_AUDIO_IF_1_11, 1 },
{ WM5100_AUDIO_IF_1_12, 2 }, { WM5100_AUDIO_IF_1_12, 2 },

View File

@ -4007,7 +4007,7 @@ int snd_soc_register_codec(struct device *dev,
codec->reg_size = reg_size; codec->reg_size = reg_size;
/* it is necessary to make a copy of the default register cache /* it is necessary to make a copy of the default register cache
* because in the case of using a compression type that requires * 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 * kernel might have freed the array by the time we initialize
* the cache. * the cache.
*/ */

View File

@ -210,7 +210,7 @@ static int __devexit tegra20_das_remove(struct platform_device *pdev)
return 0; 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", }, { .compatible = "nvidia,tegra20-das", },
{}, {},
}; };

View File

@ -463,12 +463,12 @@ static int __devexit tegra20_i2s_platform_remove(struct platform_device *pdev)
return 0; 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", }, { .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, SET_RUNTIME_PM_OPS(tegra20_i2s_runtime_suspend,
tegra20_i2s_runtime_resume, NULL) tegra20_i2s_runtime_resume, NULL)
}; };

View File

@ -373,7 +373,7 @@ static int __devexit tegra20_spdif_platform_remove(struct platform_device *pdev)
return 0; 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, SET_RUNTIME_PM_OPS(tegra20_spdif_runtime_suspend,
tegra20_spdif_runtime_resume, NULL) tegra20_spdif_runtime_resume, NULL)
}; };

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); EXPORT_SYMBOL_GPL(tegra30_ahub_unset_rx_cif_source);
static const char * const configlink_clocks[] __devinitconst = { static const char * const configlink_clocks[] = {
"i2s0", "i2s0",
"i2s1", "i2s1",
"i2s2", "i2s2",
@ -603,12 +603,12 @@ static int __devexit tegra30_ahub_remove(struct platform_device *pdev)
return 0; 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", }, { .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, SET_RUNTIME_PM_OPS(tegra30_ahub_runtime_suspend,
tegra30_ahub_runtime_resume, NULL) tegra30_ahub_runtime_resume, NULL)
}; };

View File

@ -508,12 +508,12 @@ static int __devexit tegra30_i2s_platform_remove(struct platform_device *pdev)
return 0; 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", }, { .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, SET_RUNTIME_PM_OPS(tegra30_i2s_runtime_suspend,
tegra30_i2s_runtime_resume, NULL) tegra30_i2s_runtime_resume, NULL)
}; };

View File

@ -242,7 +242,7 @@ static int __devexit tegra_alc5632_remove(struct platform_device *pdev)
return 0; 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", }, { .compatible = "nvidia,tegra-audio-alc5632", },
{}, {},
}; };

View File

@ -200,7 +200,7 @@ static int __devexit tegra_wm8753_driver_remove(struct platform_device *pdev)
return 0; 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", }, { .compatible = "nvidia,tegra-audio-wm8753", },
{}, {},
}; };

View File

@ -417,7 +417,7 @@ static int __devexit tegra_wm8903_driver_remove(struct platform_device *pdev)
return 0; 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", }, { .compatible = "nvidia,tegra-audio-wm8903", },
{}, {},
}; };

View File

@ -195,7 +195,7 @@ static int __devexit tegra_snd_trimslice_remove(struct platform_device *pdev)
return 0; 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", }, { .compatible = "nvidia,tegra-audio-trimslice", },
{}, {},
}; };