From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754283Ab2FNHq5 (ORCPT ); Thu, 14 Jun 2012 03:46:57 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:55850 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753069Ab2FNHqz (ORCPT ); Thu, 14 Jun 2012 03:46:55 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.4.0 Message-ID: <4FD996E5.7090004@jp.fujitsu.com> Date: Thu, 14 Jun 2012 16:46:45 +0900 From: Yasuaki Ishimatsu User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: lenb@kernel.org, linux-acpi@vger.kernel.org CC: linux-kernel@vger.kernel.org Subject: [PATCH] acpi : create sun sysfs file in container device Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Even if container device has _SUN method, the method is ignored. So we cannot know slot-unique ID number of the container device. The patch creates "sun" file in sysfs so that we can recognize it. Signed-off-by: Yasuaki Ishimatsu --- drivers/acpi/container.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) Index: linux-3.5-rc1/drivers/acpi/container.c =================================================================== --- linux-3.5-rc1.orig/drivers/acpi/container.c 2012-06-14 15:35:31.045500166 +0900 +++ linux-3.5-rc1/drivers/acpi/container.c 2012-06-14 16:40:13.010405144 +0900 @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -93,10 +94,30 @@ static int is_device_present(acpi_handle } /*******************************************************************/ + +static ssize_t acpi_device_sun_show(struct device *dev, + struct device_attribute *attr, char *buf) { + struct acpi_device *device = to_acpi_device(dev); + acpi_status status; + unsigned long long sun; + + status = acpi_evaluate_integer(device->handle, "_SUN", NULL, &sun); + if (ACPI_FAILURE(status)) + return 0; + + return sprintf(buf, "%llu\n", sun); +} + +static DEVICE_ATTR(sun, 0444, acpi_device_sun_show, NULL); + +/*******************************************************************/ + static int acpi_container_add(struct acpi_device *device) { struct acpi_container *container; - + acpi_status status; + acpi_handle temp; + int result = 0; if (!device) { printk(KERN_ERR PREFIX "device is NULL\n"); @@ -115,13 +136,22 @@ static int acpi_container_add(struct acp ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device <%s> bid <%s>\n", acpi_device_name(device), acpi_device_bid(device))); - return 0; + status = acpi_get_handle(device->handle, "_SUN", &temp); + if (ACPI_SUCCESS(status)) + result = device_create_file(&device->dev, &dev_attr_sun); + + return result; } static int acpi_container_remove(struct acpi_device *device, int type) { - acpi_status status = AE_OK; + acpi_status status; struct acpi_container *pc = NULL; + acpi_handle temp; + + status = acpi_get_handle(device->handle, "_SUN", &temp); + if (ACPI_SUCCESS(status)) + device_remove_file(&device->dev, &dev_attr_sun); pc = acpi_driver_data(device); kfree(pc);