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
Kirill Smelkov
linux
Commits
c697f83e
Commit
c697f83e
authored
Dec 05, 2006
by
Francois Romieu
Committed by
Jeff Garzik
Feb 05, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chelsio: move return, break and continue statements on their own line
Signed-off-by:
Francois Romieu
<
romieu@fr.zoreil.com
>
parent
ea8862dc
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
10 deletions
+20
-10
drivers/net/chelsio/espi.c
drivers/net/chelsio/espi.c
+2
-1
drivers/net/chelsio/ixf1010.c
drivers/net/chelsio/ixf1010.c
+6
-3
drivers/net/chelsio/mv88e1xxx.c
drivers/net/chelsio/mv88e1xxx.c
+4
-2
drivers/net/chelsio/subr.c
drivers/net/chelsio/subr.c
+4
-2
drivers/net/chelsio/vsc7326.c
drivers/net/chelsio/vsc7326.c
+2
-1
drivers/net/chelsio/vsc8244.c
drivers/net/chelsio/vsc8244.c
+2
-1
No files found.
drivers/net/chelsio/espi.c
View file @
c697f83e
...
@@ -301,7 +301,8 @@ void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val)
...
@@ -301,7 +301,8 @@ void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val)
{
{
struct
peespi
*
espi
=
adapter
->
espi
;
struct
peespi
*
espi
=
adapter
->
espi
;
if
(
!
is_T2
(
adapter
))
return
;
if
(
!
is_T2
(
adapter
))
return
;
spin_lock
(
&
espi
->
lock
);
spin_lock
(
&
espi
->
lock
);
espi
->
misc_ctrl
=
(
val
&
~
MON_MASK
)
|
espi
->
misc_ctrl
=
(
val
&
~
MON_MASK
)
|
(
espi
->
misc_ctrl
&
MON_MASK
);
(
espi
->
misc_ctrl
&
MON_MASK
);
...
...
drivers/net/chelsio/ixf1010.c
View file @
c697f83e
...
@@ -273,7 +273,8 @@ static int mac_set_rx_mode(struct cmac *mac, struct t1_rx_mode *rm)
...
@@ -273,7 +273,8 @@ static int mac_set_rx_mode(struct cmac *mac, struct t1_rx_mode *rm)
static
int
mac_set_mtu
(
struct
cmac
*
mac
,
int
mtu
)
static
int
mac_set_mtu
(
struct
cmac
*
mac
,
int
mtu
)
{
{
/* MAX_FRAME_SIZE inludes header + FCS, mtu doesn't */
/* MAX_FRAME_SIZE inludes header + FCS, mtu doesn't */
if
(
mtu
>
(
MAX_FRAME_SIZE
-
14
-
4
))
return
-
EINVAL
;
if
(
mtu
>
(
MAX_FRAME_SIZE
-
14
-
4
))
return
-
EINVAL
;
t1_tpi_write
(
mac
->
adapter
,
MACREG
(
mac
,
REG_MAX_FRAME_SIZE
),
t1_tpi_write
(
mac
->
adapter
,
MACREG
(
mac
,
REG_MAX_FRAME_SIZE
),
mtu
+
14
+
4
);
mtu
+
14
+
4
);
return
0
;
return
0
;
...
@@ -460,10 +461,12 @@ static struct cmac *ixf1010_mac_create(adapter_t *adapter, int index)
...
@@ -460,10 +461,12 @@ static struct cmac *ixf1010_mac_create(adapter_t *adapter, int index)
struct
cmac
*
mac
;
struct
cmac
*
mac
;
u32
val
;
u32
val
;
if
(
index
>
9
)
return
NULL
;
if
(
index
>
9
)
return
NULL
;
mac
=
kzalloc
(
sizeof
(
*
mac
)
+
sizeof
(
cmac_instance
),
GFP_KERNEL
);
mac
=
kzalloc
(
sizeof
(
*
mac
)
+
sizeof
(
cmac_instance
),
GFP_KERNEL
);
if
(
!
mac
)
return
NULL
;
if
(
!
mac
)
return
NULL
;
mac
->
ops
=
&
ixf1010_ops
;
mac
->
ops
=
&
ixf1010_ops
;
mac
->
instance
=
(
cmac_instance
*
)(
mac
+
1
);
mac
->
instance
=
(
cmac_instance
*
)(
mac
+
1
);
...
...
drivers/net/chelsio/mv88e1xxx.c
View file @
c697f83e
...
@@ -308,7 +308,8 @@ static int mv88e1xxx_interrupt_handler(struct cphy *cphy)
...
@@ -308,7 +308,8 @@ static int mv88e1xxx_interrupt_handler(struct cphy *cphy)
MV88E1XXX_INTERRUPT_STATUS_REGISTER
,
MV88E1XXX_INTERRUPT_STATUS_REGISTER
,
&
cause
);
&
cause
);
cause
&=
INTR_ENABLE_MASK
;
cause
&=
INTR_ENABLE_MASK
;
if
(
!
cause
)
break
;
if
(
!
cause
)
break
;
if
(
cause
&
MV88E1XXX_INTR_LINK_CHNG
)
{
if
(
cause
&
MV88E1XXX_INTR_LINK_CHNG
)
{
(
void
)
simple_mdio_read
(
cphy
,
(
void
)
simple_mdio_read
(
cphy
,
...
@@ -360,7 +361,8 @@ static struct cphy *mv88e1xxx_phy_create(adapter_t *adapter, int phy_addr,
...
@@ -360,7 +361,8 @@ static struct cphy *mv88e1xxx_phy_create(adapter_t *adapter, int phy_addr,
{
{
struct
cphy
*
cphy
=
kzalloc
(
sizeof
(
*
cphy
),
GFP_KERNEL
);
struct
cphy
*
cphy
=
kzalloc
(
sizeof
(
*
cphy
),
GFP_KERNEL
);
if
(
!
cphy
)
return
NULL
;
if
(
!
cphy
)
return
NULL
;
cphy_init
(
cphy
,
adapter
,
phy_addr
,
&
mv88e1xxx_ops
,
mdio_ops
);
cphy_init
(
cphy
,
adapter
,
phy_addr
,
&
mv88e1xxx_ops
,
mdio_ops
);
...
...
drivers/net/chelsio/subr.c
View file @
c697f83e
...
@@ -612,7 +612,8 @@ int t1_elmer0_ext_intr_handler(adapter_t *adapter)
...
@@ -612,7 +612,8 @@ int t1_elmer0_ext_intr_handler(adapter_t *adapter)
int
i
,
port_bit
;
int
i
,
port_bit
;
for_each_port
(
adapter
,
i
)
{
for_each_port
(
adapter
,
i
)
{
port_bit
=
i
+
1
;
port_bit
=
i
+
1
;
if
(
!
(
cause
&
(
1
<<
port_bit
)))
continue
;
if
(
!
(
cause
&
(
1
<<
port_bit
)))
continue
;
phy
=
adapter
->
port
[
i
].
phy
;
phy
=
adapter
->
port
[
i
].
phy
;
phy_cause
=
phy
->
ops
->
interrupt_handler
(
phy
);
phy_cause
=
phy
->
ops
->
interrupt_handler
(
phy
);
...
@@ -688,7 +689,8 @@ int t1_elmer0_ext_intr_handler(adapter_t *adapter)
...
@@ -688,7 +689,8 @@ int t1_elmer0_ext_intr_handler(adapter_t *adapter)
for_each_port
(
adapter
,
i
)
{
for_each_port
(
adapter
,
i
)
{
port_bit
=
i
?
i
+
1
:
0
;
port_bit
=
i
?
i
+
1
:
0
;
if
(
!
(
cause
&
(
1
<<
port_bit
)))
continue
;
if
(
!
(
cause
&
(
1
<<
port_bit
)))
continue
;
phy
=
adapter
->
port
[
i
].
phy
;
phy
=
adapter
->
port
[
i
].
phy
;
phy_cause
=
phy
->
ops
->
interrupt_handler
(
phy
);
phy_cause
=
phy
->
ops
->
interrupt_handler
(
phy
);
...
...
drivers/net/chelsio/vsc7326.c
View file @
c697f83e
...
@@ -686,7 +686,8 @@ static struct cmac *vsc7326_mac_create(adapter_t *adapter, int index)
...
@@ -686,7 +686,8 @@ static struct cmac *vsc7326_mac_create(adapter_t *adapter, int index)
int
i
;
int
i
;
mac
=
kzalloc
(
sizeof
(
*
mac
)
+
sizeof
(
cmac_instance
),
GFP_KERNEL
);
mac
=
kzalloc
(
sizeof
(
*
mac
)
+
sizeof
(
cmac_instance
),
GFP_KERNEL
);
if
(
!
mac
)
return
NULL
;
if
(
!
mac
)
return
NULL
;
mac
->
ops
=
&
vsc7326_ops
;
mac
->
ops
=
&
vsc7326_ops
;
mac
->
instance
=
(
cmac_instance
*
)(
mac
+
1
);
mac
->
instance
=
(
cmac_instance
*
)(
mac
+
1
);
...
...
drivers/net/chelsio/vsc8244.c
View file @
c697f83e
...
@@ -347,7 +347,8 @@ static struct cphy* vsc8244_phy_create(adapter_t *adapter, int phy_addr, struct
...
@@ -347,7 +347,8 @@ static struct cphy* vsc8244_phy_create(adapter_t *adapter, int phy_addr, struct
{
{
struct
cphy
*
cphy
=
kzalloc
(
sizeof
(
*
cphy
),
GFP_KERNEL
);
struct
cphy
*
cphy
=
kzalloc
(
sizeof
(
*
cphy
),
GFP_KERNEL
);
if
(
!
cphy
)
return
NULL
;
if
(
!
cphy
)
return
NULL
;
cphy_init
(
cphy
,
adapter
,
phy_addr
,
&
vsc8244_ops
,
mdio_ops
);
cphy_init
(
cphy
,
adapter
,
phy_addr
,
&
vsc8244_ops
,
mdio_ops
);
...
...
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