From patchwork Fri Sep 7 07:31:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Westerberg X-Patchwork-Id: 1420481 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 1A817DF283 for ; Fri, 7 Sep 2012 07:33:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759702Ab2IGHa0 (ORCPT ); Fri, 7 Sep 2012 03:30:26 -0400 Received: from mga01.intel.com ([192.55.52.88]:21417 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759880Ab2IGH3e (ORCPT ); Fri, 7 Sep 2012 03:29:34 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 07 Sep 2012 00:29:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,384,1344236400"; d="scan'208";a="219221413" Received: from lahna.fi.intel.com ([10.237.72.166]) by fmsmga001.fm.intel.com with ESMTP; 07 Sep 2012 00:29:28 -0700 Received: from westeri by lahna.fi.intel.com with local (Exim 4.77) (envelope-from ) id 1T9t2g-00070v-3W; Fri, 07 Sep 2012 10:31:54 +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 07/12] Input: atlas_btns - convert to module_acpi_driver() Date: Fri, 7 Sep 2012 10:31:44 +0300 Message-Id: <1347003109-26887-8-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 Acked-by: Dmitry Torokhov --- drivers/input/misc/atlas_btns.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c index 601f737..26f1313 100644 --- a/drivers/input/misc/atlas_btns.c +++ b/drivers/input/misc/atlas_btns.c @@ -151,22 +151,7 @@ static struct acpi_driver atlas_acpi_driver = { .remove = atlas_acpi_button_remove, }, }; - -static int __init atlas_acpi_init(void) -{ - if (acpi_disabled) - return -ENODEV; - - return acpi_bus_register_driver(&atlas_acpi_driver); -} - -static void __exit atlas_acpi_exit(void) -{ - acpi_bus_unregister_driver(&atlas_acpi_driver); -} - -module_init(atlas_acpi_init); -module_exit(atlas_acpi_exit); +module_acpi_driver(atlas_acpi_driver); MODULE_AUTHOR("Jaya Kumar"); MODULE_LICENSE("GPL");