V4L/DVB (13775): [Mantis] Remove unnecessary job queues

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index 6c51d17..621dce3 100644 (file)
--- 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)
        hif_addr |= addr;
 
        mmwrite(slot->slave_cfg, MANTIS_GPIF_CFGSLA); /* Slot0 alone for now */
-
        mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR);
        mmwrite(data, MANTIS_GPIF_DOUT);
-       ca->hif_job_queue = MANTIS_HIF_MEMWR;
 
        if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
-               ca->hif_job_queue &= ~MANTIS_HIF_MEMWR;
                dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num);
                return -EREMOTEIO;
        }
-       ca->hif_job_queue &= ~MANTIS_HIF_MEMWR;
        dprintk(verbose, MANTIS_DEBUG, 1, "Mem Write: (0x%02x to 0x%02x)", data, addr);
 
        return 0;
@@ -125,14 +121,11 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr)
        hif_addr |=  addr;
 
        mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR);
-       ca->hif_job_queue = MANTIS_HIF_IOMRD;
 
        if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
-               ca->hif_job_queue &= ~MANTIS_HIF_IOMRD;
                dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num);
                return -EREMOTEIO;
        }
-       ca->hif_job_queue &= ~MANTIS_HIF_IOMRD;
        data = mmread(MANTIS_GPIF_DIN);
        dprintk(verbose, MANTIS_DEBUG, 1, "I/O Read: 0x%02x", data);
        udelay(50);
@@ -154,13 +147,10 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data)
        mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR);
        mmwrite(data, MANTIS_GPIF_DOUT);
 
-       ca->hif_job_queue = MANTIS_HIF_IOMWR;
        if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
-               ca->hif_job_queue &= ~MANTIS_HIF_IOMWR;
                dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num);
                return -EREMOTEIO;
        }
-       ca->hif_job_queue &= ~MANTIS_HIF_IOMWR;
        dprintk(verbose, MANTIS_DEBUG, 1, "I/O Write: (0x%02x to 0x%02x)", data, addr);
        udelay(50);
 

diff --git a/drivers/media/dvb/mantis/mantis_link.h b/drivers/media/dvb/mantis/mantis_link.h
index 23ff2d6..a85f502 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_link.h
+++ b/drivers/media/dvb/mantis/mantis_link.h
@@ -51,7 +51,6 @@ struct mantis_ca {
        wait_queue_head_t               hif_opdone_wq;
        wait_queue_head_t               hif_brrdyw_wq;
        wait_queue_head_t               hif_data_wq;
-       u32                             hif_job_queue;
 
        enum mantis_sbuf_status         sbuf_status;