From patchwork Mon Jul 30 00:58:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yasuaki Ishimatsu X-Patchwork-Id: 1253121 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 BFE3F3FD2C for ; Mon, 30 Jul 2012 00:59:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753747Ab2G3A7I (ORCPT ); Sun, 29 Jul 2012 20:59:08 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:56189 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753685Ab2G3A7H (ORCPT ); Sun, 29 Jul 2012 20:59:07 -0400 Received: from m2.gw.fujitsu.co.jp (unknown [10.0.50.72]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 3B14B3EE0BC; Mon, 30 Jul 2012 09:59:05 +0900 (JST) Received: from smail (m2 [127.0.0.1]) by outgoing.m2.gw.fujitsu.co.jp (Postfix) with ESMTP id 1B4F245DE4D; Mon, 30 Jul 2012 09:59:05 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (s2.gw.fujitsu.co.jp [10.0.50.92]) by m2.gw.fujitsu.co.jp (Postfix) with ESMTP id F2AEB45DD74; Mon, 30 Jul 2012 09:59:04 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id D72EA1DB8046; Mon, 30 Jul 2012 09:59:04 +0900 (JST) Received: from g01jpexchyt12.g01.fujitsu.local (g01jpexchyt12.g01.fujitsu.local [10.128.194.51]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id 858CF1DB8040; Mon, 30 Jul 2012 09:59:04 +0900 (JST) Received: from [127.0.0.1] (10.124.101.33) by g01jpexchyt12.g01.fujitsu.local (10.128.194.51) with Microsoft SMTP Server id 14.2.309.2; Mon, 30 Jul 2012 09:59:03 +0900 X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 Message-ID: <5015DC4B.2000802@jp.fujitsu.com> Date: Mon, 30 Jul 2012 09:58:51 +0900 From: Yasuaki Ishimatsu User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: , , CC: Subject: [PATCH v3] create sun sysfs file Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Even if a device has _SUN method, there is no way to know the slot unique-ID. Thus the patch creates "sun" file in sysfs so that we can recognize it. Signed-off-by: Yasuaki Ishimatsu Reviewed-by: Toshi Kani --- drivers/acpi/scan.c | 25 +++++++++++++++++++++++++ include/acpi/acpi_bus.h | 1 + 2 files changed, 26 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-3.5/include/acpi/acpi_bus.h =================================================================== --- linux-3.5.orig/include/acpi/acpi_bus.h 2012-07-27 10:20:22.722553439 +0900 +++ linux-3.5/include/acpi/acpi_bus.h 2012-07-27 10:20:25.741555954 +0900 @@ -209,6 +209,7 @@ struct acpi_device_pnp { struct list_head ids; /* _HID and _CIDs */ acpi_device_name device_name; /* Driver-determined */ acpi_device_class device_class; /* " */ + unsigned long sun; /* _SUN */ }; #define acpi_device_bid(d) ((d)->pnp.bus_id) Index: linux-3.5/drivers/acpi/scan.c =================================================================== --- linux-3.5.orig/drivers/acpi/scan.c 2012-07-27 10:20:22.721522499 +0900 +++ linux-3.5/drivers/acpi/scan.c 2012-07-30 09:52:32.581887304 +0900 @@ -192,10 +192,21 @@ end: } static DEVICE_ATTR(path, 0444, acpi_device_path_show, NULL); +static ssize_t +acpi_device_sun_show(struct device *dev, struct device_attribute *attr, char *buf) { + struct acpi_device *acpi_dev = to_acpi_device(dev); + int result; + + result = sprintf(buf, "%lu\n", acpi_dev->pnp.sun); + return result; +} +static DEVICE_ATTR(sun, 0444, acpi_device_sun_show, NULL); + static int acpi_device_setup_files(struct acpi_device *dev) { acpi_status status; acpi_handle temp; + unsigned long long sun; int result = 0; /* @@ -217,6 +228,16 @@ static int acpi_device_setup_files(struc goto end; } + status = acpi_evaluate_integer(dev->handle, "_SUN", NULL, &sun); + if (ACPI_SUCCESS(status)) { + dev->pnp.sun = (unsigned long)sun; + result = device_create_file(&dev->dev, &dev_attr_sun); + if (result) + goto end; + } else { + dev->pnp.sun = (unsigned long)-1; + } + /* * If device has _EJ0, 'eject' file is created that is used to trigger * hot-removal function from userland. @@ -241,6 +262,10 @@ static void acpi_device_remove_files(str if (ACPI_SUCCESS(status)) device_remove_file(&dev->dev, &dev_attr_eject); + status = acpi_get_handle(dev->handle, "_SUN", &temp); + if (ACPI_SUCCESS(status)) + device_remove_file(&dev->dev, &dev_attr_sun); + device_remove_file(&dev->dev, &dev_attr_modalias); device_remove_file(&dev->dev, &dev_attr_hid); if (dev->handle)