subject:"\[PATCH 1\/4\] \[media\] dvb\-frontends\: use IS

Re: [PATCH 1/4] [media] dvb-frontends: use IS_ENABLED

2013-03-24 Thread Michael Krufky

...a long awaited cleanup ;-)

Reviewed-by: Michael Krufky mkru...@linuxtv.org

On Thu, Mar 21, 2013 at 3:39 PM, Mauro Carvalho Chehab
mche...@redhat.com 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: Malcolm Priestley tvbox...@gmail.com
 Cc: Michael Krufky mkru...@linuxtv.org
 Cc: Konstantin Dimitrov kosio.dimit...@gmail.com
 Cc: Igor M. Liplianin liplia...@me.by
 Cc: Thomas Mair thomas.mai...@googlemail.com
 Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
 ---
  drivers/media/dvb-frontends/a8293.h| 3 +--
  drivers/media/dvb-frontends/af9013.h   | 3 +--
  drivers/media/dvb-frontends/af9033.h   | 3 +--
  drivers/media/dvb-frontends/atbm8830.h | 3 +--
  drivers/media/dvb-frontends/au8522.h   | 3 +--
  drivers/media/dvb-frontends/cx22702.h  | 3 +--
  drivers/media/dvb-frontends/cx24113.h  | 3 +--
  drivers/media/dvb-frontends/cx24116.h  | 3 +--
  drivers/media/dvb-frontends/cx24123.h  | 3 +--
  drivers/media/dvb-frontends/cxd2820r.h | 3 +--
  drivers/media/dvb-frontends/dib3000mc.h| 3 +--
  drivers/media/dvb-frontends/dib7000m.h | 3 +--
  drivers/media/dvb-frontends/dib7000p.h | 3 +--
  drivers/media/dvb-frontends/drxd.h | 3 +--
  drivers/media/dvb-frontends/drxk.h | 3 +--
  drivers/media/dvb-frontends/ds3000.h   | 3 +--
  drivers/media/dvb-frontends/dvb_dummy_fe.h | 3 +--
  drivers/media/dvb-frontends/ec100.h| 3 +--
  drivers/media/dvb-frontends/hd29l2.h   | 3 +--
  drivers/media/dvb-frontends/it913x-fe.h| 3 +--
  drivers/media/dvb-frontends/ix2505v.h  | 3 +--
  drivers/media/dvb-frontends/lg2160.h   | 3 +--
  drivers/media/dvb-frontends/lgdt3305.h | 3 +--
  drivers/media/dvb-frontends/lgs8gl5.h  | 3 +--
  drivers/media/dvb-frontends/lgs8gxx.h  | 3 +--
  drivers/media/dvb-frontends/lnbh24.h   | 3 +--
  drivers/media/dvb-frontends/lnbp21.h   | 3 +--
  drivers/media/dvb-frontends/lnbp22.h   | 3 +--
  drivers/media/dvb-frontends/m88rs2000.h| 3 +--
  drivers/media/dvb-frontends/mb86a20s.h | 3 +--
  drivers/media/dvb-frontends/rtl2830.h  | 3 +--
  drivers/media/dvb-frontends/rtl2832.h  | 3 +--
  drivers/media/dvb-frontends/s5h1409.h  | 3 +--
  drivers/media/dvb-frontends/s5h1411.h  | 3 +--
  drivers/media/dvb-frontends/s5h1432.h  | 3 +--
  drivers/media/dvb-frontends/s921.h | 3 +--
  drivers/media/dvb-frontends/si21xx.h   | 3 +--
  drivers/media/dvb-frontends/stb6000.h  | 3 +--
  drivers/media/dvb-frontends/stv0288.h  | 3 +--
  drivers/media/dvb-frontends/stv0367.h  | 3 +--
  drivers/media/dvb-frontends/stv0900.h  | 3 +--
  drivers/media/dvb-frontends/stv6110.h  | 3 +--
  drivers/media/dvb-frontends/tda10048.h | 3 +--
  drivers/media/dvb-frontends/tda10071.h | 3 +--
  drivers/media/dvb-frontends/tda18271c2dd.h | 3 +--
  drivers/media/dvb-frontends/ts2020.h   | 3 +--
  drivers/media/dvb-frontends/zl10036.h  | 3 +--
  drivers/media/dvb-frontends/zl10039.h  | 3 +--
  48 files changed, 48 insertions(+), 96 deletions(-)

 diff --git a/drivers/media/dvb-frontends/a8293.h 
 b/drivers/media/dvb-frontends/a8293.h
 index ed29e55..e6d4a83 100644
 --- a/drivers/media/dvb-frontends/a8293.h
 +++ b/drivers/media/dvb-frontends/a8293.h
 @@ -25,8 +25,7 @@ struct a8293_config {
 u8 i2c_addr;
  };

 -#if defined(CONFIG_DVB_A8293) || \
 -   (defined(CONFIG_DVB_A8293_MODULE)  defined(MODULE))
 +#if IS_ENABLED(CONFIG_DVB_A8293)
  extern struct dvb_frontend *a8293_attach(struct dvb_frontend *fe,
 struct i2c_adapter *i2c, const struct a8293_config *cfg);
  #else
 diff --git a/drivers/media/dvb-frontends/af9013.h 
 b/drivers/media/dvb-frontends/af9013.h
 index

[PATCH 1/4] [media] dvb-frontends: 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: Malcolm Priestley tvbox...@gmail.com
Cc: Michael Krufky mkru...@linuxtv.org
Cc: Konstantin Dimitrov kosio.dimit...@gmail.com
Cc: Igor M. Liplianin liplia...@me.by
Cc: Thomas Mair thomas.mai...@googlemail.com
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
 drivers/media/dvb-frontends/a8293.h| 3 +--
 drivers/media/dvb-frontends/af9013.h   | 3 +--
 drivers/media/dvb-frontends/af9033.h   | 3 +--
 drivers/media/dvb-frontends/atbm8830.h | 3 +--
 drivers/media/dvb-frontends/au8522.h   | 3 +--
 drivers/media/dvb-frontends/cx22702.h  | 3 +--
 drivers/media/dvb-frontends/cx24113.h  | 3 +--
 drivers/media/dvb-frontends/cx24116.h  | 3 +--
 drivers/media/dvb-frontends/cx24123.h  | 3 +--
 drivers/media/dvb-frontends/cxd2820r.h | 3 +--
 drivers/media/dvb-frontends/dib3000mc.h| 3 +--
 drivers/media/dvb-frontends/dib7000m.h | 3 +--
 drivers/media/dvb-frontends/dib7000p.h | 3 +--
 drivers/media/dvb-frontends/drxd.h | 3 +--
 drivers/media/dvb-frontends/drxk.h | 3 +--
 drivers/media/dvb-frontends/ds3000.h   | 3 +--
 drivers/media/dvb-frontends/dvb_dummy_fe.h | 3 +--
 drivers/media/dvb-frontends/ec100.h| 3 +--
 drivers/media/dvb-frontends/hd29l2.h   | 3 +--
 drivers/media/dvb-frontends/it913x-fe.h| 3 +--
 drivers/media/dvb-frontends/ix2505v.h  | 3 +--
 drivers/media/dvb-frontends/lg2160.h   | 3 +--
 drivers/media/dvb-frontends/lgdt3305.h | 3 +--
 drivers/media/dvb-frontends/lgs8gl5.h  | 3 +--
 drivers/media/dvb-frontends/lgs8gxx.h  | 3 +--
 drivers/media/dvb-frontends/lnbh24.h   | 3 +--
 drivers/media/dvb-frontends/lnbp21.h   | 3 +--
 drivers/media/dvb-frontends/lnbp22.h   | 3 +--
 drivers/media/dvb-frontends/m88rs2000.h| 3 +--
 drivers/media/dvb-frontends/mb86a20s.h | 3 +--
 drivers/media/dvb-frontends/rtl2830.h  | 3 +--
 drivers/media/dvb-frontends/rtl2832.h  | 3 +--
 drivers/media/dvb-frontends/s5h1409.h  | 3 +--
 drivers/media/dvb-frontends/s5h1411.h  | 3 +--
 drivers/media/dvb-frontends/s5h1432.h  | 3 +--
 drivers/media/dvb-frontends/s921.h | 3 +--
 drivers/media/dvb-frontends/si21xx.h   | 3 +--
 drivers/media/dvb-frontends/stb6000.h  | 3 +--
 drivers/media/dvb-frontends/stv0288.h  | 3 +--
 drivers/media/dvb-frontends/stv0367.h  | 3 +--
 drivers/media/dvb-frontends/stv0900.h  | 3 +--
 drivers/media/dvb-frontends/stv6110.h  | 3 +--
 drivers/media/dvb-frontends/tda10048.h | 3 +--
 drivers/media/dvb-frontends/tda10071.h | 3 +--
 drivers/media/dvb-frontends/tda18271c2dd.h | 3 +--
 drivers/media/dvb-frontends/ts2020.h   | 3 +--
 drivers/media/dvb-frontends/zl10036.h  | 3 +--
 drivers/media/dvb-frontends/zl10039.h  | 3 +--
 48 files changed, 48 insertions(+), 96 deletions(-)

diff --git a/drivers/media/dvb-frontends/a8293.h 
b/drivers/media/dvb-frontends/a8293.h
index ed29e55..e6d4a83 100644
--- a/drivers/media/dvb-frontends/a8293.h
+++ b/drivers/media/dvb-frontends/a8293.h
@@ -25,8 +25,7 @@ struct a8293_config {
u8 i2c_addr;
 };
 
-#if defined(CONFIG_DVB_A8293) || \
-   (defined(CONFIG_DVB_A8293_MODULE)  defined(MODULE))
+#if IS_ENABLED(CONFIG_DVB_A8293)
 extern struct dvb_frontend *a8293_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, const struct a8293_config *cfg);
 #else
diff --git a/drivers/media/dvb-frontends/af9013.h 
b/drivers/media/dvb-frontends/af9013.h
index dc837d9..ddd1c47 100644
--- a/drivers/media/dvb-frontends/af9013.h
+++ b/drivers/media/dvb-frontends/af9013.h
@@ -102,8 +102,7 @@ struct af9013_config {
u8 gpio[4];
 };
 
-#if defined(CONFIG_DVB_AF9013) || \
-

Re: [PATCH 1/4] [media] dvb-frontends: use IS_ENABLED

[PATCH 1/4] [media] dvb-frontends: use IS_ENABLED

2 matches

Site Navigation

Mail list logo

Footer information