diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-10-31 08:58:36 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-10-31 08:58:36 +0100 |
| commit | c468b5dd759ede754b23cbc9c50b048a781d4217 (patch) | |
| tree | 3ec5f17b34fbb4711253fc4698d9cacbf6b9e71b /sound/soc/codecs/rt715.c | |
| parent | 99248c8902f505ec064cf2b0f74629016f2f4c82 (diff) | |
| parent | f71e0be5d297b25453fdf4c1757b3e83e94b5f98 (diff) | |
| download | linux-c468b5dd759ede754b23cbc9c50b048a781d4217.tar.gz linux-c468b5dd759ede754b23cbc9c50b048a781d4217.tar.bz2 linux-c468b5dd759ede754b23cbc9c50b048a781d4217.zip | |
Merge branch 'for-next' into for-linus
Pull 6.7 materials
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/codecs/rt715.c')
| -rw-r--r-- | sound/soc/codecs/rt715.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c index b59230c8fd32..9f732a5abd53 100644 --- a/sound/soc/codecs/rt715.c +++ b/sound/soc/codecs/rt715.c @@ -20,8 +20,6 @@ #include <linux/slab.h> #include <linux/platform_device.h> #include <linux/regulator/consumer.h> -#include <linux/of.h> -#include <linux/of_device.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -42,8 +40,8 @@ static int rt715_index_write(struct regmap *regmap, unsigned int reg, ret = regmap_write(regmap, addr, value); if (ret < 0) { - pr_err("Failed to set private value: %08x <= %04x %d\n", ret, - addr, value); + pr_err("Failed to set private value: %08x <= %04x %d\n", + addr, value, ret); } return ret; |