Re: [PATCH 2/4] [media] tuners: use IS_ENABLED

2013-03-24 Thread Michael Krufky 
Reviewed-by: Michael Krufky 

On Thu, Mar 21, 2013 at 3:39 PM, Mauro Carvalho Chehab
 wrote:
> Instead of checking everywhere there for 3 symbols, use instead
> IS_ENABLED macro.
>
> This replacement was done using this small perl script:
>
> my $data;
> $data .= $_ while (<>);
> if ($data =~ m/CONFIG_([A-Z\_\d]*)_MODULE/) {
> $data =~ 
> s,defined\(CONFIG_($f)\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
> $data =~ 
> s,defined\(CONFIG_($f)\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
> $data =~ 
> s,defined\(CONFIG_($f)\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)_MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
> $data =~ 
> s,defined\(CONFIG_($f)\)[\s\|\&\\\(\)\!]+defined\(CONFIG_($f)_MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
>
> $data =~ 
> s,defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)\)\)*,IS_ENABLED(CONFIG_$f),g;
> $data =~ 
> s,defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)\)\)*,IS_ENABLED(CONFIG_$f),g;
> $data =~ 
> s,defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
> $data =~ 
> s,defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
> }
> print $data;
>
> Cc: Antti Palosaari 
> Cc: Michael Buesch 
> Cc: Hans-Frieder Vogt 
> Cc: Michael Krufky 
> Signed-off-by: Mauro Carvalho Chehab 
> ---
>  drivers/media/tuners/e4000.h| 3 +--
>  drivers/media/tuners/fc0011.h   | 3 +--
>  drivers/media/tuners/fc0012.h   | 3 +--
>  drivers/media/tuners/fc0013.h   | 3 +--
>  drivers/media/tuners/fc2580.h   | 3 +--
>  drivers/media/tuners/max2165.h  | 3 +--
>  drivers/media/tuners/mc44s803.h | 3 +--
>  drivers/media/tuners/mxl5005s.h | 3 +--
>  drivers/media/tuners/tda18212.h | 3 +--
>  drivers/media/tuners/tda18218.h | 3 +--
>  drivers/media/tuners/tua9001.h  | 3 +--
>  drivers/media/tuners/xc5000.h   | 3 +--
>  12 files changed, 12 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/media/tuners/e4000.h b/drivers/media/tuners/e4000.h
> index 71b1935..7801270 100644
> --- a/drivers/media/tuners/e4000.h
> +++ b/drivers/media/tuners/e4000.h
> @@ -36,8 +36,7 @@ struct e4000_config {
> u32 clock;
>  };
>
> -#if defined(CONFIG_MEDIA_TUNER_E4000) || \
> -   (defined(CONFIG_MEDIA_TUNER_E4000_MODULE) && defined(MODULE))
> +#if IS_ENABLED(CONFIG_MEDIA_TUNER_E4000)
>  extern struct dvb_frontend *e4000_attach(struct dvb_frontend *fe,
> struct i2c_adapter *i2c, const struct e4000_config *cfg);
>  #else
> diff --git a/drivers/media/tuners/fc0011.h b/drivers/media/tuners/fc0011.h
> index 0ee581f..33db6e4 100644
> --- a/drivers/media/tuners/fc0011.h
> +++ b/drivers/media/tuners/fc0011.h
> @@ -22,8 +22,7 @@ enum fc0011_fe_callback_commands {
> FC0011_FE_CALLBACK_RESET,
>  };
>
> -#if defined(CONFIG_MEDIA_TUNER_FC0011) ||\
> -defined(CONFIG_MEDIA_TUNER_FC0011_MODULE)
> +#if IS_ENABLED(CONFIG_MEDIA_TUNER_FC0011)
>  struct dvb_frontend *fc0011_attach(struct dvb_frontend *fe,
>struct i2c_adapter *i2c,
>const struct fc0011_config *config);
> diff --git a/drivers/media/tuners/fc0012.h b/drivers/media/tuners/fc0012.h
> index 54508fc..668d70d 100644
> --- a/drivers/media/tuners/fc0012.h
> +++ b/drivers/media/tuners/fc0012.h
> @@ -48,8 +48,7 @@ struct fc0012_config {
> bool clock_out;
>  };
>
> -#if defined(CONFIG_MEDIA_TUNER_FC0012) || \
> -   (defined(CONFIG_MEDIA_TUNER_FC0012_MODULE) && defined(MODULE))
> +#if IS_ENABLED(CONFIG_MEDIA_TUNER_FC0012)
>  extern struct dvb_frontend *fc0012_attach(struct dvb_frontend *fe,
> struct i2c_adapter *i2c,
> const struct fc0012_config *cfg);
> diff --git a/drivers/media/tuners/fc0013.h b/drivers/media/tuners/fc0013.h
> index 594efd6..34aa1c3 100644
> --- a/drivers/media/tuners/fc0013.h
> +++ b/drivers/media/tuners/fc0013.h
> @@ -25,8 +25,7 @@
>  #include "dvb_frontend.h"
>  #include "fc001x-common.h"
>
> -#if defined(CONFIG_MEDIA_TUNER_FC0013) || \
> -   (defined(CONFIG_MEDIA_TUNER_FC0013_MODULE) && defined(MODULE))
> +#if IS_ENABLED(CONFIG_MEDIA_TUNER_FC0013)
>  extern struct dvb_frontend *fc0013_attach(struct dvb_frontend *fe,
> struct i2c_adapter *i2c,
> u8 i2c_address, int dual_master,
> diff --git a/drivers/media/tuners/fc2580.h b/drivers/media/tuners/fc2580.h
> index 222601e..2dbf91f 100644
> --- a/drivers/media/tuners/fc2580.h
> +++ b/drivers/media/tuners/fc2580.h
> @@ -36,8 +36,7 @@ struct fc2580_config {
> u32 clock;
>  };
>
> -#if defined(CONFIG_MEDIA_TUNER_FC2580) || \
> -   (defined(CONFIG_MEDIA_TUNER_FC2580_MODULE) && defined(MOD

[PATCH 2/4] [media] tuners: use IS_ENABLED

2013-03-21 Thread Mauro Carvalho Chehab 
Instead of checking everywhere there for 3 symbols, use instead
IS_ENABLED macro.

This replacement was done using this small perl script:

my $data;
$data .= $_ while (<>);
if ($data =~ m/CONFIG_([A-Z\_\d]*)_MODULE/) {
$data =~ 
s,defined\(CONFIG_($f)\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
$data =~ 
s,defined\(CONFIG_($f)\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
$data =~ 
s,defined\(CONFIG_($f)\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)_MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
$data =~ 
s,defined\(CONFIG_($f)\)[\s\|\&\\\(\)\!]+defined\(CONFIG_($f)_MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;

$data =~ 
s,defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)\)\)*,IS_ENABLED(CONFIG_$f),g;
$data =~ 
s,defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)\)\)*,IS_ENABLED(CONFIG_$f),g;
$data =~ 
s,defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
$data =~ 
s,defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
}
print $data;

Cc: Antti Palosaari 
Cc: Michael Buesch 
Cc: Hans-Frieder Vogt 
Cc: Michael Krufky 
Signed-off-by: Mauro Carvalho Chehab 
---
 drivers/media/tuners/e4000.h| 3 +--
 drivers/media/tuners/fc0011.h   | 3 +--
 drivers/media/tuners/fc0012.h   | 3 +--
 drivers/media/tuners/fc0013.h   | 3 +--
 drivers/media/tuners/fc2580.h   | 3 +--
 drivers/media/tuners/max2165.h  | 3 +--
 drivers/media/tuners/mc44s803.h | 3 +--
 drivers/media/tuners/mxl5005s.h | 3 +--
 drivers/media/tuners/tda18212.h | 3 +--
 drivers/media/tuners/tda18218.h | 3 +--
 drivers/media/tuners/tua9001.h  | 3 +--
 drivers/media/tuners/xc5000.h   | 3 +--
 12 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/drivers/media/tuners/e4000.h b/drivers/media/tuners/e4000.h
index 71b1935..7801270 100644
--- a/drivers/media/tuners/e4000.h
+++ b/drivers/media/tuners/e4000.h
@@ -36,8 +36,7 @@ struct e4000_config {
u32 clock;
 };
 
-#if defined(CONFIG_MEDIA_TUNER_E4000) || \
-   (defined(CONFIG_MEDIA_TUNER_E4000_MODULE) && defined(MODULE))
+#if IS_ENABLED(CONFIG_MEDIA_TUNER_E4000)
 extern struct dvb_frontend *e4000_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, const struct e4000_config *cfg);
 #else
diff --git a/drivers/media/tuners/fc0011.h b/drivers/media/tuners/fc0011.h
index 0ee581f..33db6e4 100644
--- a/drivers/media/tuners/fc0011.h
+++ b/drivers/media/tuners/fc0011.h
@@ -22,8 +22,7 @@ enum fc0011_fe_callback_commands {
FC0011_FE_CALLBACK_RESET,
 };
 
-#if defined(CONFIG_MEDIA_TUNER_FC0011) ||\
-defined(CONFIG_MEDIA_TUNER_FC0011_MODULE)
+#if IS_ENABLED(CONFIG_MEDIA_TUNER_FC0011)
 struct dvb_frontend *fc0011_attach(struct dvb_frontend *fe,
   struct i2c_adapter *i2c,
   const struct fc0011_config *config);
diff --git a/drivers/media/tuners/fc0012.h b/drivers/media/tuners/fc0012.h
index 54508fc..668d70d 100644
--- a/drivers/media/tuners/fc0012.h
+++ b/drivers/media/tuners/fc0012.h
@@ -48,8 +48,7 @@ struct fc0012_config {
bool clock_out;
 };
 
-#if defined(CONFIG_MEDIA_TUNER_FC0012) || \
-   (defined(CONFIG_MEDIA_TUNER_FC0012_MODULE) && defined(MODULE))
+#if IS_ENABLED(CONFIG_MEDIA_TUNER_FC0012)
 extern struct dvb_frontend *fc0012_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c,
const struct fc0012_config *cfg);
diff --git a/drivers/media/tuners/fc0013.h b/drivers/media/tuners/fc0013.h
index 594efd6..34aa1c3 100644
--- a/drivers/media/tuners/fc0013.h
+++ b/drivers/media/tuners/fc0013.h
@@ -25,8 +25,7 @@
 #include "dvb_frontend.h"
 #include "fc001x-common.h"
 
-#if defined(CONFIG_MEDIA_TUNER_FC0013) || \
-   (defined(CONFIG_MEDIA_TUNER_FC0013_MODULE) && defined(MODULE))
+#if IS_ENABLED(CONFIG_MEDIA_TUNER_FC0013)
 extern struct dvb_frontend *fc0013_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c,
u8 i2c_address, int dual_master,
diff --git a/drivers/media/tuners/fc2580.h b/drivers/media/tuners/fc2580.h
index 222601e..2dbf91f 100644
--- a/drivers/media/tuners/fc2580.h
+++ b/drivers/media/tuners/fc2580.h
@@ -36,8 +36,7 @@ struct fc2580_config {
u32 clock;
 };
 
-#if defined(CONFIG_MEDIA_TUNER_FC2580) || \
-   (defined(CONFIG_MEDIA_TUNER_FC2580_MODULE) && defined(MODULE))
+#if IS_ENABLED(CONFIG_MEDIA_TUNER_FC2580)
 extern struct dvb_frontend *fc2580_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, const struct fc2580_config *cfg);
 #else
diff --git a/drivers/media/tuners/max2165.h b/drivers/media/tuners/max2165.h
index c063c36..531c79d 100644
--- a/dr