Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e99fe2c4 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

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



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: <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.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 841a521c

drivers/misc/mei/bus.c

+5 −4
Original line number Diff line number Diff line
@@ -883,15 +883,16 @@ static const struct device_type mei_cl_device_type = { 


/**

 * 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

 */

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));

}



/**