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
8528eb38
Commit
8528eb38
authored
Mar 07, 2002
by
Kai Germaschewski
Committed by
Linus Torvalds
Mar 07, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] pnpbios compilation warning fix
Declare pnpbios_init as returning int, as __initcalls are supposed to.
parent
eabbc63c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
drivers/pnp/pnpbios_core.c
drivers/pnp/pnpbios_core.c
+3
-2
include/linux/pnpbios.h
include/linux/pnpbios.h
+1
-1
No files found.
drivers/pnp/pnpbios_core.c
View file @
8528eb38
...
@@ -1189,7 +1189,7 @@ __setup("pnpbios=", pnpbios_setup);
...
@@ -1189,7 +1189,7 @@ __setup("pnpbios=", pnpbios_setup);
subsys_initcall
(
pnpbios_init
);
subsys_initcall
(
pnpbios_init
);
void
__init
pnpbios_init
(
void
)
int
__init
pnpbios_init
(
void
)
{
{
union
pnp_bios_expansion_header
*
check
;
union
pnp_bios_expansion_header
*
check
;
u8
sum
;
u8
sum
;
...
@@ -1200,7 +1200,7 @@ void __init pnpbios_init(void)
...
@@ -1200,7 +1200,7 @@ void __init pnpbios_init(void)
if
(
pnpbios_disabled
)
{
if
(
pnpbios_disabled
)
{
printk
(
KERN_INFO
"PnPBIOS: Disabled.
\n
"
);
printk
(
KERN_INFO
"PnPBIOS: Disabled.
\n
"
);
return
;
return
0
;
}
}
if
(
is_sony_vaio_laptop
)
if
(
is_sony_vaio_laptop
)
...
@@ -1253,6 +1253,7 @@ void __init pnpbios_init(void)
...
@@ -1253,6 +1253,7 @@ void __init pnpbios_init(void)
if
(
kernel_thread
(
pnp_dock_thread
,
NULL
,
CLONE_FS
|
CLONE_FILES
|
CLONE_SIGNAL
)
>
0
)
if
(
kernel_thread
(
pnp_dock_thread
,
NULL
,
CLONE_FS
|
CLONE_FILES
|
CLONE_SIGNAL
)
>
0
)
unloading
=
0
;
unloading
=
0
;
#endif
#endif
return
0
;
}
}
#ifdef MODULE
#ifdef MODULE
...
...
include/linux/pnpbios.h
View file @
8528eb38
...
@@ -142,7 +142,7 @@ static __inline struct pnpbios_driver *pnpbios_dev_driver(const struct pci_dev *
...
@@ -142,7 +142,7 @@ static __inline struct pnpbios_driver *pnpbios_dev_driver(const struct pci_dev *
extern
int
pnpbios_dont_use_current_config
;
extern
int
pnpbios_dont_use_current_config
;
extern
void
*
pnpbios_kmalloc
(
size_t
size
,
int
f
);
extern
void
*
pnpbios_kmalloc
(
size_t
size
,
int
f
);
extern
void
pnpbios_init
(
void
);
extern
int
pnpbios_init
(
void
);
extern
void
pnpbios_proc_init
(
void
);
extern
void
pnpbios_proc_init
(
void
);
extern
int
pnp_bios_dev_node_info
(
struct
pnp_dev_node_info
*
data
);
extern
int
pnp_bios_dev_node_info
(
struct
pnp_dev_node_info
*
data
);
...
...
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