Skip to content

L
linux
Commit e059b0fa authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (7628): au8522: codingstyle cleanups 

Fixed some checkpatch.pl warnings
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent f07e8e4b
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 39 deletions
drivers/media/dvb/frontends/au8522.c
View file @ e059b0fa
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
struct au8522_state { struct au8522_state {
struct i2c_adapter* i2c; struct i2c_adapter *i2c;
/* configuration settings */ /* configuration settings */
const struct au8522_config* config; const struct au8522_config *config;
struct dvb_frontend frontend; struct dvb_frontend frontend;
...@@ -47,7 +47,7 @@ static int debug = 0; ...@@ -47,7 +47,7 @@ static int debug = 0;
#define dprintk if (debug) printk #define dprintk if (debug) printk
/* 16 bit registers, 8 bit values */ /* 16 bit registers, 8 bit values */
static int au8522_writereg(struct au8522_state* state, u16 reg, u8 data) static int au8522_writereg(struct au8522_state *state, u16 reg, u8 data)
{ {
int ret; int ret;
u8 buf [] = { reg >> 8, reg & 0xff, data }; u8 buf [] = { reg >> 8, reg & 0xff, data };
...@@ -64,7 +64,7 @@ static int au8522_writereg(struct au8522_state* state, u16 reg, u8 data) ...@@ -64,7 +64,7 @@ static int au8522_writereg(struct au8522_state* state, u16 reg, u8 data)
return (ret != 1) ? -1 : 0; return (ret != 1) ? -1 : 0;
} }
static u8 au8522_readreg(struct au8522_state* state, u16 reg) static u8 au8522_readreg(struct au8522_state *state, u16 reg)
{ {
int ret; int ret;
u8 b0 [] = { reg >> 8, reg & 0xff }; u8 b0 [] = { reg >> 8, reg & 0xff };
...@@ -83,9 +83,9 @@ static u8 au8522_readreg(struct au8522_state* state, u16 reg) ...@@ -83,9 +83,9 @@ static u8 au8522_readreg(struct au8522_state* state, u16 reg)
return b1[0]; return b1[0];
} }
static int au8522_i2c_gate_ctrl(struct dvb_frontend* fe, int enable) static int au8522_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
{ {
struct au8522_state* state = fe->demodulator_priv; struct au8522_state *state = fe->demodulator_priv;
dprintk("%s(%d)\n", __FUNCTION__, enable); dprintk("%s(%d)\n", __FUNCTION__, enable);
...@@ -95,10 +95,10 @@ static int au8522_i2c_gate_ctrl(struct dvb_frontend* fe, int enable) ...@@ -95,10 +95,10 @@ static int au8522_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
return au8522_writereg(state, 0x106, 0); return au8522_writereg(state, 0x106, 0);
} }
static int au8522_enable_modulation(struct dvb_frontend* fe, static int au8522_enable_modulation(struct dvb_frontend *fe,
fe_modulation_t m) fe_modulation_t m)
{ {
struct au8522_state* state = fe->demodulator_priv; struct au8522_state *state = fe->demodulator_priv;
dprintk("%s(0x%08x)\n", __FUNCTION__, m); dprintk("%s(0x%08x)\n", __FUNCTION__, m);
...@@ -230,10 +230,10 @@ static int au8522_enable_modulation(struct dvb_frontend* fe, ...@@ -230,10 +230,10 @@ static int au8522_enable_modulation(struct dvb_frontend* fe,
} }
/* Talk to the demod, set the FEC, GUARD, QAM settings etc */ /* Talk to the demod, set the FEC, GUARD, QAM settings etc */
static int au8522_set_frontend (struct dvb_frontend* fe, static int au8522_set_frontend(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p) struct dvb_frontend_parameters *p)
{ {
struct au8522_state* state = fe->demodulator_priv; struct au8522_state *state = fe->demodulator_priv;
dprintk("%s(frequency=%d)\n", __FUNCTION__, p->frequency); dprintk("%s(frequency=%d)\n", __FUNCTION__, p->frequency);
...@@ -255,9 +255,9 @@ static int au8522_set_frontend (struct dvb_frontend* fe, ...@@ -255,9 +255,9 @@ static int au8522_set_frontend (struct dvb_frontend* fe,
/* Reset the demod hardware and reset all of the configuration registers /* Reset the demod hardware and reset all of the configuration registers
to a default state. */ to a default state. */
static int au8522_init(struct dvb_frontend* fe) static int au8522_init(struct dvb_frontend *fe)
{ {
struct au8522_state* state = fe->demodulator_priv; struct au8522_state *state = fe->demodulator_priv;
dprintk("%s()\n", __FUNCTION__); dprintk("%s()\n", __FUNCTION__);
au8522_writereg(state, 0xa4, 1 << 5); au8522_writereg(state, 0xa4, 1 << 5);
...@@ -267,9 +267,9 @@ static int au8522_init(struct dvb_frontend* fe) ...@@ -267,9 +267,9 @@ static int au8522_init(struct dvb_frontend* fe)
return 0; return 0;
} }
static int au8522_read_status(struct dvb_frontend* fe, fe_status_t* status) static int au8522_read_status(struct dvb_frontend *fe, fe_status_t *status)
{ {
struct au8522_state* state = fe->demodulator_priv; struct au8522_state *state = fe->demodulator_priv;
u8 reg; u8 reg;
u32 tuner_status = 0; u32 tuner_status = 0;
...@@ -279,16 +279,16 @@ static int au8522_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -279,16 +279,16 @@ static int au8522_read_status(struct dvb_frontend* fe, fe_status_t* status)
dprintk("%s() Checking VSB_8\n", __FUNCTION__); dprintk("%s() Checking VSB_8\n", __FUNCTION__);
//au8522_writereg(state, 0x80a4, 0x20); //au8522_writereg(state, 0x80a4, 0x20);
reg = au8522_readreg(state, 0x4088); reg = au8522_readreg(state, 0x4088);
if(reg & 0x01) if (reg & 0x01)
*status |= FE_HAS_VITERBI; *status |= FE_HAS_VITERBI;
if(reg & 0x02) if (reg & 0x02)
*status |= FE_HAS_LOCK | FE_HAS_SYNC; *status |= FE_HAS_LOCK | FE_HAS_SYNC;
} else { } else {
dprintk("%s() Checking QAM\n", __FUNCTION__); dprintk("%s() Checking QAM\n", __FUNCTION__);
reg = au8522_readreg(state, 0x4541); reg = au8522_readreg(state, 0x4541);
if(reg & 0x80) if (reg & 0x80)
*status |= FE_HAS_VITERBI; *status |= FE_HAS_VITERBI;
if(reg & 0x20) if (reg & 0x20)
*status |= FE_HAS_LOCK | FE_HAS_SYNC; *status |= FE_HAS_LOCK | FE_HAS_SYNC;
} }
...@@ -320,7 +320,7 @@ static int au8522_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -320,7 +320,7 @@ static int au8522_read_status(struct dvb_frontend* fe, fe_status_t* status)
return 0; return 0;
} }
static int au8522_read_snr(struct dvb_frontend* fe, u16* snr) static int au8522_read_snr(struct dvb_frontend *fe, u16 *snr)
{ {
dprintk("%s()\n", __FUNCTION__); dprintk("%s()\n", __FUNCTION__);
...@@ -329,30 +329,30 @@ static int au8522_read_snr(struct dvb_frontend* fe, u16* snr) ...@@ -329,30 +329,30 @@ static int au8522_read_snr(struct dvb_frontend* fe, u16* snr)
return 0; return 0;
} }
static int au8522_read_signal_strength(struct dvb_frontend* fe, static int au8522_read_signal_strength(struct dvb_frontend *fe,
u16* signal_strength) u16 *signal_strength)
{ {
return au8522_read_snr(fe, signal_strength); return au8522_read_snr(fe, signal_strength);
} }
static int au8522_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) static int au8522_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
{ {
struct au8522_state* state = fe->demodulator_priv; struct au8522_state *state = fe->demodulator_priv;
*ucblocks = au8522_readreg(state, 0x4087); *ucblocks = au8522_readreg(state, 0x4087);
return 0; return 0;
} }
static int au8522_read_ber(struct dvb_frontend* fe, u32* ber) static int au8522_read_ber(struct dvb_frontend *fe, u32 *ber)
{ {
return au8522_read_ucblocks(fe, ber); return au8522_read_ucblocks(fe, ber);
} }
static int au8522_get_frontend(struct dvb_frontend* fe, static int au8522_get_frontend(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p) struct dvb_frontend_parameters *p)
{ {
struct au8522_state* state = fe->demodulator_priv; struct au8522_state *state = fe->demodulator_priv;
p->frequency = state->current_frequency; p->frequency = state->current_frequency;
p->u.vsb.modulation = state->current_modulation; p->u.vsb.modulation = state->current_modulation;
...@@ -360,25 +360,25 @@ static int au8522_get_frontend(struct dvb_frontend* fe, ...@@ -360,25 +360,25 @@ static int au8522_get_frontend(struct dvb_frontend* fe,
return 0; return 0;
} }
static int au8522_get_tune_settings(struct dvb_frontend* fe, static int au8522_get_tune_settings(struct dvb_frontend *fe,
struct dvb_frontend_tune_settings *tune) struct dvb_frontend_tune_settings *tune)
{ {
tune->min_delay_ms = 1000; tune->min_delay_ms = 1000;
return 0; return 0;
} }
static void au8522_release(struct dvb_frontend* fe) static void au8522_release(struct dvb_frontend *fe)
{ {
struct au8522_state* state = fe->demodulator_priv; struct au8522_state *state = fe->demodulator_priv;
kfree(state); kfree(state);
} }
static struct dvb_frontend_ops au8522_ops; static struct dvb_frontend_ops au8522_ops;
struct dvb_frontend* au8522_attach(const struct au8522_config* config, struct dvb_frontend *au8522_attach(const struct au8522_config *config,
struct i2c_adapter* i2c) struct i2c_adapter *i2c)
{ {
struct au8522_state* state = NULL; struct au8522_state *state = NULL;
/* allocate memory for the internal state */ /* allocate memory for the internal state */
state = kmalloc(sizeof(struct au8522_state), GFP_KERNEL); state = kmalloc(sizeof(struct au8522_state), GFP_KERNEL);
......
drivers/media/dvb/frontends/au8522.h
View file @ e059b0fa
...@@ -36,11 +36,12 @@ struct au8522_config ...@@ -36,11 +36,12 @@ struct au8522_config
}; };
#if defined(CONFIG_DVB_AU8522) || (defined(CONFIG_DVB_AU8522_MODULE) && defined(MODULE)) #if defined(CONFIG_DVB_AU8522) || (defined(CONFIG_DVB_AU8522_MODULE) && defined(MODULE))
extern struct dvb_frontend* au8522_attach(const struct au8522_config* config, extern struct dvb_frontend *au8522_attach(const struct au8522_config *config,
struct i2c_adapter* i2c); struct i2c_adapter *i2c);
#else #else
static inline struct dvb_frontend* au8522_attach(const struct au8522_config* config, static inline
struct i2c_adapter* i2c) struct dvb_frontend *au8522_attach(const struct au8522_config *config,
struct i2c_adapter *i2c)
{ {
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
return NULL; return NULL;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7