diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/mantis/mantis_hif.c | 10 | ||||
-rw-r--r-- | drivers/media/dvb/mantis/mantis_link.h | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c index 6c51d1780015..621dce3eb5d6 100644 --- a/drivers/media/dvb/mantis/mantis_hif.c +++ b/drivers/media/dvb/mantis/mantis_hif.c | |||
@@ -97,17 +97,13 @@ int mantis_hif_write_mem(struct mantis_ca *ca, u32 addr, u8 data) | |||
97 | hif_addr |= addr; | 97 | hif_addr |= addr; |
98 | 98 | ||
99 | mmwrite(slot->slave_cfg, MANTIS_GPIF_CFGSLA); /* Slot0 alone for now */ | 99 | mmwrite(slot->slave_cfg, MANTIS_GPIF_CFGSLA); /* Slot0 alone for now */ |
100 | |||
101 | mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR); | 100 | mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR); |
102 | mmwrite(data, MANTIS_GPIF_DOUT); | 101 | mmwrite(data, MANTIS_GPIF_DOUT); |
103 | ca->hif_job_queue = MANTIS_HIF_MEMWR; | ||
104 | 102 | ||
105 | if (mantis_hif_sbuf_opdone_wait(ca) != 0) { | 103 | if (mantis_hif_sbuf_opdone_wait(ca) != 0) { |
106 | ca->hif_job_queue &= ~MANTIS_HIF_MEMWR; | ||
107 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num); | 104 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num); |
108 | return -EREMOTEIO; | 105 | return -EREMOTEIO; |
109 | } | 106 | } |
110 | ca->hif_job_queue &= ~MANTIS_HIF_MEMWR; | ||
111 | dprintk(verbose, MANTIS_DEBUG, 1, "Mem Write: (0x%02x to 0x%02x)", data, addr); | 107 | dprintk(verbose, MANTIS_DEBUG, 1, "Mem Write: (0x%02x to 0x%02x)", data, addr); |
112 | 108 | ||
113 | return 0; | 109 | return 0; |
@@ -125,14 +121,11 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr) | |||
125 | hif_addr |= addr; | 121 | hif_addr |= addr; |
126 | 122 | ||
127 | mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR); | 123 | mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR); |
128 | ca->hif_job_queue = MANTIS_HIF_IOMRD; | ||
129 | 124 | ||
130 | if (mantis_hif_sbuf_opdone_wait(ca) != 0) { | 125 | if (mantis_hif_sbuf_opdone_wait(ca) != 0) { |
131 | ca->hif_job_queue &= ~MANTIS_HIF_IOMRD; | ||
132 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num); | 126 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num); |
133 | return -EREMOTEIO; | 127 | return -EREMOTEIO; |
134 | } | 128 | } |
135 | ca->hif_job_queue &= ~MANTIS_HIF_IOMRD; | ||
136 | data = mmread(MANTIS_GPIF_DIN); | 129 | data = mmread(MANTIS_GPIF_DIN); |
137 | dprintk(verbose, MANTIS_DEBUG, 1, "I/O Read: 0x%02x", data); | 130 | dprintk(verbose, MANTIS_DEBUG, 1, "I/O Read: 0x%02x", data); |
138 | udelay(50); | 131 | udelay(50); |
@@ -154,13 +147,10 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data) | |||
154 | mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR); | 147 | mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR); |
155 | mmwrite(data, MANTIS_GPIF_DOUT); | 148 | mmwrite(data, MANTIS_GPIF_DOUT); |
156 | 149 | ||
157 | ca->hif_job_queue = MANTIS_HIF_IOMWR; | ||
158 | if (mantis_hif_sbuf_opdone_wait(ca) != 0) { | 150 | if (mantis_hif_sbuf_opdone_wait(ca) != 0) { |
159 | ca->hif_job_queue &= ~MANTIS_HIF_IOMWR; | ||
160 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num); | 151 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num); |
161 | return -EREMOTEIO; | 152 | return -EREMOTEIO; |
162 | } | 153 | } |
163 | ca->hif_job_queue &= ~MANTIS_HIF_IOMWR; | ||
164 | dprintk(verbose, MANTIS_DEBUG, 1, "I/O Write: (0x%02x to 0x%02x)", data, addr); | 154 | dprintk(verbose, MANTIS_DEBUG, 1, "I/O Write: (0x%02x to 0x%02x)", data, addr); |
165 | udelay(50); | 155 | udelay(50); |
166 | 156 | ||
diff --git a/drivers/media/dvb/mantis/mantis_link.h b/drivers/media/dvb/mantis/mantis_link.h index 23ff2d6aadbc..a85f50215266 100644 --- a/drivers/media/dvb/mantis/mantis_link.h +++ b/drivers/media/dvb/mantis/mantis_link.h | |||
@@ -51,7 +51,6 @@ struct mantis_ca { | |||
51 | wait_queue_head_t hif_opdone_wq; | 51 | wait_queue_head_t hif_opdone_wq; |
52 | wait_queue_head_t hif_brrdyw_wq; | 52 | wait_queue_head_t hif_brrdyw_wq; |
53 | wait_queue_head_t hif_data_wq; | 53 | wait_queue_head_t hif_data_wq; |
54 | u32 hif_job_queue; | ||
55 | 54 | ||
56 | enum mantis_sbuf_status sbuf_status; | 55 | enum mantis_sbuf_status sbuf_status; |
57 | 56 | ||