From patchwork Sun Jan 18 18:01:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 3040 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0IICtku022633 for ; Sun, 18 Jan 2009 10:12:55 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934119AbZARSRR (ORCPT ); Sun, 18 Jan 2009 13:17:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932965AbZARSRQ (ORCPT ); Sun, 18 Jan 2009 13:17:16 -0500 Received: from iksaif.net ([88.191.73.63]:58973 "EHLO iksaif.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757981AbZARSRN (ORCPT ); Sun, 18 Jan 2009 13:17:13 -0500 Received: from localhost.localdomain (cxr69-11-88-180-139-205.fbx.proxad.net [88.180.139.205]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id 6EB73C90111; Sun, 18 Jan 2009 19:11:24 +0100 (CET) From: Corentin Chary To: linux-acpi@vger.kernel.org Cc: lenb@kernel.org, Corentin Chary Subject: [PATCH] eeepc-laptop: split eeepc_backlight_exit() Date: Sun, 18 Jan 2009 19:01:50 +0100 Message-Id: <1232301715-20292-2-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1232301715-20292-1-git-send-email-corentincj@iksaif.net> References: <1232301715-20292-1-git-send-email-corentincj@iksaif.net> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org eeepc_backlight_exit() was doing rfkill and input stuff, which is a nonsense. This patch add two specific exit functions, one for input and one for rfkill. Signed-off-by: Corentin Chary --- drivers/platform/x86/eeepc-laptop.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 9d93cb9..66d611b 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c @@ -737,13 +737,21 @@ static void eeepc_backlight_exit(void) { if (eeepc_backlight_device) backlight_device_unregister(eeepc_backlight_device); - if (ehotk->inputdev) - input_unregister_device(ehotk->inputdev); + eeepc_backlight_device = NULL; +} + +static void eeepc_rfkill_exit(void) +{ if (ehotk->eeepc_wlan_rfkill) rfkill_unregister(ehotk->eeepc_wlan_rfkill); if (ehotk->eeepc_bluetooth_rfkill) rfkill_unregister(ehotk->eeepc_bluetooth_rfkill); - eeepc_backlight_device = NULL; +} + +static void eeepc_input_exit(void) +{ + if (ehotk->inputdev) + input_unregister_device(ehotk->inputdev); } static void eeepc_hwmon_exit(void) @@ -762,6 +770,8 @@ static void eeepc_hwmon_exit(void) static void __exit eeepc_laptop_exit(void) { eeepc_backlight_exit(); + eeepc_rfkill_exit(); + eeepc_input_exit(); eeepc_hwmon_exit(); acpi_bus_unregister_driver(&eeepc_hotk_driver); sysfs_remove_group(&platform_device->dev.kobj, @@ -865,6 +875,8 @@ fail_platform_driver: fail_hwmon: eeepc_backlight_exit(); fail_backlight: + eeepc_input_exit(); + eeepc_rfkill_exit(); return result; }