diff options
| author | Antti Palosaari <crope@iki.fi> | 2014-11-11 21:25:27 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-21 13:09:31 -0500 |
| commit | 4507f75013b88ba0175863f4fbb8d7fb11f81d58 (patch) | |
| tree | ac04862c964efb2368c98f6312f801d7b26c9959 | |
| parent | 473eadf32ab16987e9cead0855fc396e6e06a9f8 (diff) | |
[media] rtl28xxu: remove unused SDR attach logic
That logic was duplicated from rtl2832_sdr.h in order to avoid hard
dependency for staging directory. rtl2832_sdr is moved to media, so
we could remove that code now.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c index a527330d1ee1..a30ed17852c0 100644 --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include "rtl2830.h" | 25 | #include "rtl2830.h" |
| 26 | #include "rtl2832.h" | 26 | #include "rtl2832.h" |
| 27 | #include "rtl2832_sdr.h" | ||
| 27 | #include "mn88472.h" | 28 | #include "mn88472.h" |
| 28 | #include "mn88473.h" | 29 | #include "mn88473.h" |
| 29 | 30 | ||
| @@ -37,25 +38,6 @@ | |||
| 37 | #include "tua9001.h" | 38 | #include "tua9001.h" |
| 38 | #include "r820t.h" | 39 | #include "r820t.h" |
| 39 | 40 | ||
| 40 | /* | ||
| 41 | * RTL2832_SDR module is in staging. That logic is added in order to avoid any | ||
| 42 | * hard dependency to drivers/staging/ directory as we want compile mainline | ||
| 43 | * driver even whole staging directory is missing. | ||
| 44 | */ | ||
| 45 | #include <media/v4l2-subdev.h> | ||
| 46 | |||
| 47 | #if IS_ENABLED(CONFIG_DVB_RTL2832_SDR) | ||
| 48 | struct dvb_frontend *rtl2832_sdr_attach(struct dvb_frontend *fe, | ||
| 49 | struct i2c_adapter *i2c, const struct rtl2832_config *cfg, | ||
| 50 | struct v4l2_subdev *sd); | ||
| 51 | #else | ||
| 52 | static inline struct dvb_frontend *rtl2832_sdr_attach(struct dvb_frontend *fe, | ||
| 53 | struct i2c_adapter *i2c, const struct rtl2832_config *cfg, | ||
| 54 | struct v4l2_subdev *sd) | ||
| 55 | { | ||
| 56 | return NULL; | ||
| 57 | } | ||
| 58 | #endif | ||
| 59 | 41 | ||
| 60 | #ifdef CONFIG_MEDIA_ATTACH | 42 | #ifdef CONFIG_MEDIA_ATTACH |
| 61 | #define dvb_attach_sdr(FUNCTION, ARGS...) ({ \ | 43 | #define dvb_attach_sdr(FUNCTION, ARGS...) ({ \ |