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
c7db7ba5
Commit
c7db7ba5
authored
Oct 03, 2009
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'misc' into release
parents
39340925
50d716e4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
15 deletions
+10
-15
drivers/acpi/dock.c
drivers/acpi/dock.c
+8
-8
drivers/acpi/proc.c
drivers/acpi/proc.c
+2
-0
drivers/acpi/processor_core.c
drivers/acpi/processor_core.c
+0
-7
No files found.
drivers/acpi/dock.c
View file @
c7db7ba5
...
@@ -67,7 +67,7 @@ struct dock_station {
...
@@ -67,7 +67,7 @@ struct dock_station {
struct
list_head
dependent_devices
;
struct
list_head
dependent_devices
;
struct
list_head
hotplug_devices
;
struct
list_head
hotplug_devices
;
struct
list_head
sib
i
ling
;
struct
list_head
sibling
;
struct
platform_device
*
dock_device
;
struct
platform_device
*
dock_device
;
};
};
static
LIST_HEAD
(
dock_stations
);
static
LIST_HEAD
(
dock_stations
);
...
@@ -275,7 +275,7 @@ int is_dock_device(acpi_handle handle)
...
@@ -275,7 +275,7 @@ int is_dock_device(acpi_handle handle)
if
(
is_dock
(
handle
))
if
(
is_dock
(
handle
))
return
1
;
return
1
;
list_for_each_entry
(
dock_station
,
&
dock_stations
,
sib
i
ling
)
{
list_for_each_entry
(
dock_station
,
&
dock_stations
,
sibling
)
{
if
(
find_dock_dependent_device
(
dock_station
,
handle
))
if
(
find_dock_dependent_device
(
dock_station
,
handle
))
return
1
;
return
1
;
}
}
...
@@ -619,7 +619,7 @@ register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
...
@@ -619,7 +619,7 @@ register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
* make sure this handle is for a device dependent on the dock,
* make sure this handle is for a device dependent on the dock,
* this would include the dock station itself
* this would include the dock station itself
*/
*/
list_for_each_entry
(
dock_station
,
&
dock_stations
,
sib
i
ling
)
{
list_for_each_entry
(
dock_station
,
&
dock_stations
,
sibling
)
{
/*
/*
* An ATA bay can be in a dock and itself can be ejected
* An ATA bay can be in a dock and itself can be ejected
* seperately, so there are two 'dock stations' which need the
* seperately, so there are two 'dock stations' which need the
...
@@ -651,7 +651,7 @@ void unregister_hotplug_dock_device(acpi_handle handle)
...
@@ -651,7 +651,7 @@ void unregister_hotplug_dock_device(acpi_handle handle)
if
(
!
dock_station_count
)
if
(
!
dock_station_count
)
return
;
return
;
list_for_each_entry
(
dock_station
,
&
dock_stations
,
sib
i
ling
)
{
list_for_each_entry
(
dock_station
,
&
dock_stations
,
sibling
)
{
dd
=
find_dock_dependent_device
(
dock_station
,
handle
);
dd
=
find_dock_dependent_device
(
dock_station
,
handle
);
if
(
dd
)
if
(
dd
)
dock_del_hotplug_device
(
dock_station
,
dd
);
dock_del_hotplug_device
(
dock_station
,
dd
);
...
@@ -787,7 +787,7 @@ static int acpi_dock_notifier_call(struct notifier_block *this,
...
@@ -787,7 +787,7 @@ static int acpi_dock_notifier_call(struct notifier_block *this,
if
(
event
!=
ACPI_NOTIFY_BUS_CHECK
&&
event
!=
ACPI_NOTIFY_DEVICE_CHECK
if
(
event
!=
ACPI_NOTIFY_BUS_CHECK
&&
event
!=
ACPI_NOTIFY_DEVICE_CHECK
&&
event
!=
ACPI_NOTIFY_EJECT_REQUEST
)
&&
event
!=
ACPI_NOTIFY_EJECT_REQUEST
)
return
0
;
return
0
;
list_for_each_entry
(
dock_station
,
&
dock_stations
,
sib
i
ling
)
{
list_for_each_entry
(
dock_station
,
&
dock_stations
,
sibling
)
{
if
(
dock_station
->
handle
==
handle
)
{
if
(
dock_station
->
handle
==
handle
)
{
struct
dock_data
*
dock_data
;
struct
dock_data
*
dock_data
;
...
@@ -958,7 +958,7 @@ static int dock_add(acpi_handle handle)
...
@@ -958,7 +958,7 @@ static int dock_add(acpi_handle handle)
dock_station
->
last_dock_time
=
jiffies
-
HZ
;
dock_station
->
last_dock_time
=
jiffies
-
HZ
;
INIT_LIST_HEAD
(
&
dock_station
->
dependent_devices
);
INIT_LIST_HEAD
(
&
dock_station
->
dependent_devices
);
INIT_LIST_HEAD
(
&
dock_station
->
hotplug_devices
);
INIT_LIST_HEAD
(
&
dock_station
->
hotplug_devices
);
INIT_LIST_HEAD
(
&
dock_station
->
sib
i
ling
);
INIT_LIST_HEAD
(
&
dock_station
->
sibling
);
spin_lock_init
(
&
dock_station
->
dd_lock
);
spin_lock_init
(
&
dock_station
->
dd_lock
);
mutex_init
(
&
dock_station
->
hp_lock
);
mutex_init
(
&
dock_station
->
hp_lock
);
ATOMIC_INIT_NOTIFIER_HEAD
(
&
dock_notifier_list
);
ATOMIC_INIT_NOTIFIER_HEAD
(
&
dock_notifier_list
);
...
@@ -1044,7 +1044,7 @@ static int dock_add(acpi_handle handle)
...
@@ -1044,7 +1044,7 @@ static int dock_add(acpi_handle handle)
add_dock_dependent_device
(
dock_station
,
dd
);
add_dock_dependent_device
(
dock_station
,
dd
);
dock_station_count
++
;
dock_station_count
++
;
list_add
(
&
dock_station
->
sib
i
ling
,
&
dock_stations
);
list_add
(
&
dock_station
->
sibling
,
&
dock_stations
);
return
0
;
return
0
;
dock_add_err_unregister:
dock_add_err_unregister:
...
@@ -1149,7 +1149,7 @@ static void __exit dock_exit(void)
...
@@ -1149,7 +1149,7 @@ static void __exit dock_exit(void)
struct
dock_station
*
tmp
;
struct
dock_station
*
tmp
;
unregister_acpi_bus_notifier
(
&
dock_acpi_notifier
);
unregister_acpi_bus_notifier
(
&
dock_acpi_notifier
);
list_for_each_entry_safe
(
dock_station
,
tmp
,
&
dock_stations
,
sib
i
ling
)
list_for_each_entry_safe
(
dock_station
,
tmp
,
&
dock_stations
,
sibling
)
dock_remove
(
dock_station
);
dock_remove
(
dock_station
);
}
}
...
...
drivers/acpi/proc.c
View file @
c7db7ba5
...
@@ -398,6 +398,8 @@ acpi_system_write_wakeup_device(struct file *file,
...
@@ -398,6 +398,8 @@ acpi_system_write_wakeup_device(struct file *file,
if
(
len
>
4
)
if
(
len
>
4
)
len
=
4
;
len
=
4
;
if
(
len
<
0
)
return
-
EFAULT
;
if
(
copy_from_user
(
strbuf
,
buffer
,
len
))
if
(
copy_from_user
(
strbuf
,
buffer
,
len
))
return
-
EFAULT
;
return
-
EFAULT
;
...
...
drivers/acpi/processor_core.c
View file @
c7db7ba5
...
@@ -863,13 +863,6 @@ static int acpi_processor_add(struct acpi_device *device)
...
@@ -863,13 +863,6 @@ static int acpi_processor_add(struct acpi_device *device)
goto
err_remove_sysfs
;
goto
err_remove_sysfs
;
}
}
if
(
pr
->
flags
.
throttling
)
{
printk
(
KERN_INFO
PREFIX
"%s [%s] (supports"
,
acpi_device_name
(
device
),
acpi_device_bid
(
device
));
printk
(
" %d throttling states"
,
pr
->
throttling
.
state_count
);
printk
(
")
\n
"
);
}
return
0
;
return
0
;
err_remove_sysfs:
err_remove_sysfs:
...
...
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