From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73970C2BC73 for ; Wed, 4 Dec 2019 18:07:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 433512089C for ; Wed, 4 Dec 2019 18:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482863; bh=ZmRfeg7mG/o18B/qAwsmClWkZP/Qip4Ex6AAyRlF5J4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SGUBKGi97/3r/iAldmO9hK1cmThP2jleI5JuHuyUUy2oxhgSu5aMfpIbvOZ9/LeM9 ZW1tsG0tl9ugbgf4hMfDuwJfJglmxJnqd5tGs9/fnkSzDwvUYW4GAtBDXCpFfXFadG gxwOiNFu1L9u3b8IiKqcV6R0cKku6nx8P+IbkhxQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730791AbfLDSHi (ORCPT ); Wed, 4 Dec 2019 13:07:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:57900 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730789AbfLDSHh (ORCPT ); Wed, 4 Dec 2019 13:07:37 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7D3FF20862; Wed, 4 Dec 2019 18:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482857; bh=ZmRfeg7mG/o18B/qAwsmClWkZP/Qip4Ex6AAyRlF5J4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iVxcouETYJtWvbbi4tYuUYZaNNkI9GFSUVkgWf3Ukl+3ARr3Zyu/OmGcPm0zOrJ8r sjxArUqj9X6WcXFEvkGm1yFlWN5u6i74iQm5LiX7afvqzh+NWLiIpENQPO5pXor06U kQgFUmevePBG774vfKGZtn782UVMjrDC6QKhfUCA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Usyskin , Tomas Winkler Subject: [PATCH 4.14 162/209] mei: bus: prefix device names on bus with the bus name Date: Wed, 4 Dec 2019 18:56:14 +0100 Message-Id: <20191204175334.636738550@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alexander Usyskin commit 7a2b9e6ec84588b0be65cc0ae45a65bac431496b upstream. Add parent device name to the name of devices on bus to avoid device names collisions for same client UUID available from different MEI heads. Namely this prevents sysfs collision under /sys/bus/mei/device/ In the device part leave just UUID other parameters that are required for device matching are not required here and are just bloating the name. Cc: Signed-off-by: Alexander Usyskin Signed-off-by: Tomas Winkler Link: https://lore.kernel.org/r/20191105150514.14010-1-tomas.winkler@intel.com Signed-off-by: Greg Kroah-Hartman --- drivers/misc/mei/bus.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- a/drivers/misc/mei/bus.c +++ b/drivers/misc/mei/bus.c @@ -850,15 +850,16 @@ static const struct device_type mei_cl_d /** * mei_cl_bus_set_name - set device name for me client device + * - + * Example: 0000:00:16.0-55213584-9a29-4916-badf-0fb7ed682aeb * * @cldev: me client device */ static inline void mei_cl_bus_set_name(struct mei_cl_device *cldev) { - dev_set_name(&cldev->dev, "mei:%s:%pUl:%02X", - cldev->name, - mei_me_cl_uuid(cldev->me_cl), - mei_me_cl_ver(cldev->me_cl)); + dev_set_name(&cldev->dev, "%s-%pUl", + dev_name(cldev->bus->dev), + mei_me_cl_uuid(cldev->me_cl)); } /**