From patchwork Fri May 31 04:10:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 2640261 X-Patchwork-Delegate: rui.zhang@intel.com 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 13F31DFB79 for ; Fri, 31 May 2013 04:11:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750763Ab3EaELH (ORCPT ); Fri, 31 May 2013 00:11:07 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:57736 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750756Ab3EaELG (ORCPT ); Fri, 31 May 2013 00:11:06 -0400 Received: by mail-pd0-f179.google.com with SMTP id q11so1500337pdj.24 for ; Thu, 30 May 2013 21:11:04 -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; bh=uXr82mhjfDDg4ekFbo1XJ1h5d7VV4ZqJPIAehSOJnqw=; b=Upq1ZMZh/haNO+tjHwqV2Rnu1dL81F/z8Gj2OJncJPVKTs+knSQcbEkrZQp3DOjQ7L LRNR5cm+EO2+MFO7yWDjioyVylwA3KQYYVIWR8G1m39dV7dPNu1qDxQFmsMqJzH8w8LH J409x0b5Sh9aIQ7z5p41UQ/Q1eH7SKlY79fqFlf7YWfCLIF0lXGX16d7AxNxcwehiiJk QJFlUT88iavIaGb4t+GJCaoP+u7U6hlLSZ5EyEQlo4Dc3lO8oBhQYhbQna8KCt6fPBf9 +1uH5sj1w2RBu+l4ZR12pLicCk+fVUGZV1c3wc1QirqUCQXkE96Egibj/DHUdLc5Yy5R MRTw== X-Received: by 10.68.254.225 with SMTP id al1mr11328027pbd.69.1369973464623; Thu, 30 May 2013 21:11:04 -0700 (PDT) Received: from localhost.localdomain (59-124-67-67.HINET-IP.hinet.net. [59.124.67.67]) by mx.google.com with ESMTPSA id gi2sm44800313pbb.2.2013.05.30.21.11.00 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 30 May 2013 21:11:03 -0700 (PDT) From: "Lee, Chun-Yi" To: rui.zhang@intel.com, mjg@redhat.com, rjw@sisk.pl Cc: platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, "Lee, Chun-Yi" , Len Brown , Carlos Corbacho , Dmitry Torokhov , Corentin Chary , Aaron Lu , Thomas Renninger Subject: [PATCH v2 1/2] acpi: video: add function to support unregister backlight interface Date: Fri, 31 May 2013 12:10:33 +0800 Message-Id: <1369973434-8742-1-git-send-email-jlee@suse.com> X-Mailer: git-send-email 1.6.0.2 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org There have some situation we unregister whole acpi/video driver by downstream driver just want to remove backlight control interface of acpi/video. It caues we lost other functions of acpi/video, e.g. transfer acpi event to input event. So, this patch add a new function, find_video_unregister_backlight, it provide the interface let downstream driver can tell acpi/video to unregister backlight interface of all acpi video devices. Then we can keep functions of acpi/video but only remove backlight support. Reference: bko#35622 https://bugzilla.kernel.org/show_bug.cgi?id=35622 v2: Also unregister cooling devices. Tested-by: Andrzej Krentosz Cc: Zhang Rui Cc: Len Brown Cc: Rafael J. Wysocki Cc: Carlos Corbacho Cc: Matthew Garrett Cc: Dmitry Torokhov Cc: Corentin Chary Cc: Aaron Lu Cc: Thomas Renninger Signed-off-by: Lee, Chun-Yi --- drivers/acpi/video.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/acpi/video.h | 2 + 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index c3932d0..f21104d 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1861,6 +1861,60 @@ static int __init intel_opregion_present(void) return opregion; } +static acpi_status +find_video_unregister_backlight(acpi_handle handle, u32 lvl, void *context, + void **rv) +{ + struct acpi_device *acpi_dev; + struct acpi_video_bus *video; + struct acpi_video_device *dev, *next; + + if (acpi_bus_get_device(handle, &acpi_dev)) + return AE_OK; + + if (!acpi_match_device_ids(acpi_dev, video_device_ids)) { + video = acpi_driver_data(acpi_dev); + acpi_video_bus_stop_devices(video); + mutex_lock(&video->device_list_lock); + list_for_each_entry_safe(dev, next, &video->video_device_list, + entry) { + if (dev->backlight) { + backlight_device_unregister(dev->backlight); + dev->backlight = NULL; + kfree(dev->brightness->levels); + kfree(dev->brightness); + } + if (dev->cooling_dev) { + sysfs_remove_link(&dev->dev->dev.kobj, + "thermal_cooling"); + sysfs_remove_link(&dev->cooling_dev->device.kobj, + "device"); + thermal_cooling_device_unregister(dev->cooling_dev); + dev->cooling_dev = NULL; + } + } + mutex_unlock(&video->device_list_lock); + acpi_video_bus_start_devices(video); + } + return AE_OK; +} + +void acpi_video_backlight_unregister(void) +{ + if (!register_count) { + /* + * If the acpi video bus is already unloaded, don't + * unregister backlight of devices and return directly. + */ + return; + } + acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, + ACPI_UINT32_MAX, find_video_unregister_backlight, + NULL, NULL, NULL); + return; +} +EXPORT_SYMBOL(acpi_video_backlight_unregister); + int acpi_video_register(void) { int result = 0; diff --git a/include/acpi/video.h b/include/acpi/video.h index 61109f2..1e810a1 100644 --- a/include/acpi/video.h +++ b/include/acpi/video.h @@ -19,11 +19,13 @@ struct acpi_device; #if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE) extern int acpi_video_register(void); extern void acpi_video_unregister(void); +extern void acpi_video_backlight_unregister(void); extern int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, void **edid); #else static inline int acpi_video_register(void) { return 0; } static inline void acpi_video_unregister(void) { return; } +static inline void acpi_video_backlight_unregister(void) { return; } static inline int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, void **edid) {