Commit 7a2b9e6e authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman

mei: bus: prefix device names on bus with the bus name

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: <stable@vger.kernel.org>
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Link: https://lore.kernel.org/r/20191105150514.14010-1-tomas.winkler@intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 26a41753
...@@ -873,15 +873,16 @@ static const struct device_type mei_cl_device_type = { ...@@ -873,15 +873,16 @@ static const struct device_type mei_cl_device_type = {
/** /**
* mei_cl_bus_set_name - set device name for me client device * mei_cl_bus_set_name - set device name for me client device
* <controller>-<client device>
* Example: 0000:00:16.0-55213584-9a29-4916-badf-0fb7ed682aeb
* *
* @cldev: me client device * @cldev: me client device
*/ */
static inline void mei_cl_bus_set_name(struct mei_cl_device *cldev) static inline void mei_cl_bus_set_name(struct mei_cl_device *cldev)
{ {
dev_set_name(&cldev->dev, "mei:%s:%pUl:%02X", dev_set_name(&cldev->dev, "%s-%pUl",
cldev->name, dev_name(cldev->bus->dev),
mei_me_cl_uuid(cldev->me_cl), mei_me_cl_uuid(cldev->me_cl));
mei_me_cl_ver(cldev->me_cl));
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment