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
b7d58394
Commit
b7d58394
authored
Dec 11, 2006
by
Francois Romieu
Committed by
Jeff Garzik
Feb 05, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chelsio: the return statement is not a function
Signed-off-by:
Francois Romieu
<
romieu@fr.zoreil.com
>
parent
c697f83e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
drivers/net/chelsio/my3126.c
drivers/net/chelsio/my3126.c
+8
-8
drivers/net/chelsio/vsc7326.c
drivers/net/chelsio/vsc7326.c
+6
-6
No files found.
drivers/net/chelsio/my3126.c
View file @
b7d58394
...
@@ -10,25 +10,25 @@ static int my3126_reset(struct cphy *cphy, int wait)
...
@@ -10,25 +10,25 @@ static int my3126_reset(struct cphy *cphy, int wait)
* This can be done through registers. It is not required since
* This can be done through registers. It is not required since
* a full chip reset is used.
* a full chip reset is used.
*/
*/
return
(
0
)
;
return
0
;
}
}
static
int
my3126_interrupt_enable
(
struct
cphy
*
cphy
)
static
int
my3126_interrupt_enable
(
struct
cphy
*
cphy
)
{
{
schedule_delayed_work
(
&
cphy
->
phy_update
,
HZ
/
30
);
schedule_delayed_work
(
&
cphy
->
phy_update
,
HZ
/
30
);
t1_tpi_read
(
cphy
->
adapter
,
A_ELMER0_GPO
,
&
cphy
->
elmer_gpo
);
t1_tpi_read
(
cphy
->
adapter
,
A_ELMER0_GPO
,
&
cphy
->
elmer_gpo
);
return
(
0
)
;
return
0
;
}
}
static
int
my3126_interrupt_disable
(
struct
cphy
*
cphy
)
static
int
my3126_interrupt_disable
(
struct
cphy
*
cphy
)
{
{
cancel_rearming_delayed_work
(
&
cphy
->
phy_update
);
cancel_rearming_delayed_work
(
&
cphy
->
phy_update
);
return
(
0
)
;
return
0
;
}
}
static
int
my3126_interrupt_clear
(
struct
cphy
*
cphy
)
static
int
my3126_interrupt_clear
(
struct
cphy
*
cphy
)
{
{
return
(
0
)
;
return
0
;
}
}
#define OFFSET(REG_ADDR) (REG_ADDR << 2)
#define OFFSET(REG_ADDR) (REG_ADDR << 2)
...
@@ -102,7 +102,7 @@ static void my3216_poll(struct work_struct *work)
...
@@ -102,7 +102,7 @@ static void my3216_poll(struct work_struct *work)
static
int
my3126_set_loopback
(
struct
cphy
*
cphy
,
int
on
)
static
int
my3126_set_loopback
(
struct
cphy
*
cphy
,
int
on
)
{
{
return
(
0
)
;
return
0
;
}
}
/* To check the activity LED */
/* To check the activity LED */
...
@@ -146,7 +146,7 @@ static int my3126_get_link_status(struct cphy *cphy,
...
@@ -146,7 +146,7 @@ static int my3126_get_link_status(struct cphy *cphy,
if
(
fc
)
if
(
fc
)
*
fc
=
PAUSE_RX
|
PAUSE_TX
;
*
fc
=
PAUSE_RX
|
PAUSE_TX
;
return
(
0
)
;
return
0
;
}
}
static
void
my3126_destroy
(
struct
cphy
*
cphy
)
static
void
my3126_destroy
(
struct
cphy
*
cphy
)
...
@@ -177,7 +177,7 @@ static struct cphy *my3126_phy_create(adapter_t *adapter,
...
@@ -177,7 +177,7 @@ static struct cphy *my3126_phy_create(adapter_t *adapter,
INIT_DELAYED_WORK
(
&
cphy
->
phy_update
,
my3216_poll
);
INIT_DELAYED_WORK
(
&
cphy
->
phy_update
,
my3216_poll
);
cphy
->
bmsr
=
0
;
cphy
->
bmsr
=
0
;
return
(
cphy
)
;
return
cphy
;
}
}
/* Chip Reset */
/* Chip Reset */
...
@@ -198,7 +198,7 @@ static int my3126_phy_reset(adapter_t * adapter)
...
@@ -198,7 +198,7 @@ static int my3126_phy_reset(adapter_t * adapter)
val
|=
0x8000
;
val
|=
0x8000
;
t1_tpi_write
(
adapter
,
A_ELMER0_GPO
,
val
);
t1_tpi_write
(
adapter
,
A_ELMER0_GPO
,
val
);
udelay
(
100
);
udelay
(
100
);
return
(
0
)
;
return
0
;
}
}
struct
gphy
t1_my3126_ops
=
{
struct
gphy
t1_my3126_ops
=
{
...
...
drivers/net/chelsio/vsc7326.c
View file @
b7d58394
...
@@ -256,7 +256,7 @@ static int bist_rd(adapter_t *adapter, int moduleid, int address)
...
@@ -256,7 +256,7 @@ static int bist_rd(adapter_t *adapter, int moduleid, int address)
else
if
((
result
&
(
1
<<
8
))
!=
0x0
)
else
if
((
result
&
(
1
<<
8
))
!=
0x0
)
CH_ERR
(
"bist read error: 0x%x
\n
"
,
result
);
CH_ERR
(
"bist read error: 0x%x
\n
"
,
result
);
return
(
result
&
0xff
);
return
(
result
&
0xff
);
}
}
static
int
bist_wr
(
adapter_t
*
adapter
,
int
moduleid
,
int
address
,
int
value
)
static
int
bist_wr
(
adapter_t
*
adapter
,
int
moduleid
,
int
address
,
int
value
)
...
@@ -286,7 +286,7 @@ static int bist_wr(adapter_t *adapter, int moduleid, int address, int value)
...
@@ -286,7 +286,7 @@ static int bist_wr(adapter_t *adapter, int moduleid, int address, int value)
else
if
((
result
&
(
1
<<
26
))
!=
0x0
)
else
if
((
result
&
(
1
<<
26
))
!=
0x0
)
CH_ERR
(
"bist write error: 0x%x
\n
"
,
result
);
CH_ERR
(
"bist write error: 0x%x
\n
"
,
result
);
return
(
0
)
;
return
0
;
}
}
static
int
run_bist
(
adapter_t
*
adapter
,
int
moduleid
)
static
int
run_bist
(
adapter_t
*
adapter
,
int
moduleid
)
...
@@ -295,7 +295,7 @@ static int run_bist(adapter_t *adapter, int moduleid)
...
@@ -295,7 +295,7 @@ static int run_bist(adapter_t *adapter, int moduleid)
(
void
)
bist_wr
(
adapter
,
moduleid
,
0x00
,
0x02
);
(
void
)
bist_wr
(
adapter
,
moduleid
,
0x00
,
0x02
);
(
void
)
bist_wr
(
adapter
,
moduleid
,
0x01
,
0x01
);
(
void
)
bist_wr
(
adapter
,
moduleid
,
0x01
,
0x01
);
return
(
0
)
;
return
0
;
}
}
static
int
check_bist
(
adapter_t
*
adapter
,
int
moduleid
)
static
int
check_bist
(
adapter_t
*
adapter
,
int
moduleid
)
...
@@ -309,14 +309,14 @@ static int check_bist(adapter_t *adapter, int moduleid)
...
@@ -309,14 +309,14 @@ static int check_bist(adapter_t *adapter, int moduleid)
if
((
result
&
3
)
!=
0x3
)
if
((
result
&
3
)
!=
0x3
)
CH_ERR
(
"Result: 0x%x BIST error in ram %d, column: 0x%04x
\n
"
,
CH_ERR
(
"Result: 0x%x BIST error in ram %d, column: 0x%04x
\n
"
,
result
,
moduleid
,
column
);
result
,
moduleid
,
column
);
return
(
0
)
;
return
0
;
}
}
static
int
enable_mem
(
adapter_t
*
adapter
,
int
moduleid
)
static
int
enable_mem
(
adapter_t
*
adapter
,
int
moduleid
)
{
{
/*enable mem*/
/*enable mem*/
(
void
)
bist_wr
(
adapter
,
moduleid
,
0x00
,
0x00
);
(
void
)
bist_wr
(
adapter
,
moduleid
,
0x00
,
0x00
);
return
(
0
)
;
return
0
;
}
}
static
int
run_bist_all
(
adapter_t
*
adapter
)
static
int
run_bist_all
(
adapter_t
*
adapter
)
...
@@ -358,7 +358,7 @@ static int run_bist_all(adapter_t *adapter)
...
@@ -358,7 +358,7 @@ static int run_bist_all(adapter_t *adapter)
udelay
(
300
);
udelay
(
300
);
vsc_write
(
adapter
,
REG_MEM_BIST
,
0x0
);
vsc_write
(
adapter
,
REG_MEM_BIST
,
0x0
);
mdelay
(
10
);
mdelay
(
10
);
return
(
0
)
;
return
0
;
}
}
static
int
mac_intr_handler
(
struct
cmac
*
mac
)
static
int
mac_intr_handler
(
struct
cmac
*
mac
)
...
...
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