media: ivsc: csi: remove name identifier
Subsystems (2)
PATCH 1/3 media: ivsc: csi: remove name identifier
Remove name identifier to match the device with the defined UUID when load driver module.
Signed-off-by Wentong Wu <[email protected]>
--- drivers/media/pci/intel/ivsc/mei_csi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/media/pci/intel/ivsc/mei_csi.c +2 -3
@@ -30,7 +30,6 @@#include <media/v4l2-fwnode.h> #include <media/v4l2-subdev.h> -#define MEI_CSI_DRIVER_NAME "ivsc_csi"#define MEI_CSI_ENTITY_NAME "Intel IVSC CSI"#define MEI_CSI_LINK_FREQ_400MHZ 400000000ULL
@@ -804,14 +803,14 @@ static void mei_csi_remove(struct mei_cl_device *cldev) 0xAF, 0x93, 0x7b, 0x44, 0x53, 0xAC, 0x29, 0xDA)static const struct mei_cl_device_id mei_csi_tbl[] = { - {MEI_CSI_DRIVER_NAME ,MEI_CSI_UUID ,MEI_CL_VERSION_ANY }, + { .uuid =MEI_CSI_UUID , .version =MEI_CL_VERSION_ANY }, {/* sentinel */ } };MODULE_DEVICE_TABLE (mei, mei_csi_tbl);static struct mei_cl_driver mei_csi_driver = { .id_table = mei_csi_tbl, - .name =MEI_CSI_DRIVER_NAME , + .name =KBUILD_MODNAME , .probe = mei_csi_probe, .remove = mei_csi_remove,
Signature · 1 line
2.7.4
PATCH 2/3 media: ivsc: ace: remove name identifier
Remove name identifier to match the device with the defined UUID when load driver module.
Signed-off-by Wentong Wu <[email protected]>
--- drivers/media/pci/intel/ivsc/mei_ace.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/media/pci/intel/ivsc/mei_ace.c +2 -4
@@ -30,8 +30,6 @@#include <linux/uuid.h> #include <linux/workqueue.h> -#define MEI_ACE_DRIVER_NAME "ivsc_ace" -/* indicating driver message */ #define ACE_DRV_MSG 1/* indicating set command */
@@ -554,14 +552,14 @@ static const struct dev_pm_ops mei_ace_pm_ops = { 0x9B, 0x78, 0x03, 0x61, 0x63, 0x5E, 0x24, 0x47)static const struct mei_cl_device_id mei_ace_tbl[] = { - {MEI_ACE_DRIVER_NAME ,MEI_ACE_UUID ,MEI_CL_VERSION_ANY }, + { .uuid =MEI_ACE_UUID , .version =MEI_CL_VERSION_ANY }, {/* sentinel */ } };MODULE_DEVICE_TABLE (mei, mei_ace_tbl);static struct mei_cl_driver mei_ace_driver = { .id_table = mei_ace_tbl, - .name =MEI_ACE_DRIVER_NAME , + .name =KBUILD_MODNAME , .probe = mei_ace_probe, .remove = mei_ace_remove,
Signature · 1 line
2.7.4
PATCH 3/3 media: ivsc: ace: probe ace device after init IPU bridge
In reply to Wentong WuProbe ivsc ace device after IPU bridge has been initialized.
Signed-off-by Wentong Wu <[email protected]>
--- drivers/media/pci/intel/ivsc/mei_ace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/intel/ivsc/mei_ace.c +1 -1
@@ -403,7 +403,7 @@ static int mei_ace_setup_dev_link(struct mei_ace *ace)snprintf (name,sizeof (name),"%s-%pUl" ,dev_name (dev->parent), &uuid); csi_dev =device_find_child_by_name (dev->parent, name); -if (!csi_dev) { +if (!csi_dev || !dev_fwnode (csi_dev)) { ret = -EPROBE_DEFER ; goto err; }
Signature · 1 line
2.7.4