From patchwork Sat Oct 6 20:09:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 1559701 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 6306040D2D for ; Sat, 6 Oct 2012 20:18:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752799Ab2JFUSn (ORCPT ); Sat, 6 Oct 2012 16:18:43 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:35485 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751649Ab2JFUSm (ORCPT ); Sat, 6 Oct 2012 16:18:42 -0400 Received: by mail-qa0-f46.google.com with SMTP id c26so1239834qad.19 for ; Sat, 06 Oct 2012 13:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:reply-to:organization; bh=Ko9CrSIZXM5bqAbs23PlV9+AT169eds+TxQK7LMHIUE=; b=fYwJ9t7WApwf5Wx5CinsNMXUbA3y5MktlDYuNpMUULElflhtRpHwki4tz0dk7O3+Zl KhPIjs8bs8Htiei4QOS7EPJTS3vGMH4NYfG6tomLQbqguYQlqDYPSu+S0iwgCxPatahU j5xeIzreFvRgUuMFYPzl1cJApzqx1JgKkBoZ/iSRASJnj8TlwsrH1i5FRh/9kCoIHp2R B7GcdkB6cgvdOMDCxo9tupnIvPyhwvvn5XcDnlgprqvRk8oilpdN7dRkEagCEigc6mR7 o0xJWgWGKUcCaCsrKrjUrjvmbRIRm3lHS2voNHETGEDHQsSxlAnXLTFdTnfVJz6hqjVA OvxA== Received: by 10.49.3.227 with SMTP id f3mr33441512qef.60.1349554721628; Sat, 06 Oct 2012 13:18:41 -0700 (PDT) Received: from x980.localdomain6 (pool-74-104-146-186.bstnma.fios.verizon.net. [74.104.146.186]) by mx.google.com with ESMTPS id x19sm13470740qeq.12.2012.10.06.13.18.17 (version=SSLv3 cipher=OTHER); Sat, 06 Oct 2012 13:18:27 -0700 (PDT) From: Len Brown To: linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Mika Westerberg , Len Brown Subject: [PATCH 29/49] toshiba_bluetooth: convert to module_acpi_driver() Date: Sat, 6 Oct 2012 16:09:50 -0400 Message-Id: <01d1775301f950ea463e2184b67b6bc9b68f5bae.1349554106.git.len.brown@intel.com> X-Mailer: git-send-email 1.8.0.rc0.18.gf84667d In-Reply-To: <1349554210-29978-1-git-send-email-lenb@kernel.org> References: <1349554210-29978-1-git-send-email-lenb@kernel.org> In-Reply-To: References: Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Mika Westerberg Signed-off-by: Mika Westerberg Signed-off-by: Len Brown --- 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);