Skip to content

Commit

Permalink
[media] it913x: make remote controller optional
Browse files Browse the repository at this point in the history
Do not compile remote controller when RC-core is disabled by Kconfig.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Jan 6, 2013
1 parent 7b75322 commit b963c20
Showing 1 changed file with 20 additions and 16 deletions.
36 changes: 20 additions & 16 deletions drivers/media/usb/dvb-usb-v2/it913x.c
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ static struct i2c_algorithm it913x_i2c_algo = {
};

/* Callbacks for DVB USB */
#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
#define IT913X_POLL 250
static int it913x_rc_query(struct dvb_usb_device *d)
{
Expand All @@ -334,6 +335,25 @@ static int it913x_rc_query(struct dvb_usb_device *d)
return ret;
}

static int it913x_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
{
struct it913x_state *st = d->priv;

if (st->proprietary_ir == false) {
rc->map_name = NULL;
return 0;
}

rc->allowed_protos = RC_BIT_NEC;
rc->query = it913x_rc_query;
rc->interval = 250;

return 0;
}
#else
#define it913x_get_rc_config NULL
#endif

/* Firmware sets raw */
static const char fw_it9135_v1[] = FW_IT9135_V1;
static const char fw_it9135_v2[] = FW_IT9135_V2;
Expand Down Expand Up @@ -696,22 +716,6 @@ static int it913x_frontend_attach(struct dvb_usb_adapter *adap)
}

/* DVB USB Driver */
static int it913x_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
{
struct it913x_state *st = d->priv;

if (st->proprietary_ir == false) {
rc->map_name = NULL;
return 0;
}

rc->allowed_protos = RC_BIT_NEC;
rc->query = it913x_rc_query;
rc->interval = 250;

return 0;
}

static int it913x_get_adapter_count(struct dvb_usb_device *d)
{
struct it913x_state *st = d->priv;
Expand Down

0 comments on commit b963c20

Please sign in to comment.