projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[linux-2.6-microblaze.git]
/
sound
/
soc
/
codecs
/
rt286.c
diff --git
a/sound/soc/codecs/rt286.c
b/sound/soc/codecs/rt286.c
index
5c43e26
..
bd93658
100644
(file)
--- a/
sound/soc/codecs/rt286.c
+++ b/
sound/soc/codecs/rt286.c
@@
-38,7
+38,7
@@
#define RT288_VENDOR_ID 0x10ec0288
struct rt286_priv {
#define RT288_VENDOR_ID 0x10ec0288
struct rt286_priv {
- struct reg_default *index_cache;
+
const
struct reg_default *index_cache;
int index_cache_size;
struct regmap *regmap;
struct snd_soc_codec *codec;
int index_cache_size;
struct regmap *regmap;
struct snd_soc_codec *codec;
@@
-50,7
+50,7
@@
struct rt286_priv {
int clk_id;
};
int clk_id;
};
-static struct reg_default rt286_index_def[] = {
+static
const
struct reg_default rt286_index_def[] = {
{ 0x01, 0xaaaa },
{ 0x02, 0x8aaa },
{ 0x03, 0x0002 },
{ 0x01, 0xaaaa },
{ 0x02, 0x8aaa },
{ 0x03, 0x0002 },
@@
-1108,7
+1108,7
@@
static const struct acpi_device_id rt286_acpi_match[] = {
};
MODULE_DEVICE_TABLE(acpi, rt286_acpi_match);
};
MODULE_DEVICE_TABLE(acpi, rt286_acpi_match);
-static struct dmi_system_id force_combo_jack_table[] = {
+static
const
struct dmi_system_id force_combo_jack_table[] = {
{
.ident = "Intel Wilson Beach",
.matches = {
{
.ident = "Intel Wilson Beach",
.matches = {
@@
-1118,7
+1118,7
@@
static struct dmi_system_id force_combo_jack_table[] = {
{ }
};
{ }
};
-static struct dmi_system_id dmi_dell_dino[] = {
+static
const
struct dmi_system_id dmi_dell_dino[] = {
{
.ident = "Dell Dino",
.matches = {
{
.ident = "Dell Dino",
.matches = {
@@
-1157,7
+1157,7
@@
static int rt286_i2c_probe(struct i2c_client *i2c,
}
if (val != RT286_VENDOR_ID && val != RT288_VENDOR_ID) {
dev_err(&i2c->dev,
}
if (val != RT286_VENDOR_ID && val != RT288_VENDOR_ID) {
dev_err(&i2c->dev,
- "Device with ID register %x is not rt286\n", val);
+ "Device with ID register %
#
x is not rt286\n", val);
return -ENODEV;
}
return -ENODEV;
}
@@
-1259,7
+1259,6
@@
static int rt286_i2c_remove(struct i2c_client *i2c)
static struct i2c_driver rt286_i2c_driver = {
.driver = {
.name = "rt286",
static struct i2c_driver rt286_i2c_driver = {
.driver = {
.name = "rt286",
- .owner = THIS_MODULE,
.acpi_match_table = ACPI_PTR(rt286_acpi_match),
},
.probe = rt286_i2c_probe,
.acpi_match_table = ACPI_PTR(rt286_acpi_match),
},
.probe = rt286_i2c_probe,