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
a4fd4946
Commit
a4fd4946
authored
Aug 25, 2007
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Pull misc into release branch
parents
a3a1b26e
5e1f198b
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
7 deletions
+9
-7
drivers/acpi/namespace/nsxfeval.c
drivers/acpi/namespace/nsxfeval.c
+1
-1
drivers/acpi/scan.c
drivers/acpi/scan.c
+3
-2
drivers/acpi/sleep/main.c
drivers/acpi/sleep/main.c
+1
-1
drivers/acpi/utilities/utglobal.c
drivers/acpi/utilities/utglobal.c
+1
-0
drivers/pci/hotplug/acpiphp_ibm.c
drivers/pci/hotplug/acpiphp_ibm.c
+1
-1
include/acpi/acpixf.h
include/acpi/acpixf.h
+1
-1
include/acpi/acstruct.h
include/acpi/acstruct.h
+1
-1
No files found.
drivers/acpi/namespace/nsxfeval.c
View file @
a4fd4946
...
@@ -540,7 +540,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
...
@@ -540,7 +540,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
******************************************************************************/
******************************************************************************/
acpi_status
acpi_status
acpi_get_devices
(
char
*
HID
,
acpi_get_devices
(
c
onst
c
har
*
HID
,
acpi_walk_callback
user_function
,
acpi_walk_callback
user_function
,
void
*
context
,
void
**
return_value
)
void
*
context
,
void
**
return_value
)
{
{
...
...
drivers/acpi/scan.c
View file @
a4fd4946
...
@@ -35,8 +35,9 @@ struct acpi_device_bus_id{
...
@@ -35,8 +35,9 @@ struct acpi_device_bus_id{
* e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get:
* e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get:
* char *modalias: "acpi:IBM0001:ACPI0001"
* char *modalias: "acpi:IBM0001:ACPI0001"
*/
*/
int
create_modalias
(
struct
acpi_device
*
acpi_dev
,
char
*
modalias
,
int
size
){
static
int
create_modalias
(
struct
acpi_device
*
acpi_dev
,
char
*
modalias
,
int
size
)
{
int
len
;
int
len
;
if
(
!
acpi_dev
->
flags
.
hardware_id
)
if
(
!
acpi_dev
->
flags
.
hardware_id
)
...
...
drivers/acpi/sleep/main.c
View file @
a4fd4946
...
@@ -305,7 +305,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p)
...
@@ -305,7 +305,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p)
unsigned
long
d_min
,
d_max
;
unsigned
long
d_min
,
d_max
;
if
(
!
handle
||
ACPI_FAILURE
(
acpi_bus_get_device
(
handle
,
&
adev
)))
{
if
(
!
handle
||
ACPI_FAILURE
(
acpi_bus_get_device
(
handle
,
&
adev
)))
{
printk
(
KERN_
ERR
"ACPI handle has no context!
\n
"
);
printk
(
KERN_
DEBUG
"ACPI handle has no context!
\n
"
);
return
-
ENODEV
;
return
-
ENODEV
;
}
}
...
...
drivers/acpi/utilities/utglobal.c
View file @
a4fd4946
...
@@ -126,6 +126,7 @@ const char *acpi_format_exception(acpi_status status)
...
@@ -126,6 +126,7 @@ const char *acpi_format_exception(acpi_status status)
"Unknown exception code: 0x%8.8X"
,
status
));
"Unknown exception code: 0x%8.8X"
,
status
));
exception
=
"UNKNOWN_STATUS_CODE"
;
exception
=
"UNKNOWN_STATUS_CODE"
;
dump_stack
();
}
}
return
(
ACPI_CAST_PTR
(
const
char
,
exception
));
return
(
ACPI_CAST_PTR
(
const
char
,
exception
));
...
...
drivers/pci/hotplug/acpiphp_ibm.c
View file @
a4fd4946
...
@@ -399,7 +399,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
...
@@ -399,7 +399,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
status
=
acpi_get_object_info
(
handle
,
&
info_buffer
);
status
=
acpi_get_object_info
(
handle
,
&
info_buffer
);
if
(
ACPI_FAILURE
(
status
))
{
if
(
ACPI_FAILURE
(
status
))
{
err
(
"%s: Failed to get device information"
,
__FUNCTION__
);
err
(
"%s: Failed to get device information
\n
"
,
__FUNCTION__
);
return
0
;
return
0
;
}
}
info
.
hardware_id
.
value
[
sizeof
(
info
.
hardware_id
.
value
)
-
1
]
=
'\0'
;
info
.
hardware_id
.
value
[
sizeof
(
info
.
hardware_id
.
value
)
-
1
]
=
'\0'
;
...
...
include/acpi/acpixf.h
View file @
a4fd4946
...
@@ -130,7 +130,7 @@ acpi_walk_namespace(acpi_object_type type,
...
@@ -130,7 +130,7 @@ acpi_walk_namespace(acpi_object_type type,
void
*
context
,
void
**
return_value
);
void
*
context
,
void
**
return_value
);
acpi_status
acpi_status
acpi_get_devices
(
char
*
HID
,
acpi_get_devices
(
c
onst
c
har
*
HID
,
acpi_walk_callback
user_function
,
acpi_walk_callback
user_function
,
void
*
context
,
void
**
return_value
);
void
*
context
,
void
**
return_value
);
...
...
include/acpi/acstruct.h
View file @
a4fd4946
...
@@ -146,7 +146,7 @@ struct acpi_init_walk_info {
...
@@ -146,7 +146,7 @@ struct acpi_init_walk_info {
struct
acpi_get_devices_info
{
struct
acpi_get_devices_info
{
acpi_walk_callback
user_function
;
acpi_walk_callback
user_function
;
void
*
context
;
void
*
context
;
char
*
hid
;
c
onst
c
har
*
hid
;
};
};
union
acpi_aml_operands
{
union
acpi_aml_operands
{
...
...
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