| From 7a2b9e6ec84588b0be65cc0ae45a65bac431496b Mon Sep 17 00:00:00 2001 |
| From: Alexander Usyskin <alexander.usyskin@intel.com> |
| Date: Tue, 5 Nov 2019 17:05:13 +0200 |
| Subject: mei: bus: prefix device names on bus with the bus name |
| |
| From: Alexander Usyskin <alexander.usyskin@intel.com> |
| |
| 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: Alexander Usyskin <alexander.usyskin@intel.com> |
| Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> |
| Link: https://lore.kernel.org/r/20191105150514.14010-1-tomas.winkler@intel.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| 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 |
| @@ -765,15 +765,16 @@ static struct device_type mei_cl_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 |
| */ |
| 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)); |
| } |
| |
| /** |
