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
8ef8f7b5
Commit
8ef8f7b5
authored
Jun 08, 2003
by
Christoph Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NET]: Convert skfp over to initcalls, kill fddi cruft from Space.c
parent
8be42598
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
123 deletions
+10
-123
drivers/net/Space.c
drivers/net/Space.c
+0
-72
drivers/net/skfp/skfddi.c
drivers/net/skfp/skfddi.c
+10
-51
No files found.
drivers/net/Space.c
View file @
8ef8f7b5
...
...
@@ -105,9 +105,6 @@ extern int mc32_probe(struct net_device *dev);
/* Detachable devices ("pocket adaptors") */
extern
int
de620_probe
(
struct
net_device
*
);
/* FDDI adapters */
extern
int
skfp_probe
(
struct
net_device
*
dev
);
/* Fibre Channel adapters */
extern
int
iph5526_probe
(
struct
net_device
*
dev
);
...
...
@@ -401,29 +398,6 @@ static int __init ethif_probe(struct net_device *dev)
return
-
ENODEV
;
}
#ifdef CONFIG_FDDI
static
int
__init
fddiif_probe
(
struct
net_device
*
dev
)
{
unsigned
long
base_addr
=
dev
->
base_addr
;
if
(
base_addr
==
1
)
return
1
;
/* ENXIO */
if
(
1
#ifdef CONFIG_APFDDI
&&
apfddi_init
(
dev
)
#endif
#ifdef CONFIG_SKFP
&&
skfp_probe
(
dev
)
#endif
&&
1
)
{
return
1
;
/* -ENODEV or -EAGAIN would be more accurate. */
}
return
0
;
}
#endif
#ifdef CONFIG_NET_FC
static
int
fcif_probe
(
struct
net_device
*
dev
)
{
...
...
@@ -615,52 +589,6 @@ static struct net_device tr0_dev = {
#endif
#ifdef CONFIG_FDDI
static
struct
net_device
fddi7_dev
=
{
.
name
=
"fddi7"
,
.
next
=
NEXT_DEV
,
.
init
=
fddiif_probe
};
static
struct
net_device
fddi6_dev
=
{
.
name
=
"fddi6"
,
.
next
=
&
fddi7_dev
,
.
init
=
fddiif_probe
};
static
struct
net_device
fddi5_dev
=
{
.
name
=
"fddi5"
,
.
next
=
&
fddi6_dev
,
.
init
=
fddiif_probe
};
static
struct
net_device
fddi4_dev
=
{
.
name
=
"fddi4"
,
.
next
=
&
fddi5_dev
,
.
init
=
fddiif_probe
};
static
struct
net_device
fddi3_dev
=
{
.
name
=
"fddi3"
,
.
next
=
&
fddi4_dev
,
.
init
=
fddiif_probe
};
static
struct
net_device
fddi2_dev
=
{
.
name
=
"fddi2"
,
.
next
=
&
fddi3_dev
,
.
init
=
fddiif_probe
};
static
struct
net_device
fddi1_dev
=
{
.
name
=
"fddi1"
,
.
next
=
&
fddi2_dev
,
.
init
=
fddiif_probe
};
static
struct
net_device
fddi0_dev
=
{
.
name
=
"fddi0"
,
.
next
=
&
fddi1_dev
,
.
init
=
fddiif_probe
};
#undef NEXT_DEV
#define NEXT_DEV (&fddi0_dev)
#endif
#ifdef CONFIG_NET_FC
static
struct
net_device
fc1_dev
=
{
.
name
=
"fc1"
,
...
...
drivers/net/skfp/skfddi.c
View file @
8ef8f7b5
...
...
@@ -2539,72 +2539,25 @@ void drv_reset_indication(struct s_smc *smc)
}
// drv_reset_indication
//--------------- functions for use as a module ----------------
#ifdef MODULE
/************************
*
* Note now that module autoprobing is allowed under PCI. The
* IRQ lines will not be auto-detected; instead I'll rely on the BIOSes
* to "do the right thing".
*
************************/
#define LP(a) ((struct s_smc*)(a))
static
struct
net_device
*
mdev
;
/************************
*
* init_module
*
* If compiled as a module, find
* adapters and initialize them.
*
************************/
int
init_module
(
void
)
static
int
__init
skfd_init
(
void
)
{
struct
net_device
*
p
;
PRINTK
(
KERN_INFO
"FDDI init module
\n
"
);
if
((
mdev
=
insert_device
(
NULL
,
skfp_probe
))
==
NULL
)
return
-
ENOMEM
;
for
(
p
=
mdev
;
p
!=
NULL
;
p
=
LP
(
p
->
priv
)
->
os
.
next_module
)
{
PRINTK
(
KERN_INFO
"device to register: %s
\n
"
,
p
->
name
);
for
(
p
=
mdev
;
p
!=
NULL
;
p
=
((
struct
s_smc
*
)
p
->
priv
)
->
os
.
next_module
)
{
if
(
register_netdev
(
p
)
!=
0
)
{
printk
(
"skfddi init_module failed
\n
"
);
return
-
EIO
;
}
}
PRINTK
(
KERN_INFO
"+++++ exit with success +++++
\n
"
);
return
0
;
}
// init_module
/************************
*
* cleanup_module
*
* Release all resources claimed by this module.
*
************************/
void
cleanup_module
(
void
)
{
PRINTK
(
KERN_INFO
"cleanup_module
\n
"
);
while
(
mdev
!=
NULL
)
{
mdev
=
unlink_modules
(
mdev
);
}
return
;
}
// cleanup_module
}
/************************
*
* unlink_modules
*
* Unregister devices and release their memory.
*
************************/
static
struct
net_device
*
unlink_modules
(
struct
net_device
*
p
)
{
struct
net_device
*
next
=
NULL
;
...
...
@@ -2638,5 +2591,11 @@ static struct net_device *unlink_modules(struct net_device *p)
return
next
;
}
// unlink_modules
static
void
__exit
skfd_exit
(
void
)
{
while
(
mdev
)
mdev
=
unlink_modules
(
mdev
);
}
#endif
/* MODULE */
module_init
(
skfd_init
);
module_exit
(
skfd_exit
);
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