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
4ece0843
Commit
4ece0843
authored
Apr 01, 2003
by
Rusty Russell
Committed by
Linus Torvalds
Apr 01, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] net_pcnet32.c remove check_region
From: Marcus Alanen <maalanen@ra.abo.fi>
parent
8ecf6d1a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
13 deletions
+24
-13
drivers/net/pcnet32.c
drivers/net/pcnet32.c
+24
-13
No files found.
drivers/net/pcnet32.c
View file @
4ece0843
...
...
@@ -468,10 +468,13 @@ pcnet32_probe_vlbus(void)
/* search for PCnet32 VLB cards at known addresses */
for
(
port
=
pcnet32_portlist
;
(
ioaddr
=
*
port
);
port
++
)
{
if
(
!
check_region
(
ioaddr
,
PCNET32_TOTAL_SIZE
))
{
/* check if there is really a pcnet chip on that ioaddr */
if
((
inb
(
ioaddr
+
14
)
==
0x57
)
&&
(
inb
(
ioaddr
+
15
)
==
0x57
))
pcnet32_probe1
(
ioaddr
,
0
,
0
,
NULL
);
if
(
request_region
(
ioaddr
,
PCNET32_TOTAL_SIZE
,
"pcnet32_probe_vlbus"
))
{
/* check if there is really a pcnet chip on that ioaddr */
if
((
inb
(
ioaddr
+
14
)
==
0x57
)
&&
(
inb
(
ioaddr
+
15
)
==
0x57
))
{
pcnet32_probe1
(
ioaddr
,
0
,
0
,
NULL
);
}
else
{
release_region
(
ioaddr
,
PCNET32_TOTAL_SIZE
);
}
}
}
}
...
...
@@ -500,6 +503,10 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
printk
(
KERN_ERR
PFX
"architecture does not support 32bit PCI busmaster DMA
\n
"
);
return
-
ENODEV
;
}
if
(
request_region
(
ioaddr
,
PCNET32_TOTAL_SIZE
,
"pcnet32_probe_pci"
)
==
NULL
)
{
printk
(
KERN_ERR
PFX
"io address range already allocated
\n
"
);
return
-
EBUSY
;
}
return
pcnet32_probe1
(
ioaddr
,
pdev
->
irq
,
1
,
pdev
);
}
...
...
@@ -533,15 +540,19 @@ pcnet32_probe1(unsigned long ioaddr, unsigned int irq_line, int shared,
pcnet32_dwio_reset
(
ioaddr
);
if
(
pcnet32_dwio_read_csr
(
ioaddr
,
0
)
==
4
&&
pcnet32_dwio_check
(
ioaddr
))
{
a
=
&
pcnet32_dwio
;
}
else
return
-
ENODEV
;
}
else
{
release_region
(
ioaddr
,
PCNET32_TOTAL_SIZE
);
return
-
ENODEV
;
}
}
chip_version
=
a
->
read_csr
(
ioaddr
,
88
)
|
(
a
->
read_csr
(
ioaddr
,
89
)
<<
16
);
if
(
pcnet32_debug
>
2
)
printk
(
KERN_INFO
" PCnet chip version is %#x.
\n
"
,
chip_version
);
if
((
chip_version
&
0xfff
)
!=
0x003
)
return
-
ENODEV
;
if
((
chip_version
&
0xfff
)
!=
0x003
)
{
release_region
(
ioaddr
,
PCNET32_TOTAL_SIZE
);
return
-
ENODEV
;
}
/* initialize variables */
fdx
=
mii
=
fset
=
dxsuflo
=
ltint
=
0
;
...
...
@@ -603,6 +614,7 @@ pcnet32_probe1(unsigned long ioaddr, unsigned int irq_line, int shared,
default:
printk
(
KERN_INFO
PFX
"PCnet version %#x, no PCnet32 chip.
\n
"
,
chip_version
);
release_region
(
ioaddr
,
PCNET32_TOTAL_SIZE
);
return
-
ENODEV
;
}
...
...
@@ -622,8 +634,10 @@ pcnet32_probe1(unsigned long ioaddr, unsigned int irq_line, int shared,
}
dev
=
alloc_etherdev
(
0
);
if
(
!
dev
)
return
-
ENOMEM
;
if
(
!
dev
)
{
release_region
(
ioaddr
,
PCNET32_TOTAL_SIZE
);
return
-
ENOMEM
;
}
printk
(
KERN_INFO
PFX
"%s at %#3lx,"
,
chipname
,
ioaddr
);
...
...
@@ -691,9 +705,6 @@ pcnet32_probe1(unsigned long ioaddr, unsigned int irq_line, int shared,
}
dev
->
base_addr
=
ioaddr
;
if
(
request_region
(
ioaddr
,
PCNET32_TOTAL_SIZE
,
chipname
)
==
NULL
)
return
-
EBUSY
;
/* pci_alloc_consistent returns page-aligned memory, so we do not have to check the alignment */
if
((
lp
=
pci_alloc_consistent
(
pdev
,
sizeof
(
*
lp
),
&
lp_dma_addr
))
==
NULL
)
{
release_region
(
ioaddr
,
PCNET32_TOTAL_SIZE
);
...
...
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