aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/tuners
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2013-03-21 15:24:09 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-23 08:22:06 -0400
commit9dc353c67cbe3150d3a6b293662d5a33028adec4 (patch)
tree5b5ec2847eeb5244692365f2e54e649fc41f87d4 /drivers/media/tuners
parent782d8b743aad7dfffa4c01e9e8b57fd35247d70a (diff)
[media] tuners: use IS_ENABLED
Instead of checking everywhere there for 3 symbols, use instead IS_ENABLED macro. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/tuners')
-rw-r--r--drivers/media/tuners/e4000.h4
-rw-r--r--drivers/media/tuners/fc0011.h4
-rw-r--r--drivers/media/tuners/fc0012.h4
-rw-r--r--drivers/media/tuners/fc0013.h4
-rw-r--r--drivers/media/tuners/fc2580.h4
-rw-r--r--drivers/media/tuners/max2165.h5
-rw-r--r--drivers/media/tuners/mc44s803.h5
-rw-r--r--drivers/media/tuners/mxl5005s.h5
-rw-r--r--drivers/media/tuners/tda18212.h4
-rw-r--r--drivers/media/tuners/tda18218.h4
-rw-r--r--drivers/media/tuners/tua9001.h4
-rw-r--r--drivers/media/tuners/xc5000.h4
12 files changed, 27 insertions, 24 deletions
diff --git a/drivers/media/tuners/e4000.h b/drivers/media/tuners/e4000.h
index 71b1935eb3d2..3783a0bdf855 100644
--- a/drivers/media/tuners/e4000.h
+++ b/drivers/media/tuners/e4000.h
@@ -21,6 +21,7 @@
21#ifndef E4000_H 21#ifndef E4000_H
22#define E4000_H 22#define E4000_H
23 23
24#include <linux/kconfig.h>
24#include "dvb_frontend.h" 25#include "dvb_frontend.h"
25 26
26struct e4000_config { 27struct e4000_config {
@@ -36,8 +37,7 @@ struct e4000_config {
36 u32 clock; 37 u32 clock;
37}; 38};
38 39
39#if defined(CONFIG_MEDIA_TUNER_E4000) || \ 40#if IS_ENABLED(CONFIG_MEDIA_TUNER_E4000)
40 (defined(CONFIG_MEDIA_TUNER_E4000_MODULE) && defined(MODULE))
41extern struct dvb_frontend *e4000_attach(struct dvb_frontend *fe, 41extern struct dvb_frontend *e4000_attach(struct dvb_frontend *fe,
42 struct i2c_adapter *i2c, const struct e4000_config *cfg); 42 struct i2c_adapter *i2c, const struct e4000_config *cfg);
43#else 43#else
diff --git a/drivers/media/tuners/fc0011.h b/drivers/media/tuners/fc0011.h
index 0ee581f122d2..43ec893a6877 100644
--- a/drivers/media/tuners/fc0011.h
+++ b/drivers/media/tuners/fc0011.h
@@ -1,6 +1,7 @@
1#ifndef LINUX_FC0011_H_ 1#ifndef LINUX_FC0011_H_
2#define LINUX_FC0011_H_ 2#define LINUX_FC0011_H_
3 3
4#include <linux/kconfig.h>
4#include "dvb_frontend.h" 5#include "dvb_frontend.h"
5 6
6 7
@@ -22,8 +23,7 @@ enum fc0011_fe_callback_commands {
22 FC0011_FE_CALLBACK_RESET, 23 FC0011_FE_CALLBACK_RESET,
23}; 24};
24 25
25#if defined(CONFIG_MEDIA_TUNER_FC0011) ||\ 26#if IS_ENABLED(CONFIG_MEDIA_TUNER_FC0011)
26 defined(CONFIG_MEDIA_TUNER_FC0011_MODULE)
27struct dvb_frontend *fc0011_attach(struct dvb_frontend *fe, 27struct dvb_frontend *fc0011_attach(struct dvb_frontend *fe,
28 struct i2c_adapter *i2c, 28 struct i2c_adapter *i2c,
29 const struct fc0011_config *config); 29 const struct fc0011_config *config);
diff --git a/drivers/media/tuners/fc0012.h b/drivers/media/tuners/fc0012.h
index 54508fcc3469..1d08057e3275 100644
--- a/drivers/media/tuners/fc0012.h
+++ b/drivers/media/tuners/fc0012.h
@@ -21,6 +21,7 @@
21#ifndef _FC0012_H_ 21#ifndef _FC0012_H_
22#define _FC0012_H_ 22#define _FC0012_H_
23 23
24#include <linux/kconfig.h>
24#include "dvb_frontend.h" 25#include "dvb_frontend.h"
25#include "fc001x-common.h" 26#include "fc001x-common.h"
26 27
@@ -48,8 +49,7 @@ struct fc0012_config {
48 bool clock_out; 49 bool clock_out;
49}; 50};
50 51
51#if defined(CONFIG_MEDIA_TUNER_FC0012) || \ 52#if IS_ENABLED(CONFIG_MEDIA_TUNER_FC0012)
52 (defined(CONFIG_MEDIA_TUNER_FC0012_MODULE) && defined(MODULE))
53extern struct dvb_frontend *fc0012_attach(struct dvb_frontend *fe, 53extern struct dvb_frontend *fc0012_attach(struct dvb_frontend *fe,
54 struct i2c_adapter *i2c, 54 struct i2c_adapter *i2c,
55 const struct fc0012_config *cfg); 55 const struct fc0012_config *cfg);
diff --git a/drivers/media/tuners/fc0013.h b/drivers/media/tuners/fc0013.h
index 594efd64aeec..d65d5b37f56e 100644
--- a/drivers/media/tuners/fc0013.h
+++ b/drivers/media/tuners/fc0013.h
@@ -22,11 +22,11 @@
22#ifndef _FC0013_H_ 22#ifndef _FC0013_H_
23#define _FC0013_H_ 23#define _FC0013_H_
24 24
25#include <linux/kconfig.h>
25#include "dvb_frontend.h" 26#include "dvb_frontend.h"
26#include "fc001x-common.h" 27#include "fc001x-common.h"
27 28
28#if defined(CONFIG_MEDIA_TUNER_FC0013) || \ 29#if IS_ENABLED(CONFIG_MEDIA_TUNER_FC0013)
29 (defined(CONFIG_MEDIA_TUNER_FC0013_MODULE) && defined(MODULE))
30extern struct dvb_frontend *fc0013_attach(struct dvb_frontend *fe, 30extern struct dvb_frontend *fc0013_attach(struct dvb_frontend *fe,
31 struct i2c_adapter *i2c, 31 struct i2c_adapter *i2c,
32 u8 i2c_address, int dual_master, 32 u8 i2c_address, int dual_master,
diff --git a/drivers/media/tuners/fc2580.h b/drivers/media/tuners/fc2580.h
index 222601e5d23b..9c43c1cc82d9 100644
--- a/drivers/media/tuners/fc2580.h
+++ b/drivers/media/tuners/fc2580.h
@@ -21,6 +21,7 @@
21#ifndef FC2580_H 21#ifndef FC2580_H
22#define FC2580_H 22#define FC2580_H
23 23
24#include <linux/kconfig.h>
24#include "dvb_frontend.h" 25#include "dvb_frontend.h"
25 26
26struct fc2580_config { 27struct fc2580_config {
@@ -36,8 +37,7 @@ struct fc2580_config {
36 u32 clock; 37 u32 clock;
37}; 38};
38 39
39#if defined(CONFIG_MEDIA_TUNER_FC2580) || \ 40#if IS_ENABLED(CONFIG_MEDIA_TUNER_FC2580)
40 (defined(CONFIG_MEDIA_TUNER_FC2580_MODULE) && defined(MODULE))
41extern struct dvb_frontend *fc2580_attach(struct dvb_frontend *fe, 41extern struct dvb_frontend *fc2580_attach(struct dvb_frontend *fe,
42 struct i2c_adapter *i2c, const struct fc2580_config *cfg); 42 struct i2c_adapter *i2c, const struct fc2580_config *cfg);
43#else 43#else
diff --git a/drivers/media/tuners/max2165.h b/drivers/media/tuners/max2165.h
index c063c36a93d3..26e1dc64bb67 100644
--- a/drivers/media/tuners/max2165.h
+++ b/drivers/media/tuners/max2165.h
@@ -22,6 +22,8 @@
22#ifndef __MAX2165_H__ 22#ifndef __MAX2165_H__
23#define __MAX2165_H__ 23#define __MAX2165_H__
24 24
25#include <linux/kconfig.h>
26
25struct dvb_frontend; 27struct dvb_frontend;
26struct i2c_adapter; 28struct i2c_adapter;
27 29
@@ -30,8 +32,7 @@ struct max2165_config {
30 u8 osc_clk; /* in MHz, selectable values: 4,16,18,20,22,24,26,28 */ 32 u8 osc_clk; /* in MHz, selectable values: 4,16,18,20,22,24,26,28 */
31}; 33};
32 34
33#if defined(CONFIG_MEDIA_TUNER_MAX2165) || \ 35#if IS_ENABLED(CONFIG_MEDIA_TUNER_MAX2165)
34 (defined(CONFIG_MEDIA_TUNER_MAX2165_MODULE) && defined(MODULE))
35extern struct dvb_frontend *max2165_attach(struct dvb_frontend *fe, 36extern struct dvb_frontend *max2165_attach(struct dvb_frontend *fe,
36 struct i2c_adapter *i2c, 37 struct i2c_adapter *i2c,
37 struct max2165_config *cfg); 38 struct max2165_config *cfg);
diff --git a/drivers/media/tuners/mc44s803.h b/drivers/media/tuners/mc44s803.h
index 34f3892d3f6d..9aae50aca2b7 100644
--- a/drivers/media/tuners/mc44s803.h
+++ b/drivers/media/tuners/mc44s803.h
@@ -22,6 +22,8 @@
22#ifndef MC44S803_H 22#ifndef MC44S803_H
23#define MC44S803_H 23#define MC44S803_H
24 24
25#include <linux/kconfig.h>
26
25struct dvb_frontend; 27struct dvb_frontend;
26struct i2c_adapter; 28struct i2c_adapter;
27 29
@@ -30,8 +32,7 @@ struct mc44s803_config {
30 u8 dig_out; 32 u8 dig_out;
31}; 33};
32 34
33#if defined(CONFIG_MEDIA_TUNER_MC44S803) || \ 35#if IS_ENABLED(CONFIG_MEDIA_TUNER_MC44S803)
34 (defined(CONFIG_MEDIA_TUNER_MC44S803_MODULE) && defined(MODULE))
35extern struct dvb_frontend *mc44s803_attach(struct dvb_frontend *fe, 36extern struct dvb_frontend *mc44s803_attach(struct dvb_frontend *fe,
36 struct i2c_adapter *i2c, struct mc44s803_config *cfg); 37 struct i2c_adapter *i2c, struct mc44s803_config *cfg);
37#else 38#else
diff --git a/drivers/media/tuners/mxl5005s.h b/drivers/media/tuners/mxl5005s.h
index fc8a1ffc53b4..ae8db885ad87 100644
--- a/drivers/media/tuners/mxl5005s.h
+++ b/drivers/media/tuners/mxl5005s.h
@@ -23,6 +23,8 @@
23#ifndef __MXL5005S_H 23#ifndef __MXL5005S_H
24#define __MXL5005S_H 24#define __MXL5005S_H
25 25
26#include <linux/kconfig.h>
27
26#include <linux/i2c.h> 28#include <linux/i2c.h>
27#include "dvb_frontend.h" 29#include "dvb_frontend.h"
28 30
@@ -116,8 +118,7 @@ struct mxl5005s_config {
116 u8 AgcMasterByte; 118 u8 AgcMasterByte;
117}; 119};
118 120
119#if defined(CONFIG_MEDIA_TUNER_MXL5005S) || \ 121#if IS_ENABLED(CONFIG_MEDIA_TUNER_MXL5005S)
120 (defined(CONFIG_MEDIA_TUNER_MXL5005S_MODULE) && defined(MODULE))
121extern struct dvb_frontend *mxl5005s_attach(struct dvb_frontend *fe, 122extern struct dvb_frontend *mxl5005s_attach(struct dvb_frontend *fe,
122 struct i2c_adapter *i2c, 123 struct i2c_adapter *i2c,
123 struct mxl5005s_config *config); 124 struct mxl5005s_config *config);
diff --git a/drivers/media/tuners/tda18212.h b/drivers/media/tuners/tda18212.h
index 9bd5da4aabb7..7e0d503baf05 100644
--- a/drivers/media/tuners/tda18212.h
+++ b/drivers/media/tuners/tda18212.h
@@ -21,6 +21,7 @@
21#ifndef TDA18212_H 21#ifndef TDA18212_H
22#define TDA18212_H 22#define TDA18212_H
23 23
24#include <linux/kconfig.h>
24#include "dvb_frontend.h" 25#include "dvb_frontend.h"
25 26
26struct tda18212_config { 27struct tda18212_config {
@@ -36,8 +37,7 @@ struct tda18212_config {
36 u16 if_dvbc; 37 u16 if_dvbc;
37}; 38};
38 39
39#if defined(CONFIG_MEDIA_TUNER_TDA18212) || \ 40#if IS_ENABLED(CONFIG_MEDIA_TUNER_TDA18212)
40 (defined(CONFIG_MEDIA_TUNER_TDA18212_MODULE) && defined(MODULE))
41extern struct dvb_frontend *tda18212_attach(struct dvb_frontend *fe, 41extern struct dvb_frontend *tda18212_attach(struct dvb_frontend *fe,
42 struct i2c_adapter *i2c, struct tda18212_config *cfg); 42 struct i2c_adapter *i2c, struct tda18212_config *cfg);
43#else 43#else
diff --git a/drivers/media/tuners/tda18218.h b/drivers/media/tuners/tda18218.h
index b4180d180029..366410e0cc9a 100644
--- a/drivers/media/tuners/tda18218.h
+++ b/drivers/media/tuners/tda18218.h
@@ -21,6 +21,7 @@
21#ifndef TDA18218_H 21#ifndef TDA18218_H
22#define TDA18218_H 22#define TDA18218_H
23 23
24#include <linux/kconfig.h>
24#include "dvb_frontend.h" 25#include "dvb_frontend.h"
25 26
26struct tda18218_config { 27struct tda18218_config {
@@ -29,8 +30,7 @@ struct tda18218_config {
29 u8 loop_through:1; 30 u8 loop_through:1;
30}; 31};
31 32
32#if defined(CONFIG_MEDIA_TUNER_TDA18218) || \ 33#if IS_ENABLED(CONFIG_MEDIA_TUNER_TDA18218)
33 (defined(CONFIG_MEDIA_TUNER_TDA18218_MODULE) && defined(MODULE))
34extern struct dvb_frontend *tda18218_attach(struct dvb_frontend *fe, 34extern struct dvb_frontend *tda18218_attach(struct dvb_frontend *fe,
35 struct i2c_adapter *i2c, struct tda18218_config *cfg); 35 struct i2c_adapter *i2c, struct tda18218_config *cfg);
36#else 36#else
diff --git a/drivers/media/tuners/tua9001.h b/drivers/media/tuners/tua9001.h
index cf5b815feff9..26358da1c100 100644
--- a/drivers/media/tuners/tua9001.h
+++ b/drivers/media/tuners/tua9001.h
@@ -21,6 +21,7 @@
21#ifndef TUA9001_H 21#ifndef TUA9001_H
22#define TUA9001_H 22#define TUA9001_H
23 23
24#include <linux/kconfig.h>
24#include "dvb_frontend.h" 25#include "dvb_frontend.h"
25 26
26struct tua9001_config { 27struct tua9001_config {
@@ -50,8 +51,7 @@ struct tua9001_config {
50#define TUA9001_CMD_RESETN 1 51#define TUA9001_CMD_RESETN 1
51#define TUA9001_CMD_RXEN 2 52#define TUA9001_CMD_RXEN 2
52 53
53#if defined(CONFIG_MEDIA_TUNER_TUA9001) || \ 54#if IS_ENABLED(CONFIG_MEDIA_TUNER_TUA9001)
54 (defined(CONFIG_MEDIA_TUNER_TUA9001_MODULE) && defined(MODULE))
55extern struct dvb_frontend *tua9001_attach(struct dvb_frontend *fe, 55extern struct dvb_frontend *tua9001_attach(struct dvb_frontend *fe,
56 struct i2c_adapter *i2c, struct tua9001_config *cfg); 56 struct i2c_adapter *i2c, struct tua9001_config *cfg);
57#else 57#else
diff --git a/drivers/media/tuners/xc5000.h b/drivers/media/tuners/xc5000.h
index b1a547494625..7245cae19f0c 100644
--- a/drivers/media/tuners/xc5000.h
+++ b/drivers/media/tuners/xc5000.h
@@ -22,6 +22,7 @@
22#ifndef __XC5000_H__ 22#ifndef __XC5000_H__
23#define __XC5000_H__ 23#define __XC5000_H__
24 24
25#include <linux/kconfig.h>
25#include <linux/firmware.h> 26#include <linux/firmware.h>
26 27
27struct dvb_frontend; 28struct dvb_frontend;
@@ -56,8 +57,7 @@ struct xc5000_config {
56 * it's passed back to a bridge during tuner_callback(). 57 * it's passed back to a bridge during tuner_callback().
57 */ 58 */
58 59
59#if defined(CONFIG_MEDIA_TUNER_XC5000) || \ 60#if IS_ENABLED(CONFIG_MEDIA_TUNER_XC5000)
60 (defined(CONFIG_MEDIA_TUNER_XC5000_MODULE) && defined(MODULE))
61extern struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, 61extern struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
62 struct i2c_adapter *i2c, 62 struct i2c_adapter *i2c,
63 const struct xc5000_config *cfg); 63 const struct xc5000_config *cfg);