From e0bae9b33a406465bce6f38e9aaeef1ebfcfb461 Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Wed, 4 May 2011 17:23:09 -0300
Subject: [PATCH] [media] cx24116: make FW DL split more readable
Change firmware download split, which I introduced few patch earlier,
a little bit to make it more readable as requested [1].
Anyhow, for some reason this seems to increase compiled binary size
52 bytes, on my AMD64 box, which is rather much for so small change.
[1] http://www.spinics.net/lists/linux-media/msg31968.html
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/dvb/frontends/cx24116.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c
index 26e65a66719a..95c6465b87a1 100644
--- a/drivers/media/dvb/frontends/cx24116.c
+++ b/drivers/media/dvb/frontends/cx24116.c
@@ -566,7 +566,7 @@ static int cx24116_load_firmware(struct dvb_frontend *fe,
{
struct cx24116_state *state = fe->demodulator_priv;
struct cx24116_cmd cmd;
- int i, ret, len, remaining;
+ int i, ret, len, max, remaining;
unsigned char vers[4];
dprintk("%s\n", __func__);
@@ -604,14 +604,16 @@ static int cx24116_load_firmware(struct dvb_frontend *fe,
cx24116_writereg(state, 0xF6, 0x00);
/* Split firmware to the max I2C write len and write.
- * This overflows 16 bit intentionally in order to get max write
- * len when i2c_wr_max is set to 0. */
- for (remaining = fw->size; remaining > 0;
- remaining -= (u16) (state->config->i2c_wr_max - 1)) {
+ * Writes whole firmware as one write when i2c_wr_max is set to 0. */
+ if (state->config->i2c_wr_max)
+ max = state->config->i2c_wr_max;
+ else
+ max = INT_MAX; /* enough for 32k firmware */
+ for (remaining = fw->size; remaining > 0; remaining -= max - 1) {
len = remaining;
- if (len > (u16) (state->config->i2c_wr_max - 1))
- len = (u16) (state->config->i2c_wr_max - 1);
+ if (len > max - 1)
+ len = max - 1;
cx24116_writeregN(state, 0xF7, &fw->data[fw->size - remaining],
len);
--
GitLab