Commit 92e9d1b7 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab

[media] staging: as102: Remove conditional compilation based on kernel version

Remove #if's related to kernel version and the code not applicable
to 3.2+ kernels.

Cc: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarSylwester Nawrocki <snjw23@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ff7029f5
...@@ -31,68 +31,6 @@ static void as10x_fe_copy_tps_parameters(struct dvb_frontend_parameters *dst, ...@@ -31,68 +31,6 @@ static void as10x_fe_copy_tps_parameters(struct dvb_frontend_parameters *dst,
static void as102_fe_copy_tune_parameters(struct as10x_tune_args *dst, static void as102_fe_copy_tune_parameters(struct as10x_tune_args *dst,
struct dvb_frontend_parameters *src); struct dvb_frontend_parameters *src);
static void as102_fe_release(struct dvb_frontend *fe)
{
struct as102_dev_t *dev;
ENTER();
dev = (struct as102_dev_t *) fe->tuner_priv;
if (dev == NULL)
return;
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
if (mutex_lock_interruptible(&dev->bus_adap.lock))
return;
/* send abilis command: TURN_OFF */
as10x_cmd_turn_off(&dev->bus_adap);
mutex_unlock(&dev->bus_adap.lock);
#endif
/* release frontend callback ops */
memset(&fe->ops, 0, sizeof(struct dvb_frontend_ops));
/* flush statistics */
memset(&dev->demod_stats, 0, sizeof(dev->demod_stats));
dev->signal_strength = 0;
dev->ber = -1;
/* reset tuner private data */
/* fe->tuner_priv = NULL; */
LEAVE();
}
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
static int as102_fe_init(struct dvb_frontend *fe)
{
int ret = 0;
struct as102_dev_t *dev;
ENTER();
dev = (struct as102_dev_t *) fe->tuner_priv;
if (dev == NULL)
return -ENODEV;
if (mutex_lock_interruptible(&dev->bus_adap.lock))
return -EBUSY;
if (elna_enable)
ret = as10x_cmd_set_context(&dev->bus_adap, 1010, 0xC0);
/* send abilis command: TURN_ON */
ret = as10x_cmd_turn_on(&dev->bus_adap);
mutex_unlock(&dev->bus_adap.lock);
LEAVE();
return (ret < 0) ? -EINVAL : 0;
}
#endif
static int as102_fe_set_frontend(struct dvb_frontend *fe, static int as102_fe_set_frontend(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params) struct dvb_frontend_parameters *params)
{ {
...@@ -312,7 +250,6 @@ static int as102_fe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) ...@@ -312,7 +250,6 @@ static int as102_fe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
return 0; return 0;
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19))
static int as102_fe_ts_bus_ctrl(struct dvb_frontend *fe, int acquire) static int as102_fe_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
{ {
struct as102_dev_t *dev; struct as102_dev_t *dev;
...@@ -341,7 +278,6 @@ static int as102_fe_ts_bus_ctrl(struct dvb_frontend *fe, int acquire) ...@@ -341,7 +278,6 @@ static int as102_fe_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
LEAVE(); LEAVE();
return ret; return ret;
} }
#endif
static struct dvb_frontend_ops as102_fe_ops = { static struct dvb_frontend_ops as102_fe_ops = {
.info = { .info = {
...@@ -366,19 +302,12 @@ static struct dvb_frontend_ops as102_fe_ops = { ...@@ -366,19 +302,12 @@ static struct dvb_frontend_ops as102_fe_ops = {
.get_frontend = as102_fe_get_frontend, .get_frontend = as102_fe_get_frontend,
.get_tune_settings = as102_fe_get_tune_settings, .get_tune_settings = as102_fe_get_tune_settings,
.read_status = as102_fe_read_status, .read_status = as102_fe_read_status,
.read_snr = as102_fe_read_snr, .read_snr = as102_fe_read_snr,
.read_ber = as102_fe_read_ber, .read_ber = as102_fe_read_ber,
.read_signal_strength = as102_fe_read_signal_strength, .read_signal_strength = as102_fe_read_signal_strength,
.read_ucblocks = as102_fe_read_ucblocks, .read_ucblocks = as102_fe_read_ucblocks,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19))
.ts_bus_ctrl = as102_fe_ts_bus_ctrl, .ts_bus_ctrl = as102_fe_ts_bus_ctrl,
#else
.release = as102_fe_release,
.init = as102_fe_init,
#endif
}; };
int as102_dvb_unregister_fe(struct dvb_frontend *fe) int as102_dvb_unregister_fe(struct dvb_frontend *fe)
...@@ -386,10 +315,9 @@ int as102_dvb_unregister_fe(struct dvb_frontend *fe) ...@@ -386,10 +315,9 @@ int as102_dvb_unregister_fe(struct dvb_frontend *fe)
/* unregister frontend */ /* unregister frontend */
dvb_unregister_frontend(fe); dvb_unregister_frontend(fe);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19))
/* detach frontend */ /* detach frontend */
dvb_frontend_detach(fe); dvb_frontend_detach(fe);
#endif
return 0; return 0;
} }
......
...@@ -205,11 +205,7 @@ static int as102_submit_urb_stream(struct as102_dev_t *dev, struct urb *urb) ...@@ -205,11 +205,7 @@ static int as102_submit_urb_stream(struct as102_dev_t *dev, struct urb *urb)
return err; return err;
} }
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18))
void as102_urb_stream_irq(struct urb *urb, struct pt_regs *regs)
#else
void as102_urb_stream_irq(struct urb *urb) void as102_urb_stream_irq(struct urb *urb)
#endif
{ {
struct as102_dev_t *as102_dev = urb->context; struct as102_dev_t *as102_dev = urb->context;
......
...@@ -47,12 +47,7 @@ ...@@ -47,12 +47,7 @@
#define NBOX_DVBT_DONGLE_USB_VID 0x0b89 #define NBOX_DVBT_DONGLE_USB_VID 0x0b89
#define NBOX_DVBT_DONGLE_USB_PID 0x0007 #define NBOX_DVBT_DONGLE_USB_PID 0x0007
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18))
void as102_urb_stream_irq(struct urb *urb, struct pt_regs *regs);
#else
void as102_urb_stream_irq(struct urb *urb); void as102_urb_stream_irq(struct urb *urb);
#endif
struct as10x_usb_token_cmd_t { struct as10x_usb_token_cmd_t {
/* token cmd */ /* token cmd */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment