media: ivsc: csi: remove name identifier
Subsystems (2)
PATCH v3 1/3 media: ivsc: csi: remove name identifier
Remove name identifier to match the device with the defined UUID when load driver module.
---
v3:
- no change compared with v1 and v2
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 v3 2/3 media: ivsc: ace: remove name identifier
Remove name identifier to match the device with the defined UUID when load driver module.
---
v3:
- no change compared with v1 and v2
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 v3 3/3 media: ivsc: ace: probe ace device after IPU bridge is initialized.
In reply to Wentong WuDuring probe ivsc ace device, acpi_dev_clear_dependencies() will be called to clear the consumer and supplier relationship between camera sensor device and ivsc device. But IPU bridge will setup the connection swnodes for ivsc device and camera sensor device based on this consumer and supplier relationship. This patch defers ivsc ace's probe to make sure IPU bridge is initialized before this consumer and supplier relationship between camera sensor device and IVSC device is cleared.
---
v3:
- make commit message more clear
drivers/media/pci/intel/ivsc/mei_ace.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/pci/intel/ivsc/mei_ace.c +3 -0
@@ -406,6 +406,9 @@ static int mei_ace_setup_dev_link(struct mei_ace *ace)if (!csi_dev) { ret = -EPROBE_DEFER ; goto err; + }else if (!dev_fwnode (csi_dev)) { + ret = -EPROBE_DEFER ; + goto err_put; }/* setup link between mei_ace and mei_csi */
Signature · 1 line
2.7.4