Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC TDC 1ns 5cha - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
FMC TDC 1ns 5cha - Software
Commits
c1ff649c
Commit
c1ff649c
authored
Nov 12, 2012
by
Samuel Iglesias Gonsálvez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tdc: change some pr_err to dev_err
Signed-off-by:
Samuel Iglesias Gonsalvez
<
siglesias@igalia.com
>
parent
07b4b160
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
tdc-core.c
drivers/tdc-core.c
+1
-1
tdc-fmc.c
drivers/tdc-fmc.c
+4
-4
tdc-zio.c
drivers/tdc-zio.c
+1
-1
No files found.
drivers/tdc-core.c
View file @
c1ff649c
...
...
@@ -97,7 +97,7 @@ int tdc_activate_acquisition(struct spec_tdc *tdc)
acam_status_test
=
tdc_acam_status
(
tdc
)
-
0xC4000800
;
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
;
}
...
...
drivers/tdc-fmc.c
View file @
c1ff649c
...
...
@@ -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
);
if
(
!
events
)
{
pr_err
(
"error allocating memory for the events
\n
"
);
dev_err
(
&
tdc
->
fmc
->
dev
,
"error allocating memory for the events
\n
"
);
return
;
}
...
...
@@ -148,7 +148,7 @@ static void tdc_fmc_irq_work(struct work_struct *work)
ret
=
tdc_dma_setup
(
tdc
,
0
,
(
unsigned
long
)
events
,
TDC_EVENT_BUFFER_SIZE
*
sizeof
(
struct
tdc_event
));
if
(
ret
)
{
pr_err
(
"tdc: error in DMA setup
\n
"
);
dev_err
(
&
tdc
->
fmc
->
dev
,
"tdc: error in DMA setup
\n
"
);
goto
dma_out
;
}
...
...
@@ -162,7 +162,7 @@ static void tdc_fmc_irq_work(struct work_struct *work)
/* In case of timeout, notify the user */
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
);
goto
dma_out
;
}
...
...
@@ -170,7 +170,7 @@ static void tdc_fmc_irq_work(struct work_struct *work)
/* Check the status of the DMA */
ret
=
readl
(
tdc
->
base
+
TDC_DMA_STAT_R
);
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
);
goto
dma_out
;
}
...
...
drivers/tdc-zio.c
View file @
c1ff649c
...
...
@@ -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
);
if
(
!
dev
)
{
pr_err
(
"Child device not found!!
\n
"
);
dev_err
(
&
tdc
->
spec
->
pdev
->
dev
,
"Child device not found!!
\n
"
);
return
-
ENODEV
;
}
tdc
->
zdev
=
to_zio_dev
(
dev
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment