summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorJohannes Stezenbach <devnull@localhost>2005-05-05 20:39:05 +0000
committerJohannes Stezenbach <devnull@localhost>2005-05-05 20:39:05 +0000
commit8452e387b8259b5039dff667df7b690fc6e038d6 (patch)
treeb227332dc2f505c72e31a69c778e215aa8a73ffb /linux
parent5ae2dd3d81b98e804e5af9abcab009d82bbb0a30 (diff)
downloadmediapointer-dvb-s2-8452e387b8259b5039dff667df7b690fc6e038d6.tar.gz
mediapointer-dvb-s2-8452e387b8259b5039dff667df7b690fc6e038d6.tar.bz2
sync back cleanups from kernel (whitespace and printk format)
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/dvb/frontends/nxt2002.c2
-rw-r--r--linux/drivers/media/dvb/frontends/or51132.c14
-rw-r--r--linux/drivers/media/dvb/frontends/or51211.c4
3 files changed, 10 insertions, 10 deletions
diff --git a/linux/drivers/media/dvb/frontends/nxt2002.c b/linux/drivers/media/dvb/frontends/nxt2002.c
index 30b30aca3..35a1d60f1 100644
--- a/linux/drivers/media/dvb/frontends/nxt2002.c
+++ b/linux/drivers/media/dvb/frontends/nxt2002.c
@@ -246,7 +246,7 @@ static int nxt2002_load_firmware (struct dvb_frontend* fe, const struct firmware
u16 rambase,position,crc = 0;
dprintk("%s\n", __FUNCTION__);
- dprintk("Firmware is %d bytes\n",fw->size);
+ dprintk("Firmware is %zu bytes\n",fw->size);
/* Get the RAM base for this nxt2002 */
i2c_readbytes(state,0x10,buf,1);
diff --git a/linux/drivers/media/dvb/frontends/or51132.c b/linux/drivers/media/dvb/frontends/or51132.c
index 49dda50ec..cc0a77c79 100644
--- a/linux/drivers/media/dvb/frontends/or51132.c
+++ b/linux/drivers/media/dvb/frontends/or51132.c
@@ -58,7 +58,7 @@ struct or51132_state
const struct or51132_config* config;
struct dvb_frontend frontend;
-
+
/* Demodulator private data */
fe_modulation_t current_modulation;
@@ -138,7 +138,7 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware
return ret;
}
- /* Wait at least 5 msec */
+ /* Wait at least 5 msec */
msleep(20); /* 10ms */
if ((ret = i2c_writebytes(state,state->config->demod_address,
@@ -190,7 +190,7 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware
get_ver_buf[4] = i+1;
if ((ret = i2c_readbytes(state,state->config->demod_address,
&rec_buf[i*2],2))) {
- printk(KERN_WARNING
+ printk(KERN_WARNING
"or51132: load_firmware error d - %d\n",i);
return ret;
}
@@ -326,7 +326,7 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
dprintk("set_parameters VSB MODE\n");
printk("or51132: Waiting for firmware upload(%s)...\n",
OR51132_VSB_FIRMWARE);
- ret = request_firmware(&fw, OR51132_VSB_FIRMWARE,
+ ret = request_firmware(&fw, OR51132_VSB_FIRMWARE,
&state->i2c->dev);
if (ret){
printk(KERN_WARNING "or51132: No firmware up"
@@ -342,7 +342,7 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
dprintk("set_parameters QAM MODE\n");
printk("or51132: Waiting for firmware upload(%s)...\n",
OR51132_QAM_FIRMWARE);
- ret = request_firmware(&fw, OR51132_QAM_FIRMWARE,
+ ret = request_firmware(&fw, OR51132_QAM_FIRMWARE,
&state->i2c->dev);
if (ret){
printk(KERN_WARNING "or51132: No firmware up"
@@ -379,10 +379,10 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
if (i2c_writebytes(state, state->config->pll_address ,buf, 4))
printk(KERN_WARNING "or51132: set_parameters error "
"writing to tuner\n");
-
+
/* Set to current mode */
or51132_setmode(fe);
-
+
/* Update current frequency */
state->current_frequency = param->frequency;
}
diff --git a/linux/drivers/media/dvb/frontends/or51211.c b/linux/drivers/media/dvb/frontends/or51211.c
index f8525f585..ad56a9958 100644
--- a/linux/drivers/media/dvb/frontends/or51211.c
+++ b/linux/drivers/media/dvb/frontends/or51211.c
@@ -572,7 +572,7 @@ struct dvb_frontend* or51211_attach(const struct or51211_config* config,
/* Allocate memory for the internal state */
state = kmalloc(sizeof(struct or51211_state), GFP_KERNEL);
- if (state == NULL)
+ if (state == NULL)
goto error;
/* Setup the state */
@@ -602,7 +602,7 @@ static struct dvb_frontend_ops or51211_ops = {
.frequency_stepsize = 166666,
.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
- FE_CAN_8VSB
+ FE_CAN_8VSB
},
.release = or51211_release,