summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18/cx18-av-firmware.c
diff options
context:
space:
mode:
authorAndy Walls <awalls@radix.net>2008-11-16 21:33:41 -0500
committerAndy Walls <awalls@radix.net>2008-11-16 21:33:41 -0500
commit41442c233ecb6016a8d6c73ff23002138488e42b (patch)
tree89918fc74deba9cd43bd29e75d896d48dbe22b07 /linux/drivers/media/video/cx18/cx18-av-firmware.c
parentc01ba77a68ca36f759d9ff6f85edadd4de41cca1 (diff)
downloadmediapointer-dvb-s2-41442c233ecb6016a8d6c73ff23002138488e42b.tar.gz
mediapointer-dvb-s2-41442c233ecb6016a8d6c73ff23002138488e42b.tar.bz2
cx18: Streamline cx18-io[ch] wrappers and enforce MMIO retry strategy
From: Andy Walls <awalls@radix.net> cx18: Streamline cx18-io[ch] wrappers and enforce MMIO retry strategy so that write retries always occur and read retries never occur (as they never help). Remove MMIO statistics logging to speed up MMIO accesses. Deprecate & ignore retry_mmio and mmio_ndelay module parameters, to essentially force retry_mmio=1 and mmio_ndelay=0. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-av-firmware.c')
-rw-r--r--linux/drivers/media/video/cx18/cx18-av-firmware.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-av-firmware.c b/linux/drivers/media/video/cx18/cx18-av-firmware.c
index 924691dca..cf52e08c2 100644
--- a/linux/drivers/media/video/cx18/cx18-av-firmware.c
+++ b/linux/drivers/media/video/cx18/cx18-av-firmware.c
@@ -68,8 +68,7 @@ int cx18_av_loadfw(struct cx18 *cx)
cx18_av_write4_noretry(cx, CXADEC_DL_CTL,
dl_control);
udelay(10);
- value = cx18_av_read4_noretry(cx,
- CXADEC_DL_CTL);
+ value = cx18_av_read4(cx, CXADEC_DL_CTL);
if (value == dl_control)
break;
/* Check if we can correct the byte by changing
@@ -80,8 +79,6 @@ int cx18_av_loadfw(struct cx18 *cx)
break;
}
}
- cx18_log_write_retries(cx, retries2,
- cx->reg_mem + 0xc40000 + CXADEC_DL_CTL);
if (unrec_err || retries2 >= CX18_MAX_MMIO_WR_RETRIES)
break;
}