projects
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/ad1836', 'asoc/topic/ad193x', 'asoc/topic...
[linux.git]
/
sound
/
soc
/
codecs
/
wm8731.c
diff --git
a/sound/soc/codecs/wm8731.c
b/sound/soc/codecs/wm8731.c
index 456bb8c6d759176a3bf31c5f7003a6e8cfc2d799..029720366ff8f65f7d6b208216f7cba64b6523af 100644
(file)
--- a/
sound/soc/codecs/wm8731.c
+++ b/
sound/soc/codecs/wm8731.c
@@
-447,10
+447,10
@@
static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai,
iface |= 0x0001;
break;
case SND_SOC_DAIFMT_DSP_A:
iface |= 0x0001;
break;
case SND_SOC_DAIFMT_DSP_A:
- iface |= 0x00
0
3;
+ iface |= 0x00
1
3;
break;
case SND_SOC_DAIFMT_DSP_B:
break;
case SND_SOC_DAIFMT_DSP_B:
- iface |= 0x00
1
3;
+ iface |= 0x00
0
3;
break;
default:
return -EINVAL;
break;
default:
return -EINVAL;
@@
-732,7
+732,7
@@
static struct spi_driver wm8731_spi_driver = {
};
#endif /* CONFIG_SPI_MASTER */
};
#endif /* CONFIG_SPI_MASTER */
-#if
defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE
)
+#if
IS_ENABLED(CONFIG_I2C
)
static int wm8731_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
static int wm8731_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
@@
-791,7
+791,7
@@
static struct i2c_driver wm8731_i2c_driver = {
static int __init wm8731_modinit(void)
{
int ret = 0;
static int __init wm8731_modinit(void)
{
int ret = 0;
-#if
defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE
)
+#if
IS_ENABLED(CONFIG_I2C
)
ret = i2c_add_driver(&wm8731_i2c_driver);
if (ret != 0) {
printk(KERN_ERR "Failed to register WM8731 I2C driver: %d\n",
ret = i2c_add_driver(&wm8731_i2c_driver);
if (ret != 0) {
printk(KERN_ERR "Failed to register WM8731 I2C driver: %d\n",
@@
-811,7
+811,7
@@
module_init(wm8731_modinit);
static void __exit wm8731_exit(void)
{
static void __exit wm8731_exit(void)
{
-#if
defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE
)
+#if
IS_ENABLED(CONFIG_I2C
)
i2c_del_driver(&wm8731_i2c_driver);
#endif
#if defined(CONFIG_SPI_MASTER)
i2c_del_driver(&wm8731_i2c_driver);
#endif
#if defined(CONFIG_SPI_MASTER)