| Message ID | 1371141152-9468-5-git-send-email-jiang.liu@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Friday, June 14, 2013 12:32:27 AM Jiang Liu wrote: > Initialize acpi_dock_notifier_list from function acpi_dock_init() > instead of dock_add() to avoid initializing it multiple times. Well, makes sense. Thanks, Rafael > 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 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c > index 50e38b7..8e578aa 100644 > --- a/drivers/acpi/dock.c > +++ b/drivers/acpi/dock.c > @@ -967,7 +967,6 @@ static int __init dock_add(acpi_handle handle) > spin_lock_init(&dock_station->dd_lock); > INIT_LIST_HEAD(&dock_station->sibling); > INIT_LIST_HEAD(&dock_station->hotplug_devices); > - ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list); > INIT_LIST_HEAD(&dock_station->dependent_devices); > > /* we want the dock device to send uevents */ > @@ -1038,6 +1037,7 @@ int __init acpi_dock_init(void) > return 0; > } > > + ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list); > register_acpi_bus_notifier(&dock_acpi_notifier); > pr_info(PREFIX "%s: %d docks/bays found\n", > ACPI_DOCK_DRIVER_DESCRIPTION, dock_station_count); >
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 50e38b7..8e578aa 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -967,7 +967,6 @@ static int __init dock_add(acpi_handle handle) spin_lock_init(&dock_station->dd_lock); INIT_LIST_HEAD(&dock_station->sibling); INIT_LIST_HEAD(&dock_station->hotplug_devices); - ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list); INIT_LIST_HEAD(&dock_station->dependent_devices); /* we want the dock device to send uevents */ @@ -1038,6 +1037,7 @@ int __init acpi_dock_init(void) return 0; } + ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list); register_acpi_bus_notifier(&dock_acpi_notifier); pr_info(PREFIX "%s: %d docks/bays found\n", ACPI_DOCK_DRIVER_DESCRIPTION, dock_station_count);
Initialize acpi_dock_notifier_list from function acpi_dock_init() instead of dock_add() to avoid initializing it multiple times. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)