* [PATCH v2 16/18] ASoC: wm8990: Use IS_ENABLED() macro
@ 2013-11-21 14:48 Fabio Estevam
2013-11-21 14:48 ` [PATCH v2 17/18] ASoC: wm8995: " Fabio Estevam
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Fabio Estevam @ 2013-11-21 14:48 UTC (permalink / raw)
To: broonie; +Cc: Fabio Estevam, alsa-devel
Using the IS_ENABLED() macro can make the code shorter and simpler.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Fix Subject and commit log
sound/soc/codecs/wm8990.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 253c88b..34f0020 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1376,7 +1376,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8990 = {
.volatile_register = wm8990_volatile_register,
};
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
static int wm8990_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
@@ -1423,7 +1423,7 @@ static struct i2c_driver wm8990_i2c_driver = {
static int __init wm8990_modinit(void)
{
int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
ret = i2c_add_driver(&wm8990_i2c_driver);
if (ret != 0) {
printk(KERN_ERR "Failed to register wm8990 I2C driver: %d\n",
@@ -1436,7 +1436,7 @@ module_init(wm8990_modinit);
static void __exit wm8990_exit(void)
{
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
i2c_del_driver(&wm8990_i2c_driver);
#endif
}
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 17/18] ASoC: wm8995: Use IS_ENABLED() macro
2013-11-21 14:48 [PATCH v2 16/18] ASoC: wm8990: Use IS_ENABLED() macro Fabio Estevam
@ 2013-11-21 14:48 ` Fabio Estevam
2013-11-25 17:14 ` Mark Brown
2013-11-21 14:48 ` [PATCH v2 18/18] AsoC: wm9081: " Fabio Estevam
2013-11-25 17:14 ` [PATCH v2 16/18] ASoC: wm8990: " Mark Brown
2 siblings, 1 reply; 6+ messages in thread
From: Fabio Estevam @ 2013-11-21 14:48 UTC (permalink / raw)
To: broonie; +Cc: Fabio Estevam, alsa-devel
Using the IS_ENABLED() macro can make the code shorter and simpler.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Fix Subject and commit log
sound/soc/codecs/wm8995.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index da2899e6..4300caf 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -2293,7 +2293,7 @@ static struct spi_driver wm8995_spi_driver = {
};
#endif
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
static int wm8995_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
@@ -2350,7 +2350,7 @@ static int __init wm8995_modinit(void)
{
int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
ret = i2c_add_driver(&wm8995_i2c_driver);
if (ret) {
printk(KERN_ERR "Failed to register wm8995 I2C driver: %d\n",
@@ -2371,7 +2371,7 @@ module_init(wm8995_modinit);
static void __exit wm8995_exit(void)
{
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
i2c_del_driver(&wm8995_i2c_driver);
#endif
#if defined(CONFIG_SPI_MASTER)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 18/18] AsoC: wm9081: Use IS_ENABLED() macro
2013-11-21 14:48 [PATCH v2 16/18] ASoC: wm8990: Use IS_ENABLED() macro Fabio Estevam
2013-11-21 14:48 ` [PATCH v2 17/18] ASoC: wm8995: " Fabio Estevam
@ 2013-11-21 14:48 ` Fabio Estevam
2013-11-27 18:22 ` Mark Brown
2013-11-25 17:14 ` [PATCH v2 16/18] ASoC: wm8990: " Mark Brown
2 siblings, 1 reply; 6+ messages in thread
From: Fabio Estevam @ 2013-11-21 14:48 UTC (permalink / raw)
To: broonie; +Cc: Fabio Estevam, alsa-devel
Using the IS_ENABLED() macro can make the code shorter and simpler.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Fix Subject and commit log
sound/soc/codecs/wm9081.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 630b3d7..0982c1d 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -1326,7 +1326,7 @@ static const struct regmap_config wm9081_regmap = {
.cache_type = REGCACHE_RBTREE,
};
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
static int wm9081_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 16/18] ASoC: wm8990: Use IS_ENABLED() macro
2013-11-21 14:48 [PATCH v2 16/18] ASoC: wm8990: Use IS_ENABLED() macro Fabio Estevam
2013-11-21 14:48 ` [PATCH v2 17/18] ASoC: wm8995: " Fabio Estevam
2013-11-21 14:48 ` [PATCH v2 18/18] AsoC: wm9081: " Fabio Estevam
@ 2013-11-25 17:14 ` Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2013-11-25 17:14 UTC (permalink / raw)
To: Fabio Estevam; +Cc: alsa-devel
[-- Attachment #1.1: Type: text/plain, Size: 245 bytes --]
On Thu, Nov 21, 2013 at 12:48:30PM -0200, Fabio Estevam wrote:
> Using the IS_ENABLED() macro can make the code shorter and simpler.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
This doesn't apply against current code.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 17/18] ASoC: wm8995: Use IS_ENABLED() macro
2013-11-21 14:48 ` [PATCH v2 17/18] ASoC: wm8995: " Fabio Estevam
@ 2013-11-25 17:14 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2013-11-25 17:14 UTC (permalink / raw)
To: Fabio Estevam; +Cc: alsa-devel
[-- Attachment #1.1: Type: text/plain, Size: 151 bytes --]
On Thu, Nov 21, 2013 at 12:48:31PM -0200, Fabio Estevam wrote:
> Using the IS_ENABLED() macro can make the code shorter and simpler.
Applied, thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 18/18] AsoC: wm9081: Use IS_ENABLED() macro
2013-11-21 14:48 ` [PATCH v2 18/18] AsoC: wm9081: " Fabio Estevam
@ 2013-11-27 18:22 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2013-11-27 18:22 UTC (permalink / raw)
To: Fabio Estevam; +Cc: alsa-devel
[-- Attachment #1.1: Type: text/plain, Size: 151 bytes --]
On Thu, Nov 21, 2013 at 12:48:32PM -0200, Fabio Estevam wrote:
> Using the IS_ENABLED() macro can make the code shorter and simpler.
Applied, thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-11-27 18:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-21 14:48 [PATCH v2 16/18] ASoC: wm8990: Use IS_ENABLED() macro Fabio Estevam
2013-11-21 14:48 ` [PATCH v2 17/18] ASoC: wm8995: " Fabio Estevam
2013-11-25 17:14 ` Mark Brown
2013-11-21 14:48 ` [PATCH v2 18/18] AsoC: wm9081: " Fabio Estevam
2013-11-27 18:22 ` Mark Brown
2013-11-25 17:14 ` [PATCH v2 16/18] ASoC: wm8990: " Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).