1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/media/video/cx18/cx18-io.c b/drivers/media/video/cx18/cx18-io.c
index 220fae8d4ad7..0ad8dea3e600 100644
--- a/drivers/media/video/cx18/cx18-io.c
+++ b/drivers/media/video/cx18/cx18-io.c
@@ -31,10 +31,10 @@ void cx18_log_statistics(struct cx18 *cx)
         if (!(cx18_debug & CX18_DBGFLG_INFO))
                 return;
 
-        for (i = 0; i <= CX18_MAX_MMIO_RETRIES; i++)
+        for (i = 0; i <= CX18_MAX_MMIO_WR_RETRIES; i++)
                 CX18_DEBUG_INFO("retried_write[%d] = %d\n", i,
                                 atomic_read(&cx->mmio_stats.retried_write[i]));
-        for (i = 0; i <= CX18_MAX_MMIO_RETRIES; i++)
+        for (i = 0; i <= CX18_MAX_MMIO_RD_RETRIES; i++)
                 CX18_DEBUG_INFO("retried_read[%d] = %d\n", i,
                                 atomic_read(&cx->mmio_stats.retried_read[i]));
         return;
@@ -43,7 +43,7 @@ void cx18_log_statistics(struct cx18 *cx)
 void cx18_raw_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr)
 {
         int i;
-        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+        for (i = 0; i < CX18_MAX_MMIO_WR_RETRIES; i++) {
                 cx18_raw_writel_noretry(cx, val, addr);
                 if (val == cx18_raw_readl_noretry(cx, addr))
                         break;
@@ -55,7 +55,7 @@ u32 cx18_raw_readl_retry(struct cx18 *cx, const void __iomem *addr)
 {
         int i;
         u32 val;
-        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+        for (i = 0; i < CX18_MAX_MMIO_RD_RETRIES; i++) {
                 val = cx18_raw_readl_noretry(cx, addr);
                 if (val != 0xffffffff) /* PCI bus read error */
                         break;
@@ -68,7 +68,7 @@ u16 cx18_raw_readw_retry(struct cx18 *cx, const void __iomem *addr)
 {
         int i;
         u16 val;
-        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+        for (i = 0; i < CX18_MAX_MMIO_RD_RETRIES; i++) {
                 val = cx18_raw_readw_noretry(cx, addr);
                 if (val != 0xffff) /* PCI bus read error */
                         break;
@@ -80,7 +80,7 @@ u16 cx18_raw_readw_retry(struct cx18 *cx, const void __iomem *addr)
 void cx18_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr)
 {
         int i;
-        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+        for (i = 0; i < CX18_MAX_MMIO_WR_RETRIES; i++) {
                 cx18_writel_noretry(cx, val, addr);
                 if (val == cx18_readl_noretry(cx, addr))
                         break;
@@ -93,7 +93,7 @@ void _cx18_writel_expect(struct cx18 *cx, u32 val, void __iomem *addr,
 {
         int i;
         eval &= mask;
-        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+        for (i = 0; i < CX18_MAX_MMIO_WR_RETRIES; i++) {
                 cx18_writel_noretry(cx, val, addr);
                 if (eval == (cx18_readl_noretry(cx, addr) & mask))
                         break;
@@ -104,7 +104,7 @@ void _cx18_writel_expect(struct cx18 *cx, u32 val, void __iomem *addr,
 void cx18_writew_retry(struct cx18 *cx, u16 val, void __iomem *addr)
 {
         int i;
-        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+        for (i = 0; i < CX18_MAX_MMIO_WR_RETRIES; i++) {
                 cx18_writew_noretry(cx, val, addr);
                 if (val == cx18_readw_noretry(cx, addr))
                         break;
@@ -115,7 +115,7 @@ void cx18_writew_retry(struct cx18 *cx, u16 val, void __iomem *addr)
 void cx18_writeb_retry(struct cx18 *cx, u8 val, void __iomem *addr)
 {
         int i;
-        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+        for (i = 0; i < CX18_MAX_MMIO_WR_RETRIES; i++) {
                 cx18_writeb_noretry(cx, val, addr);
                 if (val == cx18_readb_noretry(cx, addr))
                         break;
@@ -127,7 +127,7 @@ u32 cx18_readl_retry(struct cx18 *cx, const void __iomem *addr)
 {
         int i;
         u32 val;
-        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+        for (i = 0; i < CX18_MAX_MMIO_RD_RETRIES; i++) {
                 val = cx18_readl_noretry(cx, addr);
                 if (val != 0xffffffff) /* PCI bus read error */
                         break;
@@ -140,7 +140,7 @@ u16 cx18_readw_retry(struct cx18 *cx, const void __iomem *addr)
 {
         int i;
         u16 val;
-        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+        for (i = 0; i < CX18_MAX_MMIO_RD_RETRIES; i++) {
                 val = cx18_readw_noretry(cx, addr);
                 if (val != 0xffff) /* PCI bus read error */
                         break;
@@ -153,7 +153,7 @@ u8 cx18_readb_retry(struct cx18 *cx, const void __iomem *addr)
 {
         int i;
         u8 val;
-        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+        for (i = 0; i < CX18_MAX_MMIO_RD_RETRIES; i++) {
                 val = cx18_readb_noretry(cx, addr);
                 if (val != 0xff) /* PCI bus read error */
                         break;