V4L/DVB (6171): cx23885: Cleaning up defines

Moving some defines into the correct header file.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 7a1c4672041dbf4d34aa93b83093fa6a84c60a96..fa5f6488b994b5669af4d7e8142bba519e0936ba 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -1251,25 +1251,6 @@ static void cx23885_timeout(unsigned long data)
        do_cancel_buffers(port, "timeout", 1);
 }
 
-#define PCI_MSK_APB_DMA   (1 << 12)
-#define PCI_MSK_AL_WR     (1 << 11)
-#define PCI_MSK_AL_RD     (1 << 10)
-#define PCI_MSK_RISC_WR   (1 <<  9)
-#define PCI_MSK_RISC_RD   (1 <<  8)
-
-#define PCI_MSK_AUD_EXT   (1 <<  4)
-#define PCI_MSK_AUD_INT   (1 <<  3)
-#define PCI_MSK_VID_C     (1 <<  2)
-#define PCI_MSK_VID_B     (1 <<  1)
-#define PCI_MSK_VID_A      1
-
-#define VID_C_MSK_BAD_PKT (1 << 20)
-#define VID_C_MSK_OPC_ERR (1 << 16)
-#define VID_C_MSK_SYNC    (1 << 12)
-#define VID_C_MSK_OF      (1 <<  8)
-#define VID_C_MSK_RISCI2  (1 <<  4)
-#define VID_C_MSK_RISCI1   1
-
 static irqreturn_t cx23885_irq(int irq, void *dev_id)
 {
        struct cx23885_dev *dev = dev_id;

diff --git a/drivers/media/video/cx23885/cx23885-reg.h b/drivers/media/video/cx23885/cx23885-reg.h
index 6527bd3b4d773d68ab3457ae93680e52414dc307..63ab0fb26acb15431b233ff42cadd70b671db270 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-reg.h
+++ b/drivers/media/video/cx23885/cx23885-reg.h
@@ -211,7 +211,7 @@ Channel manager Data Structure entry = 20 DWORD
 #define I2S_TX_CFG     0x0000001A
 
 #define DEV_CNTRL2     0x00040000
-#define PCI_INT_MSK    0x00040010
+
 #define PCI_MSK_APB_DMA   (1 << 12)
 #define PCI_MSK_AL_WR     (1 << 11)
 #define PCI_MSK_AL_RD     (1 << 10)
@@ -222,6 +222,8 @@ Channel manager Data Structure entry = 20 DWORD
 #define PCI_MSK_VID_C     (1 <<  2)
 #define PCI_MSK_VID_B     (1 <<  1)
 #define PCI_MSK_VID_A      1
+#define PCI_INT_MSK    0x00040010
+
 #define PCI_INT_STAT   0x00040014
 #define PCI_INT_MSTAT  0x00040018
 
@@ -235,7 +237,14 @@ Channel manager Data Structure entry = 20 DWORD
 #define VID_B_INT_MSTAT        0x00040038
 #define VID_B_INT_SSTAT        0x0004003C
 
+#define VID_C_MSK_BAD_PKT (1 << 20)
+#define VID_C_MSK_OPC_ERR (1 << 16)
+#define VID_C_MSK_SYNC    (1 << 12)
+#define VID_C_MSK_OF      (1 <<  8)
+#define VID_C_MSK_RISCI2  (1 <<  4)
+#define VID_C_MSK_RISCI1   1
 #define VID_C_INT_MSK  0x00040040
+
 #define VID_C_MSK_BAD_PKT (1 << 20)
 #define VID_C_MSK_OPC_ERR (1 << 16)
 #define VID_C_MSK_SYNC    (1 << 12)