projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'please-pull-dhowells-uapi' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
tuners
/
mt2063.c
diff --git
a/drivers/media/tuners/mt2063.c
b/drivers/media/tuners/mt2063.c
index 0ed9091ff48eb02d951b2888614534788cfb688b..2e1a02e360ff0cd7279fed8ca20b80a3ee0b8ad8 100644
(file)
--- a/
drivers/media/tuners/mt2063.c
+++ b/
drivers/media/tuners/mt2063.c
@@
-245,7
+245,7
@@
struct mt2063_state {
/*
* mt2063_write - Write data into the I2C bus
*/
/*
* mt2063_write - Write data into the I2C bus
*/
-static
u32
mt2063_write(struct mt2063_state *state, u8 reg, u8 *data, u32 len)
+static
int
mt2063_write(struct mt2063_state *state, u8 reg, u8 *data, u32 len)
{
struct dvb_frontend *fe = state->frontend;
int ret;
{
struct dvb_frontend *fe = state->frontend;
int ret;
@@
-277,9
+277,9
@@
static u32 mt2063_write(struct mt2063_state *state, u8 reg, u8 *data, u32 len)
/*
* mt2063_write - Write register data into the I2C bus, caching the value
*/
/*
* mt2063_write - Write register data into the I2C bus, caching the value
*/
-static
u32
mt2063_setreg(struct mt2063_state *state, u8 reg, u8 val)
+static
int
mt2063_setreg(struct mt2063_state *state, u8 reg, u8 val)
{
{
-
u32
status;
+
int
status;
dprintk(2, "\n");
dprintk(2, "\n");
@@
-298,10
+298,10
@@
static u32 mt2063_setreg(struct mt2063_state *state, u8 reg, u8 val)
/*
* mt2063_read - Read data from the I2C bus
*/
/*
* mt2063_read - Read data from the I2C bus
*/
-static
u32
mt2063_read(struct mt2063_state *state,
+static
int
mt2063_read(struct mt2063_state *state,
u8 subAddress, u8 *pData, u32 cnt)
{
u8 subAddress, u8 *pData, u32 cnt)
{
-
u32
status = 0; /* Status to be returned */
+
int
status = 0; /* Status to be returned */
struct dvb_frontend *fe = state->frontend;
u32 i = 0;
struct dvb_frontend *fe = state->frontend;
u32 i = 0;
@@
-816,7
+816,7
@@
static u32 IsSpurInBand(struct MT2063_AvoidSpursData_t *pAS_Info,
*/
static u32 MT2063_AvoidSpurs(struct MT2063_AvoidSpursData_t *pAS_Info)
{
*/
static u32 MT2063_AvoidSpurs(struct MT2063_AvoidSpursData_t *pAS_Info)
{
-
u32
status = 0;
+
int
status = 0;
u32 fm, fp; /* restricted range on LO's */
pAS_Info->bSpurAvoided = 0;
pAS_Info->nSpursFound = 0;
u32 fm, fp; /* restricted range on LO's */
pAS_Info->bSpurAvoided = 0;
pAS_Info->nSpursFound = 0;
@@
-935,14
+935,14
@@
static u32 MT2063_AvoidSpurs(struct MT2063_AvoidSpursData_t *pAS_Info)
*
* This function returns 0, if no lock, 1 if locked and a value < 1 if error
*/
*
* This function returns 0, if no lock, 1 if locked and a value < 1 if error
*/
-static
unsigned
int mt2063_lockStatus(struct mt2063_state *state)
+static int mt2063_lockStatus(struct mt2063_state *state)
{
const u32 nMaxWait = 100; /* wait a maximum of 100 msec */
const u32 nPollRate = 2; /* poll status bits every 2 ms */
const u32 nMaxLoops = nMaxWait / nPollRate;
const u8 LO1LK = 0x80;
u8 LO2LK = 0x08;
{
const u32 nMaxWait = 100; /* wait a maximum of 100 msec */
const u32 nPollRate = 2; /* poll status bits every 2 ms */
const u32 nMaxLoops = nMaxWait / nPollRate;
const u8 LO1LK = 0x80;
u8 LO2LK = 0x08;
-
u32
status;
+
int
status;
u32 nDelays = 0;
dprintk(2, "\n");
u32 nDelays = 0;
dprintk(2, "\n");
@@
-1069,7
+1069,7
@@
static u32 mt2063_get_dnc_output_enable(struct mt2063_state *state,
static u32 mt2063_set_dnc_output_enable(struct mt2063_state *state,
enum MT2063_DNC_Output_Enable nValue)
{
static u32 mt2063_set_dnc_output_enable(struct mt2063_state *state,
enum MT2063_DNC_Output_Enable nValue)
{
-
u32
status = 0; /* Status to be returned */
+
int
status = 0; /* Status to be returned */
u8 val = 0;
dprintk(2, "\n");
u8 val = 0;
dprintk(2, "\n");
@@
-1203,7
+1203,7
@@
static u32 mt2063_set_dnc_output_enable(struct mt2063_state *state,
static u32 MT2063_SetReceiverMode(struct mt2063_state *state,
enum mt2063_delivery_sys Mode)
{
static u32 MT2063_SetReceiverMode(struct mt2063_state *state,
enum mt2063_delivery_sys Mode)
{
-
u32
status = 0; /* Status to be returned */
+
int
status = 0; /* Status to be returned */
u8 val;
u32 longval;
u8 val;
u32 longval;
@@
-1345,7
+1345,7
@@
static u32 MT2063_SetReceiverMode(struct mt2063_state *state,
static u32 MT2063_ClearPowerMaskBits(struct mt2063_state *state,
enum MT2063_Mask_Bits Bits)
{
static u32 MT2063_ClearPowerMaskBits(struct mt2063_state *state,
enum MT2063_Mask_Bits Bits)
{
-
u32
status = 0;
+
int
status = 0;
dprintk(2, "\n");
Bits = (enum MT2063_Mask_Bits)(Bits & MT2063_ALL_SD); /* Only valid bits for this tuner */
dprintk(2, "\n");
Bits = (enum MT2063_Mask_Bits)(Bits & MT2063_ALL_SD); /* Only valid bits for this tuner */
@@
-1374,7
+1374,7
@@
static u32 MT2063_ClearPowerMaskBits(struct mt2063_state *state,
*/
static u32 MT2063_SoftwareShutdown(struct mt2063_state *state, u8 Shutdown)
{
*/
static u32 MT2063_SoftwareShutdown(struct mt2063_state *state, u8 Shutdown)
{
-
u32
status;
+
int
status;
dprintk(2, "\n");
if (Shutdown == 1)
dprintk(2, "\n");
if (Shutdown == 1)
@@
-1540,7
+1540,7
@@
static u32 FindClearTuneFilter(struct mt2063_state *state, u32 f_in)
static u32 MT2063_Tune(struct mt2063_state *state, u32 f_in)
{ /* RF input center frequency */
static u32 MT2063_Tune(struct mt2063_state *state, u32 f_in)
{ /* RF input center frequency */
-
u32
status = 0;
+
int
status = 0;
u32 LO1; /* 1st LO register value */
u32 Num1; /* Numerator for LO1 reg. value */
u32 f_IF1; /* 1st IF requested */
u32 LO1; /* 1st LO register value */
u32 Num1; /* Numerator for LO1 reg. value */
u32 f_IF1; /* 1st IF requested */
@@
-1803,7
+1803,7
@@
static const u8 MT2063B3_defaults[] = {
static int mt2063_init(struct dvb_frontend *fe)
{
static int mt2063_init(struct dvb_frontend *fe)
{
-
u32
status;
+
int
status;
struct mt2063_state *state = fe->tuner_priv;
u8 all_resets = 0xF0; /* reset/load bits */
const u8 *def = NULL;
struct mt2063_state *state = fe->tuner_priv;
u8 all_resets = 0xF0; /* reset/load bits */
const u8 *def = NULL;
@@
-2249,8
+2249,8
@@
struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,
dprintk(2, "\n");
state = kzalloc(sizeof(struct mt2063_state), GFP_KERNEL);
dprintk(2, "\n");
state = kzalloc(sizeof(struct mt2063_state), GFP_KERNEL);
- if (
state == NULL
)
-
goto error
;
+ if (
!state
)
+
return NULL
;
state->config = config;
state->i2c = i2c;
state->config = config;
state->i2c = i2c;
@@
-2261,18
+2261,15
@@
struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,
printk(KERN_INFO "%s: Attaching MT2063\n", __func__);
return fe;
printk(KERN_INFO "%s: Attaching MT2063\n", __func__);
return fe;
-
-error:
- kfree(state);
- return NULL;
}
EXPORT_SYMBOL_GPL(mt2063_attach);
}
EXPORT_SYMBOL_GPL(mt2063_attach);
+#if 0
/*
* Ancillary routines visible outside mt2063
* FIXME: Remove them in favor of using standard tuner callbacks
*/
/*
* Ancillary routines visible outside mt2063
* FIXME: Remove them in favor of using standard tuner callbacks
*/
-
unsigned
int tuner_MT2063_SoftwareShutdown(struct dvb_frontend *fe)
+
static
int tuner_MT2063_SoftwareShutdown(struct dvb_frontend *fe)
{
struct mt2063_state *state = fe->tuner_priv;
int err = 0;
{
struct mt2063_state *state = fe->tuner_priv;
int err = 0;
@@
-2285,9
+2282,8
@@
unsigned int tuner_MT2063_SoftwareShutdown(struct dvb_frontend *fe)
return err;
}
return err;
}
-EXPORT_SYMBOL_GPL(tuner_MT2063_SoftwareShutdown);
-
unsigned
int tuner_MT2063_ClearPowerMaskBits(struct dvb_frontend *fe)
+
static
int tuner_MT2063_ClearPowerMaskBits(struct dvb_frontend *fe)
{
struct mt2063_state *state = fe->tuner_priv;
int err = 0;
{
struct mt2063_state *state = fe->tuner_priv;
int err = 0;
@@
-2300,7
+2296,7
@@
unsigned int tuner_MT2063_ClearPowerMaskBits(struct dvb_frontend *fe)
return err;
}
return err;
}
-EXPORT_SYMBOL_GPL(tuner_MT2063_ClearPowerMaskBits);
+#endif
MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
MODULE_DESCRIPTION("MT2063 Silicon tuner");
MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
MODULE_DESCRIPTION("MT2063 Silicon tuner");