diff options
author | Antti Palosaari <crope@iki.fi> | 2014-08-09 13:59:53 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-09-21 16:43:23 -0400 |
commit | 24e419a0f383e626092eb3c13097b691d2923735 (patch) | |
tree | a1387de43ebf2576302c9d32f3f609914a943df2 | |
parent | c10989a2a86aa8f6eff9115f67bab55304e2dd0d (diff) |
[media] af9033: make checkpatch.pl happy
Correct issues reported by checkpatch.pl.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | drivers/media/dvb-frontends/af9033.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c index 2a4dfd2f9679..7f22f011f8f5 100644 --- a/drivers/media/dvb-frontends/af9033.c +++ b/drivers/media/dvb-frontends/af9033.c | |||
@@ -69,8 +69,9 @@ static int af9033_wr_regs(struct af9033_state *state, u32 reg, const u8 *val, | |||
69 | if (ret == 1) { | 69 | if (ret == 1) { |
70 | ret = 0; | 70 | ret = 0; |
71 | } else { | 71 | } else { |
72 | dev_warn(&state->i2c->dev, "%s: i2c wr failed=%d reg=%06x " \ | 72 | dev_warn(&state->i2c->dev, |
73 | "len=%d\n", KBUILD_MODNAME, ret, reg, len); | 73 | "%s: i2c wr failed=%d reg=%06x len=%d\n", |
74 | KBUILD_MODNAME, ret, reg, len); | ||
74 | ret = -EREMOTEIO; | 75 | ret = -EREMOTEIO; |
75 | } | 76 | } |
76 | 77 | ||
@@ -101,8 +102,9 @@ static int af9033_rd_regs(struct af9033_state *state, u32 reg, u8 *val, int len) | |||
101 | if (ret == 2) { | 102 | if (ret == 2) { |
102 | ret = 0; | 103 | ret = 0; |
103 | } else { | 104 | } else { |
104 | dev_warn(&state->i2c->dev, "%s: i2c rd failed=%d reg=%06x " \ | 105 | dev_warn(&state->i2c->dev, |
105 | "len=%d\n", KBUILD_MODNAME, ret, reg, len); | 106 | "%s: i2c rd failed=%d reg=%06x len=%d\n", |
107 | KBUILD_MODNAME, ret, reg, len); | ||
106 | ret = -EREMOTEIO; | 108 | ret = -EREMOTEIO; |
107 | } | 109 | } |
108 | 110 | ||
@@ -835,7 +837,7 @@ static int af9033_read_snr(struct dvb_frontend *fe, u16 *snr) | |||
835 | int ret, i, len; | 837 | int ret, i, len; |
836 | u8 buf[3], tmp; | 838 | u8 buf[3], tmp; |
837 | u32 snr_val; | 839 | u32 snr_val; |
838 | const struct val_snr *uninitialized_var(snr_lut); | 840 | const struct val_snr *snr_lut; |
839 | 841 | ||
840 | /* read value */ | 842 | /* read value */ |
841 | ret = af9033_rd_regs(state, 0x80002c, buf, 3); | 843 | ret = af9033_rd_regs(state, 0x80002c, buf, 3); |
@@ -928,7 +930,9 @@ static int af9033_update_ch_stat(struct af9033_state *state) | |||
928 | abort_cnt = 1000; | 930 | abort_cnt = 1000; |
929 | state->ber = 0xffffffff; | 931 | state->ber = 0xffffffff; |
930 | } else { | 932 | } else { |
931 | /* 8 byte packets, that have not been rejected already */ | 933 | /* |
934 | * 8 byte packets, that have not been rejected already | ||
935 | */ | ||
932 | bit_cnt -= (u32)abort_cnt; | 936 | bit_cnt -= (u32)abort_cnt; |
933 | if (bit_cnt == 0) { | 937 | if (bit_cnt == 0) { |
934 | state->ber = 0xffffffff; | 938 | state->ber = 0xffffffff; |
@@ -1015,7 +1019,8 @@ err: | |||
1015 | return ret; | 1019 | return ret; |
1016 | } | 1020 | } |
1017 | 1021 | ||
1018 | static int af9033_pid_filter(struct dvb_frontend *fe, int index, u16 pid, int onoff) | 1022 | static int af9033_pid_filter(struct dvb_frontend *fe, int index, u16 pid, |
1023 | int onoff) | ||
1019 | { | 1024 | { |
1020 | struct af9033_state *state = fe->demodulator_priv; | 1025 | struct af9033_state *state = fe->demodulator_priv; |
1021 | int ret; | 1026 | int ret; |
@@ -1069,8 +1074,8 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config, | |||
1069 | memcpy(&state->cfg, config, sizeof(struct af9033_config)); | 1074 | memcpy(&state->cfg, config, sizeof(struct af9033_config)); |
1070 | 1075 | ||
1071 | if (state->cfg.clock != 12000000) { | 1076 | if (state->cfg.clock != 12000000) { |
1072 | dev_err(&state->i2c->dev, "%s: af9033: unsupported clock=%d, " \ | 1077 | dev_err(&state->i2c->dev, |
1073 | "only 12000000 Hz is supported currently\n", | 1078 | "%s: af9033: unsupported clock=%d, only 12000000 Hz is supported currently\n", |
1074 | KBUILD_MODNAME, state->cfg.clock); | 1079 | KBUILD_MODNAME, state->cfg.clock); |
1075 | goto err; | 1080 | goto err; |
1076 | } | 1081 | } |
@@ -1084,9 +1089,10 @@ struct dvb_frontend *af9033_attach(const struct af9033_config *config, | |||
1084 | if (ret < 0) | 1089 | if (ret < 0) |
1085 | goto err; | 1090 | goto err; |
1086 | 1091 | ||
1087 | dev_info(&state->i2c->dev, "%s: firmware version: LINK=%d.%d.%d.%d " \ | 1092 | dev_info(&state->i2c->dev, |
1088 | "OFDM=%d.%d.%d.%d\n", KBUILD_MODNAME, buf[0], buf[1], | 1093 | "%s: firmware version: LINK=%d.%d.%d.%d OFDM=%d.%d.%d.%d\n", |
1089 | buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]); | 1094 | KBUILD_MODNAME, buf[0], buf[1], buf[2], buf[3], buf[4], |
1095 | buf[5], buf[6], buf[7]); | ||
1090 | 1096 | ||
1091 | /* sleep */ | 1097 | /* sleep */ |
1092 | switch (state->cfg.tuner) { | 1098 | switch (state->cfg.tuner) { |