From: Jiang Liu <jiang.liu@huawei.com>
To: "Rafael J . Wysocki" <rjw@sisk.pl>,
Bjorn Helgaas <bhelgaas@google.com>,
Yinghai Lu <yinghai@kernel.org>,
"Alexander E . Patrakov" <patrakov@gmail.com>
Cc: Jiang Liu <jiang.liu@huawei.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Yijing Wang <wangyijing@huawei.com>, Jiang Liu <liuj97@gmail.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Shaohua Li <shaohua.li@intel.com>, Len Brown <lenb@kernel.org>,
linux-acpi@vger.kernel.org
Subject: [BUGFIX 5/9] ACPI, DOCK: kill redundant spin lock in dock device object
Date: Fri, 14 Jun 2013 00:32:28 +0800 [thread overview]
Message-ID: <1371141152-9468-6-git-send-email-jiang.liu@huawei.com> (raw)
In-Reply-To: <1371141152-9468-1-git-send-email-jiang.liu@huawei.com>
All dock device related data structures are created during driver
initialization, so kill the redundant spin lock in dock device object.
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Shaohua Li <shaohua.li@intel.com>
Cc: Len Brown <lenb@kernel.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-acpi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
drivers/acpi/dock.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 8e578aa..cd2d5df 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -57,7 +57,6 @@ struct dock_station {
acpi_handle handle;
unsigned long last_dock_time;
u32 flags;
- spinlock_t dd_lock;
struct mutex hp_lock;
struct task_struct *owner;
struct list_head dependent_devices;
@@ -107,10 +106,7 @@ add_dock_dependent_device(struct dock_station *ds, acpi_handle handle)
dd->handle = handle;
INIT_LIST_HEAD(&dd->list);
INIT_LIST_HEAD(&dd->hotplug_list);
-
- spin_lock(&ds->dd_lock);
list_add_tail(&dd->list, &ds->dependent_devices);
- spin_unlock(&ds->dd_lock);
return 0;
}
@@ -168,14 +164,10 @@ find_dock_dependent_device(struct dock_station *ds, acpi_handle handle)
{
struct dock_dependent_device *dd;
- spin_lock(&ds->dd_lock);
- list_for_each_entry(dd, &ds->dependent_devices, list) {
- if (handle == dd->handle) {
- spin_unlock(&ds->dd_lock);
+ list_for_each_entry(dd, &ds->dependent_devices, list)
+ if (handle == dd->handle)
return dd;
- }
- }
- spin_unlock(&ds->dd_lock);
+
return NULL;
}
@@ -964,7 +956,6 @@ static int __init dock_add(acpi_handle handle)
dock_station->last_dock_time = jiffies - HZ;
mutex_init(&dock_station->hp_lock);
- spin_lock_init(&dock_station->dd_lock);
INIT_LIST_HEAD(&dock_station->sibling);
INIT_LIST_HEAD(&dock_station->hotplug_devices);
INIT_LIST_HEAD(&dock_station->dependent_devices);
--
1.8.1.2
next prev parent reply other threads:[~2013-06-13 16:32 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-13 16:32 [BUGFIX 0/9] Fix bug 59501 and code improvement for dock driver Jiang Liu
2013-06-13 16:32 ` [BUGFIX 1/9] ACPI, DOCK: initialize dock subsystem before scanning PCI root buses Jiang Liu
2013-06-13 18:22 ` Rafael J. Wysocki
2013-06-13 18:24 ` Rafael J. Wysocki
2013-06-13 16:32 ` [BUGFIX 2/9] ACPIPHP: fix device destroying order issue when handling dock notification Jiang Liu
2013-06-13 19:59 ` Rafael J. Wysocki
2013-06-14 12:23 ` Rafael J. Wysocki
2013-06-14 12:30 ` Alexander E. Patrakov
2013-06-14 12:53 ` Rafael J. Wysocki
2013-06-14 16:58 ` Alexander E. Patrakov
2013-06-14 13:57 ` Jiang Liu
2013-06-14 14:12 ` Rafael J. Wysocki
2013-06-14 15:30 ` Jiang Liu
2013-06-14 23:12 ` Rafael J. Wysocki
2013-06-14 13:53 ` Jiang Liu
2013-06-14 14:05 ` Rafael J. Wysocki
2013-06-13 16:32 ` [BUGFIX 3/9] ACPI, DOCK: clean up unused module related code Jiang Liu
2013-06-13 18:26 ` Rafael J. Wysocki
2013-06-13 18:39 ` Rafael J. Wysocki
2013-06-14 14:04 ` Jiang Liu
2013-06-14 14:16 ` Rafael J. Wysocki
2013-06-13 16:32 ` [BUGFIX 4/9] ACPI, DOCK: avoid initializing acpi_dock_notifier_list multiple times Jiang Liu
2013-06-13 18:27 ` Rafael J. Wysocki
2013-06-13 16:32 ` Jiang Liu [this message]
2013-06-13 18:28 ` [BUGFIX 5/9] ACPI, DOCK: kill redundant spin lock in dock device object Rafael J. Wysocki
2013-06-14 14:05 ` Jiang Liu
2013-06-14 14:16 ` Rafael J. Wysocki
2013-06-13 16:32 ` [BUGFIX 6/9] ACPI, DOCK: mark initialization functions with __init Jiang Liu
2013-06-13 18:29 ` Rafael J. Wysocki
2013-06-13 16:32 ` [BUGFIX 7/9] ACPI, DOCK: simplify implementation of dock_create_acpi_device() Jiang Liu
2013-06-13 16:32 ` [BUGFIX 8/9] ACPI: introduce several helper functions Jiang Liu
2013-06-13 18:36 ` Rafael J. Wysocki
2013-06-13 16:32 ` [BUGFIX 9/9] ACPI: use new helper functions to simpilify code Jiang Liu
2013-06-13 17:34 ` Alexander E. Patrakov
2013-06-13 18:38 ` Rafael J. Wysocki
2013-06-13 17:43 ` [BUGFIX 0/9] Fix bug 59501 and code improvement for dock driver Alexander E. Patrakov
2013-06-13 18:26 ` Alexander E. Patrakov
2013-06-13 18:42 ` Yinghai Lu
2013-06-13 19:02 ` Rafael J. Wysocki
2013-06-13 19:08 ` Yinghai Lu
2013-06-14 2:06 ` Alexander E. Patrakov
2013-06-14 3:22 ` Yinghai Lu
2013-06-14 3:57 ` Alexander E. Patrakov
2013-06-14 2:09 ` Jiang Liu (Gerry)
2013-06-14 2:30 ` Yinghai Lu
2013-06-14 2:40 ` Alexander E. Patrakov
2013-06-14 2:51 ` Jiang Liu (Gerry)
2013-06-14 3:30 ` Yinghai Lu
2013-06-14 3:43 ` Yinghai Lu
2013-06-14 3:56 ` Jiang Liu (Gerry)
2013-06-14 3:53 ` Yinghai Lu
2013-06-14 4:07 ` Alexander E. Patrakov
2013-06-14 4:14 ` Jiang Liu (Gerry)
2013-06-14 4:43 ` Alexander E. Patrakov
2013-06-14 5:11 ` Jiang Liu (Gerry)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371141152-9468-6-git-send-email-jiang.liu@huawei.com \
--to=jiang.liu@huawei.com \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=liuj97@gmail.com \
--cc=patrakov@gmail.com \
--cc=rjw@sisk.pl \
--cc=shaohua.li@intel.com \
--cc=wangyijing@huawei.com \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).