Skip to content

F
FMC TDC 1ns 5cha - Software
Commit c1ff649c authored by Samuel Iglesias Gonsálvez's avatar Samuel Iglesias Gonsálvez
Browse files
Options

tdc: change some pr_err to dev_err 

Signed-off-by: Samuel Iglesias Gonsálvez's avatarSamuel Iglesias Gonsalvez <siglesias@igalia.com>
parent 07b4b160
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
drivers/tdc-core.c
View file @ c1ff649c
...@@ -97,7 +97,7 @@ int tdc_activate_acquisition(struct spec_tdc *tdc) ...@@ -97,7 +97,7 @@ int tdc_activate_acquisition(struct spec_tdc *tdc)
acam_status_test = tdc_acam_status(tdc)-0xC4000800; acam_status_test = tdc_acam_status(tdc)-0xC4000800;
if (acam_status_test != 0) { if (acam_status_test != 0) {
pr_err( "ACAM status: not ready! 0x%x\n", acam_status_test); dev_err(&tdc->fmc->dev, "ACAM status: not ready! 0x%x\n", acam_status_test);
return -EBUSY; return -EBUSY;
} }
......
drivers/tdc-fmc.c
View file @ c1ff649c
...@@ -133,7 +133,7 @@ static void tdc_fmc_irq_work(struct work_struct *work) ...@@ -133,7 +133,7 @@ static void tdc_fmc_irq_work(struct work_struct *work)
events = kzalloc(TDC_EVENT_BUFFER_SIZE*sizeof(struct tdc_event), GFP_KERNEL); events = kzalloc(TDC_EVENT_BUFFER_SIZE*sizeof(struct tdc_event), GFP_KERNEL);
if(!events) { if(!events) {
pr_err("error allocating memory for the events\n"); dev_err(&tdc->fmc->dev, "error allocating memory for the events\n");
return; return;
} }
...@@ -148,7 +148,7 @@ static void tdc_fmc_irq_work(struct work_struct *work) ...@@ -148,7 +148,7 @@ static void tdc_fmc_irq_work(struct work_struct *work)
ret = tdc_dma_setup(tdc, 0, (unsigned long)events, ret = tdc_dma_setup(tdc, 0, (unsigned long)events,
TDC_EVENT_BUFFER_SIZE*sizeof(struct tdc_event)); TDC_EVENT_BUFFER_SIZE*sizeof(struct tdc_event));
if (ret) { if (ret) {
pr_err("tdc: error in DMA setup\n"); dev_err(&tdc->fmc->dev, "tdc: error in DMA setup\n");
goto dma_out; goto dma_out;
} }
...@@ -162,7 +162,7 @@ static void tdc_fmc_irq_work(struct work_struct *work) ...@@ -162,7 +162,7 @@ static void tdc_fmc_irq_work(struct work_struct *work)
/* In case of timeout, notify the user */ /* In case of timeout, notify the user */
if(!ret) { if(!ret) {
pr_err("tdc: timeout in DMA transfer.\n"); dev_err(&tdc->fmc->dev, "tdc: timeout in DMA transfer.\n");
mutex_unlock(&fmc_dma_lock); mutex_unlock(&fmc_dma_lock);
goto dma_out; goto dma_out;
} }
...@@ -170,7 +170,7 @@ static void tdc_fmc_irq_work(struct work_struct *work) ...@@ -170,7 +170,7 @@ static void tdc_fmc_irq_work(struct work_struct *work)
/* Check the status of the DMA */ /* Check the status of the DMA */
ret = readl(tdc->base + TDC_DMA_STAT_R); ret = readl(tdc->base + TDC_DMA_STAT_R);
if((ret & TDC_DMA_STAT_ERR) || (ret & TDC_DMA_STAT_ABORT)) { if((ret & TDC_DMA_STAT_ERR) || (ret & TDC_DMA_STAT_ABORT)) {
pr_err("tdc: error in DMA transfer\n"); dev_err(&tdc->fmc->dev, "tdc: error in DMA transfer\n");
mutex_unlock(&fmc_dma_lock); mutex_unlock(&fmc_dma_lock);
goto dma_out; goto dma_out;
} }
......
drivers/tdc-zio.c
View file @ c1ff649c
...@@ -312,7 +312,7 @@ int tdc_zio_register_device(struct spec_tdc *tdc) ...@@ -312,7 +312,7 @@ int tdc_zio_register_device(struct spec_tdc *tdc)
dev = device_find_child(&tdc->hwzdev->head.dev, NULL, __tdc_match_child); dev = device_find_child(&tdc->hwzdev->head.dev, NULL, __tdc_match_child);
if (!dev) { if (!dev) {
pr_err("Child device not found!!\n"); dev_err(&tdc->spec->pdev->dev, "Child device not found!!\n");
return -ENODEV; return -ENODEV;
} }
tdc->zdev = to_zio_dev(dev); tdc->zdev = to_zio_dev(dev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment