From patchwork Mon Aug 20 21:01:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 1351021 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 00A88DFB6E for ; Mon, 20 Aug 2012 21:02:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754967Ab2HTVCO (ORCPT ); Mon, 20 Aug 2012 17:02:14 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:47121 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754383Ab2HTVCN (ORCPT ); Mon, 20 Aug 2012 17:02:13 -0400 Received: by wibhr14 with SMTP id hr14so4033653wib.1 for ; Mon, 20 Aug 2012 14:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=XehTqQi23HAfdH4mV01vGYjvPYTwRJD244Y1EP1zx1g=; b=k0O4AmOxvYwS5wRGX6TpYRvINGoB5K51f36F6d5M4b2J6Q4yB0oObTC3DD+nXXCOa8 36DQ7E1jSCZIVtX6HMc1ITnlspcV/WO+O+5SW8SKAXiCOadL0c4rnxhb1pRpY84oCAOV 14w2EnEMEbtW5A7o7gFz4XB7B0KuVCQ75kBXPf6ABk7SDA46BKuvMDaIoGZo3DaQLSdl uIqBf+HRG7mwLZsmFdAPWj4FYYKroP2Ou+LQdqXlGXdUgMAH9sbVl19ZY4iqL4GMOuVS sBFFurO/jlFhuaSeQTneEvcCe8RhDgx4avynRdpEmt8+vDOjw0ydpSmpbxL0wNcAJ3Ig 8o+w== Received: by 10.217.1.79 with SMTP id m57mr7607428wes.121.1345496531920; Mon, 20 Aug 2012 14:02:11 -0700 (PDT) Received: from localhost.localdomain (iksaif.net. [83.157.108.74]) by mx.google.com with ESMTPS id fb20sm44393601wid.1.2012.08.20.14.02.07 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Aug 2012 14:02:11 -0700 (PDT) From: Corentin Chary To: Matthew Garrett Cc: linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, Corentin Chary , Joey Lee , Matthew Garrett , linux-kernel@vger.kernel.org, acpi4asus-user@lists.sourceforge.net Subject: [PATCH 1/3] drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO Date: Mon, 20 Aug 2012 23:01:50 +0200 Message-Id: <1345496512-11780-2-git-send-email-corentin.chary@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345496512-11780-1-git-send-email-corentin.chary@gmail.com> References: <1345496512-11780-1-git-send-email-corentin.chary@gmail.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Signed-off-by: Corentin Chary Acked-by: Lee, Chun-Yi --- drivers/platform/x86/acer-wmi.c | 2 -- drivers/platform/x86/apple-gmux.c | 4 ---- drivers/platform/x86/asus-wmi.c | 4 ---- drivers/platform/x86/samsung-laptop.c | 4 ---- 4 files changed, 14 deletions(-) diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index 3782e1c..934d861 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -2196,10 +2196,8 @@ static int __init acer_wmi_init(void) interface->capability &= ~ACER_CAP_BRIGHTNESS; pr_info("Brightness must be controlled by acpi video driver\n"); } else { -#ifdef CONFIG_ACPI_VIDEO pr_info("Disabling ACPI video driver\n"); acpi_video_unregister(); -#endif } if (wmi_has_guid(WMID_GUID3)) { diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c index dfb1a92..dca31ce 100644 --- a/drivers/platform/x86/apple-gmux.c +++ b/drivers/platform/x86/apple-gmux.c @@ -505,9 +505,7 @@ static int __devinit gmux_probe(struct pnp_dev *pnp, * Disable the other backlight choices. */ acpi_video_dmi_promote_vendor(); -#if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE) acpi_video_unregister(); -#endif apple_bl_unregister(); gmux_data->power_state = VGA_SWITCHEROO_ON; @@ -593,9 +591,7 @@ static void __devexit gmux_remove(struct pnp_dev *pnp) kfree(gmux_data); acpi_video_dmi_demote_vendor(); -#if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE) acpi_video_register(); -#endif apple_bl_register(); } diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 6a91a0c..912ec7d 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -47,9 +47,7 @@ #include #include #include -#ifdef CONFIG_ACPI_VIDEO #include -#endif #include "asus-wmi.h" @@ -1780,10 +1778,8 @@ static int asus_wmi_add(struct platform_device *pdev) if (asus->driver->quirks->wmi_backlight_power) acpi_video_dmi_promote_vendor(); if (!acpi_video_backlight_support()) { -#ifdef CONFIG_ACPI_VIDEO pr_info("Disabling ACPI video driver\n"); acpi_video_unregister(); -#endif err = asus_wmi_backlight_init(asus); if (err && err != -ENODEV) goto fail_backlight; diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c index c1ca7bc..dd90d15 100644 --- a/drivers/platform/x86/samsung-laptop.c +++ b/drivers/platform/x86/samsung-laptop.c @@ -26,9 +26,7 @@ #include #include #include -#ifdef CONFIG_ACPI_VIDEO #include -#endif /* * This driver is needed because a number of Samsung laptops do not hook @@ -1558,9 +1556,7 @@ static int __init samsung_init(void) samsung->handle_backlight = false; } else if (samsung->quirks->broken_acpi_video) { pr_info("Disabling ACPI video driver\n"); -#ifdef CONFIG_ACPI_VIDEO acpi_video_unregister(); -#endif } #endif