projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'sound-asoc/for-next'
[deliverable/linux.git]
/
sound
/
soc
/
codecs
/
sta529.c
diff --git
a/sound/soc/codecs/sta529.c
b/sound/soc/codecs/sta529.c
index 4f70378b2cfb4095321f6793dd7d0277851c2ef0..d4b384e4b2664cf8b080ba5271fef8bcce0df5e3 100644
(file)
--- a/
sound/soc/codecs/sta529.c
+++ b/
sound/soc/codecs/sta529.c
@@
-317,8
+317,10
@@
static const struct snd_soc_codec_driver sta529_codec_driver = {
.set_bias_level = sta529_set_bias_level,
.suspend_bias_off = true,
.set_bias_level = sta529_set_bias_level,
.suspend_bias_off = true,
- .controls = sta529_snd_controls,
- .num_controls = ARRAY_SIZE(sta529_snd_controls),
+ .component_driver = {
+ .controls = sta529_snd_controls,
+ .num_controls = ARRAY_SIZE(sta529_snd_controls),
+ },
};
static const struct regmap_config sta529_regmap = {
};
static const struct regmap_config sta529_regmap = {
@@
-339,9
+341,6
@@
static int sta529_i2c_probe(struct i2c_client *i2c,
struct sta529 *sta529;
int ret;
struct sta529 *sta529;
int ret;
- if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
- return -EINVAL;
-
sta529 = devm_kzalloc(&i2c->dev, sizeof(struct sta529), GFP_KERNEL);
if (!sta529)
return -ENOMEM;
sta529 = devm_kzalloc(&i2c->dev, sizeof(struct sta529), GFP_KERNEL);
if (!sta529)
return -ENOMEM;
@@
-379,7
+378,6
@@
MODULE_DEVICE_TABLE(i2c, sta529_i2c_id);
static struct i2c_driver sta529_i2c_driver = {
.driver = {
.name = "sta529",
static struct i2c_driver sta529_i2c_driver = {
.driver = {
.name = "sta529",
- .owner = THIS_MODULE,
},
.probe = sta529_i2c_probe,
.remove = sta529_i2c_remove,
},
.probe = sta529_i2c_probe,
.remove = sta529_i2c_remove,
This page took
0.024797 seconds
and
5
git commands to generate.