Commits · 0177f29fea534ef5e6af2d76e9a9be0fdd325c4d · Kirill Smelkov / linux

25 Jul, 2013 1 commit

ACPI / dock: fix error return code in dock_add() · 0177f29f

Wei Yongjun authored Jul 17, 2013

Fix to return -ENODEV in the acpi notify handler install error
handling case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

0177f29f

14 Jul, 2013 35 commits

ACPI / dock: Drop unnecessary local variable from dock_add() · 2efbca4d

Rafael J. Wysocki authored Jul 05, 2013

The local variable id in dock_add() is not necessary, so drop it.

While we're at it, use an initializer to clear the local variable ds
and drop the memset() used for this purpose.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

2efbca4d

ACPI / dock / PCI: Drop ACPI dock notifier chain · f09ce741

Rafael J. Wysocki authored Jul 05, 2013

The only user of the ACPI dock notifier chain is the ACPI-based PCI
hotplug (acpiphp) driver that uses it to carry out post-dock fixups
needed by some systems with broken _DCK. However, it is not
necessary to use a separate notifier chain for that, as it can be
simply replaced with a new callback in struct acpi_dock_ops.

For this reason, add a new .fixup() callback to struct acpi_dock_ops
and make hotplug_dock_devices() execute it for all dock devices with
hotplug operations registered. Accordingly, make acpiphp point that
callback to the function carrying out the post-dock fixups and
do not register a separate dock notifier for each device
registering dock operations. Finally, drop the ACPI dock notifier
chain that has no more users.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

f09ce741

ACPI / dock: Do not check CONFIG_ACPI_DOCK_MODULE · e6c215f1

Rafael J. Wysocki authored Jul 05, 2013

Since commit 94add0f8 (ACPI / dock: Initialize ACPI dock subsystem
upfront) the ACPI dock driver cannot be a module, so
CONFIG_ACPI_DOCK_MODULE is never set.  For this reason, simplify
the preprocessor conditional in include/acpi/acpi_drivers.h
referring to that sybbol unnecessarily.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

e6c215f1

ACPI / dock: Do not leak memory on falilures to add a dock station · a30c4c5e

Rafael J. Wysocki authored Jun 30, 2013

The function creating and registering dock station objects,
dock_add(), leaks memory if there's an error after it's walked
the ACPI namespace calling find_dock_devices(), because it doesn't
free the list of dependent devices it's just created in those cases.

Fix that issue by adding the missing code to free the list of
dependent devices on errors.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

a30c4c5e

ACPI: Drop ACPI bus notifier call chain · f716fc2a

Rafael J. Wysocki authored Jun 30, 2013

There are no users of the ACPI bus notifier call chain,
acpi_bus_notify_list, any more, so drop it.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

f716fc2a

ACPI / dock: Rework the handling of notifications · 59401ccc

Rafael J. Wysocki authored Jun 30, 2013

The ACPI dock driver uses register_acpi_bus_notifier() which
installs a notifier triggered globally for all system notifications.
That first of all is inefficient, because the dock driver is only
interested in notifications associated with the devices it handles,
but it has to handle all system notifies for all devices.  Moreover,
it does that even if no docking stations are present in the system
(CONFIG_ACPI_DOCK set is sufficient for that to happen).  Besides,
that is inconvenient, because it requires the driver to do extra work
for each notification to find the target dock station object.

For these reasons, rework the dock driver to install a notify
handler individually for each dock station in the system using
acpi_install_notify_handler().  This allows the dock station
object to be passed directly to the notify handler and makes it
possible to simplify the dock driver quite a bit.  It also
reduces the overhead related to the handling of all system
notifies when CONFIG_ACPI_DOCK is set.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>

59401ccc

ACPI / dock: Simplify dock_init_hotplug() and dock_release_hotplug() · 4ec24065

Rafael J. Wysocki authored Jun 30, 2013

Make dock_init_hotplug() and dock_release_hotplug() slightly simpler
and move some checks in those functions to the code paths where they
are needed.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>

4ec24065

ACPI / dock: Walk list in reverse order during removal of devices · 37f90877

Rafael J. Wysocki authored Jun 30, 2013

If there are indirect dependencies between devices in a dock
station's dependent devices list, they may be broken if the devices
are removed in the same order in which they have been added.

For this reason, make the code in handle_eject_request() walk the
list of dependent devices in reverse order.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>

37f90877

ACPI / dock: Rework and simplify find_dock_devices() · 96c0a4d4

Rafael J. Wysocki authored Jun 30, 2013

Since acpi_walk_namespace() calls find_dock_devices() during tree
pre-order visit, the latter doesn't need to add devices whose
parents have _EJD pointing to the docking station to the list of
that station's dependent devices, because those parents are going to
be added to that list anyway and the removal of a parent will take
care of the removal of its children in those cases.

For this reason, rework find_dock_devices() to only call
add_dock_dependent_device() for devices whose _EJD point directy to
the docking station represented by its context argument and simplify
it slightly.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>

96c0a4d4

ACPI / dock: Drop the hp_lock mutex from struct dock_station · d460aceb

Rafael J. Wysocki authored Jun 30, 2013

The only existing user of the hp_lock mutex in struct dock_station,
hotplug_dock_devices(), is always called under acpi_scan_lock and
cannot race with another instance of itself, so drop the mutex
which is not necessary.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

d460aceb