mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ASoC: da7218: Use i2c_get_match_data() 

Use preferred i2c_get_match_data() instead of of_match_device() and
i2c_match_id() to get the driver match data. With this, adjust the
includes to explicitly include the correct headers.

Avoid using 0 for enum da7218_dev_id so that no match data can be
distinguished.

Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20231006-dt-asoc-header-cleanups-v3-3-13a4f0f7fee6@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Rob Herring 2023-10-06 15:09:12 -05:00 committed by Mark Brown
parent 56c075b2d3
commit fe26425518
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sound/soc/codecs/da7218.c
View File

@ -9,7 +9,7 @@
#include <linux/clk.h>
#include <linux/i2c.h>
#include <linux/of_device.h>
#include <linux/of.h>
#include <linux/regmap.h>
#include <linux/slab.h>
#include <linux/pm.h>
@ -2285,16 +2285,6 @@ static const struct of_device_id da7218_of_match[] = {
};
MODULE_DEVICE_TABLE(of, da7218_of_match);
static inline int da7218_of_get_id(struct device *dev)
{
const struct of_device_id *id = of_match_device(da7218_of_match, dev);
if (id)
return (uintptr_t)id->data;
else
return -EINVAL;
}
static enum da7218_micbias_voltage
da7218_of_micbias_lvl(struct snd_soc_component *component, u32 val)
{
@ -3253,18 +3243,6 @@ static const struct regmap_config da7218_regmap_config = {
* I2C layer
*/
static const struct i2c_device_id da7218_i2c_id[];
static inline int da7218_i2c_get_id(struct i2c_client *i2c)
{
const struct i2c_device_id *id = i2c_match_id(da7218_i2c_id, i2c);
if (id)
return (uintptr_t)id->driver_data;
else
return -EINVAL;
}
static int da7218_i2c_probe(struct i2c_client *i2c)
{
struct da7218_priv *da7218;
@ -3276,10 +3254,7 @@ static int da7218_i2c_probe(struct i2c_client *i2c)
i2c_set_clientdata(i2c, da7218);
if (i2c->dev.of_node)
da7218->dev_id = da7218_of_get_id(&i2c->dev);
else
da7218->dev_id = da7218_i2c_get_id(i2c);
da7218->dev_id = (uintptr_t)i2c_get_match_data(i2c);
if ((da7218->dev_id != DA7217_DEV_ID) &&
(da7218->dev_id != DA7218_DEV_ID)) {

2
sound/soc/codecs/da7218.h
View File

@ -1369,7 +1369,7 @@ enum da7218_sys_clk {
};
enum da7218_dev_id {
DA7217_DEV_ID = 0,
DA7217_DEV_ID = 1,
DA7218_DEV_ID,
};