Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FMC TDC 1ns 5cha - Software
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Projects
FMC TDC 1ns 5cha - Software
Commits
c1ff649c
Commit
c1ff649c
authored
12 years ago
by
Samuel Iglesias Gonsálvez
Browse files
Options
Downloads
Patches
Plain Diff
tdc: change some pr_err to dev_err
Signed-off-by:
Samuel Iglesias Gonsalvez
<
siglesias@igalia.com
>
parent
07b4b160
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
drivers/tdc-core.c
+1
-1
1 addition, 1 deletion
drivers/tdc-core.c
drivers/tdc-fmc.c
+4
-4
4 additions, 4 deletions
drivers/tdc-fmc.c
drivers/tdc-zio.c
+1
-1
1 addition, 1 deletion
drivers/tdc-zio.c
with
6 additions
and
6 deletions
drivers/tdc-core.c
+
1
−
1
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
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/tdc-fmc.c
+
4
−
4
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
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/tdc-zio.c
+
1
−
1
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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment