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
b87d5d4d
Commit
b87d5d4d
authored
21 years ago
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NET]: Fix typos in init_trdev changes to lanstreamer.c
parent
e0bbada8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
14 deletions
+17
-14
drivers/net/tokenring/lanstreamer.c
drivers/net/tokenring/lanstreamer.c
+17
-14
No files found.
drivers/net/tokenring/lanstreamer.c
View file @
b87d5d4d
...
@@ -223,8 +223,8 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
...
@@ -223,8 +223,8 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
{
{
struct
net_device
*
dev
;
struct
net_device
*
dev
;
struct
streamer_private
*
streamer_priv
;
struct
streamer_private
*
streamer_priv
;
__u32
pio_start
,
pio_end
,
pio_flags
,
pio_len
;
unsigned
long
pio_start
,
pio_end
,
pio_flags
,
pio_len
;
__u32
mmio_start
,
mmio_end
,
mmio_flags
,
mmio_len
;
unsigned
long
mmio_start
,
mmio_end
,
mmio_flags
,
mmio_len
;
int
rc
=
0
;
int
rc
=
0
;
static
int
card_no
=-
1
;
static
int
card_no
=-
1
;
u16
pcr
;
u16
pcr
;
...
@@ -287,14 +287,14 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
...
@@ -287,14 +287,14 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
#endif
#endif
if
(
!
request_region
(
pio_start
,
pio_len
,
"lanstreamer"
))
{
if
(
!
request_region
(
pio_start
,
pio_len
,
"lanstreamer"
))
{
printk
(
KERN_ERR
"lanstreamer: unable to get pci io addr %x
\n
"
,
printk
(
KERN_ERR
"lanstreamer: unable to get pci io addr %
l
x
\n
"
,
pio_start
);
pio_start
);
rc
=
-
EBUSY
;
rc
=
-
EBUSY
;
goto
err_out
;
goto
err_out
;
}
}
if
(
!
request_mem_region
(
mmio_start
,
mmio_len
,
"lanstreamer"
))
{
if
(
!
request_mem_region
(
mmio_start
,
mmio_len
,
"lanstreamer"
))
{
printk
(
KERN_ERR
"lanstreamer: unable to get pci mmio addr %x
\n
"
,
printk
(
KERN_ERR
"lanstreamer: unable to get pci mmio addr %
l
x
\n
"
,
mmio_start
);
mmio_start
);
rc
=
-
EBUSY
;
rc
=
-
EBUSY
;
goto
err_out_free_pio
;
goto
err_out_free_pio
;
...
@@ -302,7 +302,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
...
@@ -302,7 +302,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
streamer_priv
->
streamer_mmio
=
ioremap
(
mmio_start
,
mmio_len
);
streamer_priv
->
streamer_mmio
=
ioremap
(
mmio_start
,
mmio_len
);
if
(
streamer_priv
->
streamer_mmio
==
NULL
)
{
if
(
streamer_priv
->
streamer_mmio
==
NULL
)
{
printk
(
KERN_ERR
"lanstreamer: unable to remap MMIO %x
\n
"
,
printk
(
KERN_ERR
"lanstreamer: unable to remap MMIO %
l
x
\n
"
,
mmio_start
);
mmio_start
);
rc
=
-
EIO
;
rc
=
-
EIO
;
goto
err_out_free_mmio
;
goto
err_out_free_mmio
;
...
@@ -377,7 +377,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
...
@@ -377,7 +377,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
goto
err_out_unmap
;
goto
err_out_unmap
;
return
0
;
return
0
;
err_out_unmap
;
err_out_unmap
:
iounmap
(
streamer_priv
->
streamer_mmio
);
iounmap
(
streamer_priv
->
streamer_mmio
);
err_out_free_mmio:
err_out_free_mmio:
release_mem_region
(
mmio_start
,
mmio_len
);
release_mem_region
(
mmio_start
,
mmio_len
);
...
@@ -394,7 +394,6 @@ err_out_unmap;
...
@@ -394,7 +394,6 @@ err_out_unmap;
static
void
__devexit
streamer_remove_one
(
struct
pci_dev
*
pdev
)
static
void
__devexit
streamer_remove_one
(
struct
pci_dev
*
pdev
)
{
{
struct
net_device
*
dev
=
pci_get_drvdata
(
pdev
);
struct
net_device
*
dev
=
pci_get_drvdata
(
pdev
);
struct
streamer_private
**
p
=
&
dev_streamer
,
**
next
;
struct
streamer_private
*
streamer_priv
;
struct
streamer_private
*
streamer_priv
;
#if STREAMER_DEBUG
#if STREAMER_DEBUG
...
@@ -414,6 +413,9 @@ static void __devexit streamer_remove_one(struct pci_dev *pdev)
...
@@ -414,6 +413,9 @@ static void __devexit streamer_remove_one(struct pci_dev *pdev)
#if STREAMER_NETWORK_MONITOR
#if STREAMER_NETWORK_MONITOR
#ifdef CONFIG_PROC_FS
#ifdef CONFIG_PROC_FS
{
struct
streamer_private
**
p
,
**
next
;
for
(
p
=
&
dev_streamer
;
*
p
;
p
=
next
)
{
for
(
p
=
&
dev_streamer
;
*
p
;
p
=
next
)
{
next
=
&
(
*
p
)
->
next
;
next
=
&
(
*
p
)
->
next
;
if
(
*
p
==
streamer_priv
)
{
if
(
*
p
==
streamer_priv
)
{
...
@@ -423,6 +425,7 @@ static void __devexit streamer_remove_one(struct pci_dev *pdev)
...
@@ -423,6 +425,7 @@ static void __devexit streamer_remove_one(struct pci_dev *pdev)
}
}
if
(
!
dev_streamer
)
if
(
!
dev_streamer
)
remove_proc_entry
(
"net/streamer_tr"
,
NULL
);
remove_proc_entry
(
"net/streamer_tr"
,
NULL
);
}
#endif
#endif
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
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