tdc: backport for kernel 2.6.24.7-rt27.

Fixed compilation errors. Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>

tdc: backport for kernel 2.6.24.7-rt27.
Fixed compilation errors. Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
2dc2795f · Samuel Iglesias Gonsálvez · d2fe4e12 · 2dc2795f · 2dc2795f · 2dc2795f
Commit 2dc2795f authored Jan 25, 2013 by Samuel Iglesias Gonsálvez
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

tdc-core.c drivers/tdc-core.c +1 -1

tdc-dma.c drivers/tdc-dma.c +1 -1

tdc-fmc.c drivers/tdc-fmc.c +4 -4

tdc.h drivers/tdc.h +0 -1

No files found.
--- a/drivers/tdc-core.c
+++ b/drivers/tdc-core.c
@@ -98,7 +98,7 @@ int tdc_activate_acquisition(struct spec_tdc *tdc)

 	acam_status_test = tdc_acam_status(tdc)-0xC4000800;
 	if (acam_status_test != 0) {
-		dev_err(&tdc->fmc->dev, "ACAM status: not ready! 0x%x\n", acam_status_test);
+		pr_err("ACAM status: not ready! 0x%x\n", acam_status_test);
 		return -EBUSY;
 	}


--- a/drivers/tdc-dma.c
+++ b/drivers/tdc-dma.c
@@ -35,7 +35,7 @@ int tdc_dma_setup(struct spec_tdc *tdc, unsigned long src, unsigned long dst, in
 				 DMA_FROM_DEVICE);
 	tdc->rx_dma = mapping;

-	if (dma_mapping_error(&tdc->spec->pdev->dev, tdc->rx_dma)) {
+	if (dma_mapping_error(tdc->rx_dma)) {
 		dev_err(&tdc->spec->pdev->dev, "dma_map_single Rx failed\n");
 		return -ENOMEM;
 	}

--- a/drivers/tdc-fmc.c
+++ b/drivers/tdc-fmc.c
@@ -17,7 +17,7 @@
 #include <linux/mutex.h>
 #include <linux/wait.h>
 #include <linux/sched.h>
-#include <linux/atomic.h>
+#include <asm/atomic.h>

 #include <linux/zio.h>
 #include <linux/zio-trigger.h>
@@ -219,7 +219,7 @@ irqreturn_t tdc_fmc_irq_handler(int irq, void *dev_id)
 	u32 irq_code;

 	/* Check the source of the interrupt */
-	irq_code = readl(fmc->base + TDC_IRQ_STATUS_REG);
+	irq_code = readl(tdc->base + TDC_IRQ_STATUS_REG);

 	/* Tstamp threshold or time threshold */
 	if((irq_code & TDC_IRQ_TDC_TSTAMP) ||
@@ -241,7 +241,7 @@ irqreturn_t tdc_fmc_irq_handler(int irq, void *dev_id)
 		wake_up(&fmc_wait_dma);
 	}
 	/* Acknowledge the IRQ and exit */
-	writel(irq_code, fmc->base + TDC_IRQ_STATUS_REG);
+	writel(irq_code, tdc->base + TDC_IRQ_STATUS_REG);
 	fmc->op->irq_ack(fmc);
 	return IRQ_HANDLED;
 }
@@ -303,7 +303,7 @@ int tdc_fmc_probe(struct fmc_device *dev)
 	dev->mezzanine_data = tdc;
 	tdc->lun = dev_lun;
 	tdc->fmc = dev;
-	tdc->base = dev->base;		   /* BAR 0 */
+	tdc->base = dev->fpga_base;		   /* BAR 0 */
 	tdc->gn412x_regs = spec->remap[2]; /* BAR 4  */
 	tdc->wr_pointer = 0;


--- a/drivers/tdc.h
+++ b/drivers/tdc.h
@@ -6,7 +6,6 @@

 #include <linux/types.h>
 #include <linux/workqueue.h>
-#include <linux/semaphore.h>
 #include "hw/tdc_regs.h"

 /* module parameters */