From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753734AbdLICet (ORCPT ); Fri, 8 Dec 2017 21:34:49 -0500 Received: from esa2.dell-outbound.iphmx.com ([68.232.149.220]:57377 "EHLO esa2.dell-outbound.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752914AbdLICeq (ORCPT ); Fri, 8 Dec 2017 21:34:46 -0500 IronPort-PHdr: =?us-ascii?q?9a23=3AS6ItLxcyozhC/uwh468ydzpmlGMj4u6mDksu8pMi?= =?us-ascii?q?zoh2WeGdxcWzZR7h7PlgxGXEQZ/co6odzbGH4+a4ASQp2tWoiDg6aptCVhsI24?= =?us-ascii?q?09vjcLJ4q7M3D9N+PgdCcgHc5PBxdP9nC/NlVJSo6lPwWB6nK94iQPFRrhKAF7?= =?us-ascii?q?Ovr6GpLIj8Swyuu+54Dfbx9GiTe5Yr5+Ngm6oRnMvcQKnIVuLbo8xAHUqXVSYe?= =?us-ascii?q?RWwm1oJVOXnxni48q74YBu/SdNtf8/7sBMSar1cbg2QrxeFzQmLns65Nb3uhnZ?= =?us-ascii?q?TAuA/WUTX2MLmRdVGQfF7RX6XpDssivms+d2xSeXMdHqQb0yRD+v9LlgRgP2hy?= =?us-ascii?q?gbNj456GDXhdJ2jKJHuxKquhhzz5fJbI2JKPZye6XQds4YS2VcRMZcTyxPDJ2h?= =?us-ascii?q?YYUBDOQPOuRXr4fmqlcSsRezHxWgCfnzxjNUgHL9wK000/4mEQHDxAEuGMgBsG?= =?us-ascii?q?7VrNXyKawcV+G1zKzPzTXFc/xW2Cny6IzMchAmvPqBWrdwftDLyUkuEAPJlFGQ?= =?us-ascii?q?qY3gPzOS0OQCr2mb4PRkVeKrjG4qsBx+rSarxscokIXGmoUVylXd+Ch/3Y07Js?= =?us-ascii?q?W4RVZ6bNOnCpdcqS+XO5VsTs8/Q2xltzw2x7wItJKjYSQHx5oqywTCZ/GGcoWE?= =?us-ascii?q?+A/vWemSLDtimn5pZryyihCv+ka60OL8TNO70FNSoypAldnDq24C2gTI6siCVv?= =?us-ascii?q?t95kCh2SuT1wzL6uFLP0Q0la3DJpE/2b4/jJQevV7eESDonEX2iLaadkI5+ui0?= =?us-ascii?q?8OvnZajmppmBOINqkA3+M7wumsy6AeU3KAQBQ2+b+eGk2L3i+032XqlKg+U3n6?= =?us-ascii?q?TaqpzWO8oWqrCjDwNI0osu5AyzAjao3dgAmHkINlNFeBaJj4jzPFHOJej1DfKl?= =?us-ascii?q?jFS2kTdrwOrKPrngApXIKXjDlqvufbdj5E5YzAozystS6I9KBbEFJPL/QFP+tN?= =?us-ascii?q?vdDhMhKQy73/7nCMlh1oMZQW+PBq6ZMKXPsV6H/+4vIPeDZJUTuDnjL/go/ODu?= =?us-ascii?q?jXAnll8HZ6Wp3oUYaGq+Hvt4J0WVe33sgs0OEW0SpAoxUPTqiEGeUT5Uf3uyR6?= =?us-ascii?q?Y86SsnCIKoCofDXIWtjKWc0yehH51WeH5JCkqVHXbndIiJWuwBaDydIsB/iDwI?= =?us-ascii?q?T7uhRJE71RGoqgD6z6BrLu3O+i0X5trf0415+e3ajw0a9Dp6Fc2R3miBCWZukS?= =?us-ascii?q?dAbjk6zehEoUFjwVeO16t/y6hRE9BCoehJXxkxNZPazOtSBNX7WwaHddCMHgWI?= =?us-ascii?q?WNKjVBQ4VNM2i/sPZkF7ENSvihTEl36vCqUUkPqPBZkz9Knd0nz1IO5xxnLCkq?= =?us-ascii?q?Imig91EYN0KWS6i/snpEDoDInTnhDczv7yeA=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2GiAQD7Sitahz+a6ERSChkBAQEBAQEBA?= =?us-ascii?q?QEBAQEHAQEBAQGFGCedIZkJghUKhTsChF9BFgEBAQEBAQEBAQECEAEBAQoLCQg?= =?us-ascii?q?oL4I4JAGCRwMDJ1IQPxJXBgESiiipKDqKbAEBAQEGKINbgguBVoFpiBMMhgMgB?= =?us-ascii?q?ZMfj2mCOZJnApNfllyBOyYHgXtvgniCUhAMGYFtWYgAgkgBAQE?= X-IPAS-Result: =?us-ascii?q?A2GiAQD7Sitahz+a6ERSChkBAQEBAQEBAQEBAQEHAQEBAQG?= =?us-ascii?q?FGCedIZkJghUKhTsChF9BFgEBAQEBAQEBAQECEAEBAQoLCQgoL4I4JAGCRwMDJ?= =?us-ascii?q?1IQPxJXBgESiiipKDqKbAEBAQEGKINbgguBVoFpiBMMhgMgBZMfj2mCOZJnApN?= =?us-ascii?q?fllyBOyYHgXtvgniCUhAMGYFtWYgAgkgBAQE?= X-LoopCount0: from 10.208.86.39 X-IronPort-AV: E=Sophos;i="5.45,380,1508821200"; d="scan'208";a="98092405" X-DLP: DLP_GlobalPCIDSS From: Mario Limonciello To: dvhart@infradead.org, Andy Shevchenko Cc: LKML , platform-driver-x86@vger.kernel.org, Andy Lutomirski , Mario Limonciello Subject: [PATCH 1/2] platform/x86: wmi: prefix sysfs files in /sys/bus/wmi with the ACPI device Date: Fri, 8 Dec 2017 20:34:20 -0600 Message-Id: <1512786861-1014-2-git-send-email-mario.limonciello@dell.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512786861-1014-1-git-send-email-mario.limonciello@dell.com> References: <1512786861-1014-1-git-send-email-mario.limonciello@dell.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's possible for the same GUID to show up on as system twice. This means using solely the GUID for identify the file will not be sufficient. Signed-off-by: Mario Limonciello --- drivers/platform/x86/wmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 791449a2370f..45d9010aafcf 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -1081,7 +1081,8 @@ static int wmi_create_device(struct device *wmi_bus_dev, wblock->dev.dev.bus = &wmi_bus_type; wblock->dev.dev.parent = wmi_bus_dev; - dev_set_name(&wblock->dev.dev, "%pUL", gblock->guid); + dev_set_name(&wblock->dev.dev, "%s-%pUL", + dev_name(&wblock->acpi_device->dev), gblock->guid); device_initialize(&wblock->dev.dev); -- 2.14.1