forked from Minki/linux
media: frontends: fix ops get_algo()'s return type
The method dvb_frontend_ops::get_frontend_algo() is defined as returning an 'enum dvbfe_algo', but the implementation in this driver returns an 'int'. Fix this by returning 'enum dvbfe_algo' on drivers. [mchehab+samsung@kernel.org: merge similar patches and patch ddbridge-mci.c the same way] Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
parent
530d473884
commit
8d718e5376
@ -1456,7 +1456,7 @@ static int cx24116_tune(struct dvb_frontend *fe, bool re_tune,
|
||||
return cx24116_read_status(fe, status);
|
||||
}
|
||||
|
||||
static int cx24116_get_algo(struct dvb_frontend *fe)
|
||||
static enum dvbfe_algo cx24116_get_algo(struct dvb_frontend *fe)
|
||||
{
|
||||
return DVBFE_ALGO_HW;
|
||||
}
|
||||
|
@ -1555,7 +1555,7 @@ static int cx24117_tune(struct dvb_frontend *fe, bool re_tune,
|
||||
return cx24117_read_status(fe, status);
|
||||
}
|
||||
|
||||
static int cx24117_get_algo(struct dvb_frontend *fe)
|
||||
static enum dvbfe_algo cx24117_get_algo(struct dvb_frontend *fe)
|
||||
{
|
||||
return DVBFE_ALGO_HW;
|
||||
}
|
||||
|
@ -1491,7 +1491,7 @@ static int cx24120_tune(struct dvb_frontend *fe, bool re_tune,
|
||||
return cx24120_read_status(fe, status);
|
||||
}
|
||||
|
||||
static int cx24120_get_algo(struct dvb_frontend *fe)
|
||||
static enum dvbfe_algo cx24120_get_algo(struct dvb_frontend *fe)
|
||||
{
|
||||
return DVBFE_ALGO_HW;
|
||||
}
|
||||
|
@ -1005,7 +1005,7 @@ static int cx24123_tune(struct dvb_frontend *fe,
|
||||
return retval;
|
||||
}
|
||||
|
||||
static int cx24123_get_algo(struct dvb_frontend *fe)
|
||||
static enum dvbfe_algo cx24123_get_algo(struct dvb_frontend *fe)
|
||||
{
|
||||
return DVBFE_ALGO_HW;
|
||||
}
|
||||
|
@ -403,7 +403,7 @@ error:
|
||||
return DVBFE_ALGO_SEARCH_ERROR;
|
||||
}
|
||||
|
||||
static int cxd2820r_get_frontend_algo(struct dvb_frontend *fe)
|
||||
static enum dvbfe_algo cxd2820r_get_frontend_algo(struct dvb_frontend *fe)
|
||||
{
|
||||
return DVBFE_ALGO_CUSTOM;
|
||||
}
|
||||
|
@ -2055,7 +2055,7 @@ static void mb86a20s_release(struct dvb_frontend *fe)
|
||||
kfree(state);
|
||||
}
|
||||
|
||||
static int mb86a20s_get_frontend_algo(struct dvb_frontend *fe)
|
||||
static enum dvbfe_algo mb86a20s_get_frontend_algo(struct dvb_frontend *fe)
|
||||
{
|
||||
return DVBFE_ALGO_HW;
|
||||
}
|
||||
|
@ -375,7 +375,7 @@ static void release(struct dvb_frontend *fe)
|
||||
kfree(state);
|
||||
}
|
||||
|
||||
static int get_algo(struct dvb_frontend *fe)
|
||||
static enum dvbfe_algo get_algo(struct dvb_frontend *fe)
|
||||
{
|
||||
return DVBFE_ALGO_HW;
|
||||
}
|
||||
|
@ -464,7 +464,7 @@ static int s921_tune(struct dvb_frontend *fe,
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int s921_get_algo(struct dvb_frontend *fe)
|
||||
static enum dvbfe_algo s921_get_algo(struct dvb_frontend *fe)
|
||||
{
|
||||
return DVBFE_ALGO_HW;
|
||||
}
|
||||
|
@ -1639,7 +1639,7 @@ static int tune(struct dvb_frontend *fe, bool re_tune,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int get_algo(struct dvb_frontend *fe)
|
||||
static enum dvbfe_algo get_algo(struct dvb_frontend *fe)
|
||||
{
|
||||
return DVBFE_ALGO_HW;
|
||||
}
|
||||
|
@ -1657,7 +1657,7 @@ static int dst_tune_frontend(struct dvb_frontend* fe,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dst_get_tuning_algo(struct dvb_frontend *fe)
|
||||
static enum dvbfe_algo dst_get_tuning_algo(struct dvb_frontend *fe)
|
||||
{
|
||||
return dst_algo ? DVBFE_ALGO_HW : DVBFE_ALGO_SW;
|
||||
}
|
||||
|
@ -444,7 +444,7 @@ static int tune(struct dvb_frontend *fe, bool re_tune,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int get_algo(struct dvb_frontend *fe)
|
||||
static enum dvbfe_algo get_algo(struct dvb_frontend *fe)
|
||||
{
|
||||
return DVBFE_ALGO_HW;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user