Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
d9a71f97
Commit
d9a71f97
authored
Sep 30, 2013
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fixes-for-3.12' of
git://gitorious.org/linux-can/linux-can
Signed-off-by:
David S. Miller
<
davem@davemloft.net
>
parents
9260d3e1
0d1862ea
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
12 deletions
+0
-12
drivers/net/can/flexcan.c
drivers/net/can/flexcan.c
+0
-12
No files found.
drivers/net/can/flexcan.c
View file @
d9a71f97
...
@@ -702,7 +702,6 @@ static int flexcan_chip_start(struct net_device *dev)
...
@@ -702,7 +702,6 @@ static int flexcan_chip_start(struct net_device *dev)
{
{
struct
flexcan_priv
*
priv
=
netdev_priv
(
dev
);
struct
flexcan_priv
*
priv
=
netdev_priv
(
dev
);
struct
flexcan_regs
__iomem
*
regs
=
priv
->
base
;
struct
flexcan_regs
__iomem
*
regs
=
priv
->
base
;
unsigned
int
i
;
int
err
;
int
err
;
u32
reg_mcr
,
reg_ctrl
;
u32
reg_mcr
,
reg_ctrl
;
...
@@ -772,17 +771,6 @@ static int flexcan_chip_start(struct net_device *dev)
...
@@ -772,17 +771,6 @@ static int flexcan_chip_start(struct net_device *dev)
netdev_dbg
(
dev
,
"%s: writing ctrl=0x%08x"
,
__func__
,
reg_ctrl
);
netdev_dbg
(
dev
,
"%s: writing ctrl=0x%08x"
,
__func__
,
reg_ctrl
);
flexcan_write
(
reg_ctrl
,
&
regs
->
ctrl
);
flexcan_write
(
reg_ctrl
,
&
regs
->
ctrl
);
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
regs
->
cantxfg
);
i
++
)
{
flexcan_write
(
0
,
&
regs
->
cantxfg
[
i
].
can_ctrl
);
flexcan_write
(
0
,
&
regs
->
cantxfg
[
i
].
can_id
);
flexcan_write
(
0
,
&
regs
->
cantxfg
[
i
].
data
[
0
]);
flexcan_write
(
0
,
&
regs
->
cantxfg
[
i
].
data
[
1
]);
/* put MB into rx queue */
flexcan_write
(
FLEXCAN_MB_CNT_CODE
(
0x4
),
&
regs
->
cantxfg
[
i
].
can_ctrl
);
}
/* acceptance mask/acceptance code (accept everything) */
/* acceptance mask/acceptance code (accept everything) */
flexcan_write
(
0x0
,
&
regs
->
rxgmask
);
flexcan_write
(
0x0
,
&
regs
->
rxgmask
);
flexcan_write
(
0x0
,
&
regs
->
rx14mask
);
flexcan_write
(
0x0
,
&
regs
->
rx14mask
);
...
...
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