From patchwork Fri Sep 7 07:31:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Westerberg X-Patchwork-Id: 1420511 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 07156DF283 for ; Fri, 7 Sep 2012 07:33:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758618Ab2IGHaY (ORCPT ); Fri, 7 Sep 2012 03:30:24 -0400 Received: from mga01.intel.com ([192.55.52.88]:55250 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759959Ab2IGH3e (ORCPT ); Fri, 7 Sep 2012 03:29:34 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 07 Sep 2012 00:29:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,384,1344236400"; d="scan'208";a="218946581" Received: from lahna.fi.intel.com ([10.237.72.166]) by fmsmga002.fm.intel.com with ESMTP; 07 Sep 2012 00:29:31 -0700 Received: from westeri by lahna.fi.intel.com with local (Exim 4.77) (envelope-from ) id 1T9t2i-00071F-KH; Fri, 07 Sep 2012 10:31:56 +0300 From: Mika Westerberg To: lenb@kernel.org Cc: rui.zhang@intel.com, khali@linux-fr.org, ben-linux@fluff.org, w.sang@pengutronix.de, dmitry.torokhov@gmail.com, eric.piel@tremplin-utc.net, mjg@redhat.com, ike.pan@canonical.com, herton@canonical.com, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Mika Westerberg Subject: [PATCH RESEND 11/12] toshiba_bluetooth: convert to module_acpi_driver() Date: Fri, 7 Sep 2012 10:31:48 +0300 Message-Id: <1347003109-26887-12-git-send-email-mika.westerberg@linux.intel.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1347003109-26887-1-git-send-email-mika.westerberg@linux.intel.com> References: <1347003109-26887-1-git-send-email-mika.westerberg@linux.intel.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Signed-off-by: Mika Westerberg --- drivers/platform/x86/toshiba_bluetooth.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c index 5e5d631..e95be0b 100644 --- a/drivers/platform/x86/toshiba_bluetooth.c +++ b/drivers/platform/x86/toshiba_bluetooth.c @@ -122,30 +122,10 @@ static int toshiba_bt_rfkill_add(struct acpi_device *device) return result; } -static int __init toshiba_bt_rfkill_init(void) -{ - int result; - - result = acpi_bus_register_driver(&toshiba_bt_rfkill_driver); - if (result < 0) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "Error registering driver\n")); - return result; - } - - return 0; -} - static int toshiba_bt_rfkill_remove(struct acpi_device *device, int type) { /* clean up */ return 0; } -static void __exit toshiba_bt_rfkill_exit(void) -{ - acpi_bus_unregister_driver(&toshiba_bt_rfkill_driver); -} - -module_init(toshiba_bt_rfkill_init); -module_exit(toshiba_bt_rfkill_exit); +module_acpi_driver(toshiba_bt_rfkill_driver);