From: Fancy Fang <B47543@freescale.com>
Date: Wed, 11 Dec 2013 10:48:44 +0000 (+0800)
Subject: ENGR00291731 PXP: move pxp_irq_info definition from PXP dma to PXP device
X-Git-Tag: KARO-TX6-2014-07-10~108
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9cb28b7ae16e2565691fe3fb1c54501d5be62a60;p=karo-tx-linux.git

ENGR00291731 PXP: move pxp_irq_info definition from PXP dma to PXP device

struct pxp_irq_info is only used by PXP device driver, so it is unreasonable
to define it in pxp_dma.h which will be included by EPDC, V4L2 PXP and PXP
device driver.

Signed-off-by: Fancy Fang <B47543@freescale.com>
---

diff --git a/drivers/dma/pxp/pxp_device.c b/drivers/dma/pxp/pxp_device.c
index efe1eeb41e6e..2c28294dc42a 100644
--- a/drivers/dma/pxp/pxp_device.c
+++ b/drivers/dma/pxp/pxp_device.c
@@ -37,7 +37,6 @@ static DEFINE_SPINLOCK(pxp_mem_lock);
 static DEFINE_SPINLOCK(pxp_chan_lock);
 static LIST_HEAD(head);
 static LIST_HEAD(list);
-static struct pxp_irq_info irq_info[NR_PXP_VIRT_CHANNEL];
 
 struct pxp_chan_handle {
 	int chan_id;
@@ -55,6 +54,14 @@ struct pxp_chan_info {
 	struct list_head list;
 };
 
+struct pxp_irq_info {
+	wait_queue_head_t waitq;
+	int irq_pending;
+	int hist_status;
+	spinlock_t lock;
+};
+static struct pxp_irq_info irq_info[NR_PXP_VIRT_CHANNEL];
+
 static int pxp_alloc_dma_buffer(struct pxp_mem_desc *mem)
 {
 	mem->cpu_addr = (unsigned long)
diff --git a/include/linux/pxp_dma.h b/include/linux/pxp_dma.h
index 613d89f143f9..0961753726aa 100644
--- a/include/linux/pxp_dma.h
+++ b/include/linux/pxp_dma.h
@@ -55,13 +55,6 @@ struct pxp_channel {
 	char eof_name[16];	/* EOF IRQ name for request_irq()  */
 };
 
-struct pxp_irq_info {
-	wait_queue_head_t waitq;
-	int irq_pending;
-	int hist_status;
-	spinlock_t lock;
-};
-
 #define to_tx_desc(tx) container_of(tx, struct pxp_tx_desc, txd)
 #define to_pxp_channel(d) container_of(d, struct pxp_channel, dma_chan)