mei: bus: set the device name before running fixup
Subsystems (2)
PATCH v2 2/2 mei: bus: set the device name before running fixup
The mei bus fixup use dev_xxx services for printing to kernel log so we need to setup the device name prior to running fixup hooks.
Signed-off-by Tomas Winkler <[email protected]>
---
V2: remove redundant uuid string in debug messages
drivers/misc/mei/bus-fixup.c | 10 ++++------ drivers/misc/mei/bus.c | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 10 deletions(-)
drivers/misc/mei/bus-fixup.c +4 -6
@@ -48,8 +48,7 @@ static const uuid_le mei_nfc_info_guid = MEI_UUID_NFC_INFO;*/ static void number_of_connections (struct mei_cl_device *cldev) { -dev_dbg (&cldev->dev,"running hook %s on %pUl\n" , - __func__,mei_me_cl_uuid (cldev->me_cl)); +dev_dbg (&cldev->dev,"running hook %s\n" , __func__);if (cldev->me_cl->props.max_number_of_connections >1 ) cldev->do_match =0 ;
@@ -62,8 +61,8 @@ static void number_of_connections(struct mei_cl_device *cldev)*/ static void blacklist (struct mei_cl_device *cldev) { -dev_dbg (&cldev->dev,"running hook %s on %pUl\n" , - __func__,mei_me_cl_uuid (cldev->me_cl)); +dev_dbg (&cldev->dev,"running hook %s\n" , __func__); + cldev->do_match =0 ; }
@@ -208,8 +207,7 @@ static void mei_nfc(struct mei_cl_device *cldev) bus = cldev->bus; -dev_dbg (bus->dev,"running hook %s: %pUl match=%d\n" , - __func__,mei_me_cl_uuid (cldev->me_cl), cldev->do_match); +dev_dbg (&cldev->dev,"running hook %s\n" , __func__);mutex_lock (&bus->device_lock);/* we need to connect to INFO GUID */
drivers/misc/mei/bus.c +16 -4
@@ -742,6 +742,19 @@ static struct device_type mei_cl_device_type = { };/** +* mei_cl_bus_set_name - set device name for me client device +* +* @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)); +} + +/** * mei_cl_bus_dev_alloc - initialize and allocate mei client device * * @bus: mei device
@@ -764,6 +777,7 @@ static struct mei_cl_device *mei_cl_bus_dev_alloc(struct mei_device *bus, cldev->dev.type = &mei_cl_device_type; cldev->bus =mei_dev_bus_get (bus); cldev->me_cl =mei_me_cl_get (me_cl); +mei_cl_bus_set_name (cldev); cldev->is_added =0 ;INIT_LIST_HEAD (&cldev->bus_list);
@@ -785,11 +799,9 @@ static bool mei_cl_bus_dev_setup(struct mei_device *bus, cldev->do_match =1 ;mei_cl_bus_dev_fixup (cldev); +/* the device name can change during fix up */ if (cldev->do_match) -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)); +mei_cl_bus_set_name (cldev);return cldev->do_match ==1 ; }
Signature · 1 line
2.4.3