V4L/DVB (13802): [Mantis/Hopper] Fix all build related warnings

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

16 files changed, 3 insertions, 50 deletions

diff --git a/drivers/media/dvb/mantis/hopper_cards.c b/drivers/media/dvb/mantis/hopper_cards.c
index 01a9ff07d770..6d5d101f0ab0 100644
--- a/drivers/media/dvb/mantis/hopper_cards.c
+++ b/drivers/media/dvb/mantis/hopper_cards.c
@@ -190,10 +190,6 @@ static int __devinit hopper_pci_probe(struct pci_dev *pdev, const struct pci_dev
 
         return err;
 
-fail5:
-        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DVB exit! <%d>", err);
-        mantis_dvb_exit(mantis);
-
 fail4:
         dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DMA exit! <%d>", err);
         mantis_dma_exit(mantis);
diff --git a/drivers/media/dvb/mantis/hopper_vp3028.c b/drivers/media/dvb/mantis/hopper_vp3028.c
index 16b39d3b9ace..76cad8763382 100644
--- a/drivers/media/dvb/mantis/hopper_vp3028.c
+++ b/drivers/media/dvb/mantis/hopper_vp3028.c
@@ -18,7 +18,6 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/dvb/mantis/mantis_ca.c
index 4151cba35e72..88899ac96d63 100644
--- a/drivers/media/dvb/mantis/mantis_ca.c
+++ b/drivers/media/dvb/mantis/mantis_ca.c
@@ -18,7 +18,6 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/dvb/mantis/mantis_cards.c b/drivers/media/dvb/mantis/mantis_cards.c
index 638177ce72a2..0b52f996f8e1 100644
--- a/drivers/media/dvb/mantis/mantis_cards.c
+++ b/drivers/media/dvb/mantis/mantis_cards.c
@@ -197,19 +197,6 @@ static int __devinit mantis_pci_probe(struct pci_dev *pdev, const struct pci_dev
         devs++;
 
         return err;
-
-fail7:
-        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis UART exit! <%d>", err);
-        mantis_uart_exit(mantis);
-
-fail6:
-        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis CA exit! <%d>", err);
-        mantis_ca_exit(mantis);
-
-fail5:
-        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DVB exit! <%d>", err);
-        mantis_dvb_exit(mantis);
-
 fail4:
         dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DMA exit! <%d>", err);
         mantis_dma_exit(mantis);
diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
index 9d9c5582ada8..1e08e3107639 100644
--- a/drivers/media/dvb/mantis/mantis_dvb.c
+++ b/drivers/media/dvb/mantis/mantis_dvb.c
@@ -20,7 +20,6 @@
 #include <linux/kernel.h>
 #include <linux/bitops.h>
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/dvb/mantis/mantis_evm.c b/drivers/media/dvb/mantis/mantis_evm.c
index 2005b2489b74..9304b0edd89e 100644
--- a/drivers/media/dvb/mantis/mantis_evm.c
+++ b/drivers/media/dvb/mantis/mantis_evm.c
@@ -20,7 +20,6 @@
 
 #include <linux/kernel.h>
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index bb05427fdeb6..73e5ca0c6c14 100644
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -22,7 +22,6 @@
 #include <linux/signal.h>
 #include <linux/sched.h>
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
@@ -40,22 +39,6 @@
 
 #include "mantis_reg.h"
 
-static int mantis_hif_data_available(struct mantis_ca *ca)
-{
-        struct mantis_pci *mantis = ca->ca_priv;
-        int rc = 0;
-
-        if (wait_event_interruptible_timeout(ca->hif_data_wq,
-                                             ca->sbuf_status & MANTIS_SBUF_DATA_AVAIL,
-                                             msecs_to_jiffies(500)) == -ERESTARTSYS) {
-
-                dprintk(MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Read wait event timeout !", mantis->num);
-                rc = -EREMOTEIO;
-        }
-        ca->sbuf_status &= ~MANTIS_SBUF_DATA_AVAIL;
-        udelay(2);
-        return rc;
-}
 
 static int mantis_hif_sbuf_opdone_wait(struct mantis_ca *ca)
 {
diff --git a/drivers/media/dvb/mantis/mantis_ioc.c b/drivers/media/dvb/mantis/mantis_ioc.c
index 448e2c3e3445..dd6636999add 100644
--- a/drivers/media/dvb/mantis/mantis_ioc.c
+++ b/drivers/media/dvb/mantis/mantis_ioc.c
@@ -21,7 +21,6 @@
 #include <linux/kernel.h>
 #include <linux/i2c.h>
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/dvb/mantis/mantis_pcmcia.c b/drivers/media/dvb/mantis/mantis_pcmcia.c
index 90ca356985eb..d6bca3e58597 100644
--- a/drivers/media/dvb/mantis/mantis_pcmcia.c
+++ b/drivers/media/dvb/mantis/mantis_pcmcia.c
@@ -20,7 +20,6 @@
 
 #include <linux/kernel.h>
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/dvb/mantis/mantis_uart.c b/drivers/media/dvb/mantis/mantis_uart.c
index fb423b0a58fd..03b47cf15f8d 100644
--- a/drivers/media/dvb/mantis/mantis_uart.c
+++ b/drivers/media/dvb/mantis/mantis_uart.c
@@ -26,19 +26,18 @@ struct mantis_uart_params {
 int mantis_uart_read(struct mantis_pci *mantis, u8 *data)
 {
         struct mantis_hwconfig *config = mantis->hwconfig;
-        u32 stat, i;
-        unsigned long flags;
+        u32 stat = 0, i;
 
         /* get data */
         for (i = 0; i < (config->bytes + 1); i++) {
 
+                stat = mmread(MANTIS_UART_STAT);
+
                 if (stat & MANTIS_UART_RXFIFO_FULL) {
                         dprintk(MANTIS_ERROR, 1, "RX Fifo FULL");
                 }
                 data[i] = mmread(MANTIS_UART_RXD) & 0x3f;
 
-                stat = mmread(MANTIS_UART_STAT);
-
                 dprintk(MANTIS_DEBUG, 1, "Reading ... <%02x>", data[i] & 0x3f);
 
                 if (data[i] & (1 << 7)) {
diff --git a/drivers/media/dvb/mantis/mantis_vp1033.c b/drivers/media/dvb/mantis/mantis_vp1033.c
index 0bea6e89f551..c9760b00d0ab 100644
--- a/drivers/media/dvb/mantis/mantis_vp1033.c
+++ b/drivers/media/dvb/mantis/mantis_vp1033.c
@@ -18,7 +18,6 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/dvb/mantis/mantis_vp1034.c b/drivers/media/dvb/mantis/mantis_vp1034.c
index 98a4ec89f048..7ddd149b0fea 100644
--- a/drivers/media/dvb/mantis/mantis_vp1034.c
+++ b/drivers/media/dvb/mantis/mantis_vp1034.c
@@ -18,7 +18,6 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/dvb/mantis/mantis_vp1041.c b/drivers/media/dvb/mantis/mantis_vp1041.c
index 1181fad3b27b..368fc815a61d 100644
--- a/drivers/media/dvb/mantis/mantis_vp1041.c
+++ b/drivers/media/dvb/mantis/mantis_vp1041.c
@@ -18,7 +18,6 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/dvb/mantis/mantis_vp2033.c b/drivers/media/dvb/mantis/mantis_vp2033.c
index cef108c5ffc7..45f71749bb98 100644
--- a/drivers/media/dvb/mantis/mantis_vp2033.c
+++ b/drivers/media/dvb/mantis/mantis_vp2033.c
@@ -18,7 +18,6 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/dvb/mantis/mantis_vp2040.c b/drivers/media/dvb/mantis/mantis_vp2040.c
index e2019884ac3a..8471bff672f3 100644
--- a/drivers/media/dvb/mantis/mantis_vp2040.c
+++ b/drivers/media/dvb/mantis/mantis_vp2040.c
@@ -18,7 +18,6 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/dvb/mantis/mantis_vp3030.c b/drivers/media/dvb/mantis/mantis_vp3030.c
index a44fac3aabc6..1895e956b16d 100644
--- a/drivers/media/dvb/mantis/mantis_vp3030.c
+++ b/drivers/media/dvb/mantis/mantis_vp3030.c
@@ -18,7 +18,6 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>