media: mc: Set bus_info in media_device_init()

Set bus_info field based on struct device in media_device_init() and
remove corresponding code from drivers.

Also update media_device_init() documentation: the dev field must be now
initialised before calling it.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/mc/mc-device.c b/drivers/media/mc/mc-device.c
index 094647fdb8669dc601eed3dbb2d465e86543a6e9..824d89b325a67f3ddc42f6e326d9ff682eadd063 100644 (file)
--- a/drivers/media/mc/mc-device.c
+++ b/drivers/media/mc/mc-device.c
@@ -700,6 +700,10 @@ void media_device_init(struct media_device *mdev)
 
        atomic_set(&mdev->request_id, 0);
 
+       if (!*mdev->bus_info)
+               media_set_bus_info(mdev->bus_info, sizeof(mdev->bus_info),
+                                  mdev->dev);
+
        dev_dbg(mdev->dev, "Media device initialized\n");
 }
 EXPORT_SYMBOL_GPL(media_device_init);

diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
index 0e9b0503b62a030779f79d8fdc0f99cfecf3323a..b15fac775e147f689be8887a2ea492be6029876e 100644 (file)
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
@@ -1777,8 +1777,6 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,
        cio2->media_dev.dev = dev;
        strscpy(cio2->media_dev.model, CIO2_DEVICE_NAME,
                sizeof(cio2->media_dev.model));
-       snprintf(cio2->media_dev.bus_info, sizeof(cio2->media_dev.bus_info),
-                "PCI:%s", pci_name(cio2->pci_dev));
        cio2->media_dev.hw_revision = 0;
 
        media_device_init(&cio2->media_dev);

diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-core.c b/drivers/media/platform/renesas/rcar-vin/rcar-core.c
index 64cb05b3907c28e52c28cd3066cb4980f4c67b53..95f338b9477c619066808d5021ff3e49405b015e 100644 (file)
--- a/drivers/media/platform/renesas/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/renesas/rcar-vin/rcar-core.c
@@ -94,8 +94,6 @@ static int rvin_group_init(struct rvin_group *group, struct rvin_dev *vin,
 
        strscpy(mdev->driver_name, KBUILD_MODNAME, sizeof(mdev->driver_name));
        strscpy(mdev->model, match->compatible, sizeof(mdev->model));
-       snprintf(mdev->bus_info, sizeof(mdev->bus_info), "platform:%s",
-                dev_name(mdev->dev));
 
        media_device_init(mdev);
 

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drv.c b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
index 502c7d9d6890b5a1adbdf454ada9e481233c60ce..1f73c48eb738183df4325193f5b829a3c07b8ed5 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
@@ -243,8 +243,6 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
        mdev->dev = vsp1->dev;
        mdev->hw_revision = vsp1->version;
        strscpy(mdev->model, vsp1->info->model, sizeof(mdev->model));
-       snprintf(mdev->bus_info, sizeof(mdev->bus_info), "platform:%s",
-                dev_name(mdev->dev));
        media_device_init(mdev);
 
        vsp1->media_ops.link_setup = vsp1_entity_link_setup;

diff --git a/drivers/media/platform/st/stm32/stm32-dcmi.c b/drivers/media/platform/st/stm32/stm32-dcmi.c
index c4c65d8525256589794f3d0c5d7fe39477ae106f..09a743cd70040f5b1525b3c2109ea30feb525243 100644 (file)
--- a/drivers/media/platform/st/stm32/stm32-dcmi.c
+++ b/drivers/media/platform/st/stm32/stm32-dcmi.c
@@ -1997,8 +1997,6 @@ static int dcmi_probe(struct platform_device *pdev)
 
        /* Initialize media device */
        strscpy(dcmi->mdev.model, DRV_NAME, sizeof(dcmi->mdev.model));
-       snprintf(dcmi->mdev.bus_info, sizeof(dcmi->mdev.bus_info),
-                "platform:%s", DRV_NAME);
        dcmi->mdev.dev = &pdev->dev;
        media_device_init(&dcmi->mdev);
 

diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
index 80a10f238bbe426bb8604a5de551a8f55d3b1672..18e6c65f4737c364929974514c5b2c8461684cf3 100644 (file)
--- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
+++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
@@ -173,8 +173,6 @@ static int sun4i_csi_probe(struct platform_device *pdev)
        strscpy(csi->mdev.model, "Allwinner Video Capture Device",
                sizeof(csi->mdev.model));
        csi->mdev.hw_revision = 0;
-       snprintf(csi->mdev.bus_info, sizeof(csi->mdev.bus_info), "platform:%s",
-                dev_name(csi->dev));
        media_device_init(&csi->mdev);
        csi->v4l.mdev = &csi->mdev;
 

diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
index fc96921b058382982d2ea6e1851594c2be0abbf3..a971587dbbd1dbd0a23b8fbafaf171d338b6c581 100644 (file)
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
@@ -733,8 +733,6 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi)
        strscpy(csi->media_dev.model, "Allwinner Video Capture Device",
                sizeof(csi->media_dev.model));
        csi->media_dev.hw_revision = 0;
-       snprintf(csi->media_dev.bus_info, sizeof(csi->media_dev.bus_info),
-                "platform:%s", dev_name(csi->dev));
 
        media_device_init(&csi->media_dev);
        v4l2_async_nf_init(&csi->notifier);

diff --git a/drivers/media/platform/ti/cal/cal.c b/drivers/media/platform/ti/cal/cal.c
index 4a4a6c5983f75338afe927df8549cbb192e144e5..11f67abc2f385edb415fc8da9c99a984fdd834b9 100644 (file)
--- a/drivers/media/platform/ti/cal/cal.c
+++ b/drivers/media/platform/ti/cal/cal.c
@@ -884,8 +884,6 @@ static int cal_media_init(struct cal_dev *cal)
        mdev->dev = cal->dev;
        mdev->hw_revision = cal->revision;
        strscpy(mdev->model, "CAL", sizeof(mdev->model));
-       snprintf(mdev->bus_info, sizeof(mdev->bus_info), "platform:%s",
-                dev_name(mdev->dev));
        media_device_init(mdev);
 
        /*

diff --git a/include/media/media-device.h b/include/media/media-device.h
index f0baee6771ef3f87b86243976c8b6001011eeea7..a10b305075242fa3cecc611f4c4ed4e31b3125b7 100644 (file)
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -225,6 +225,9 @@ static inline __must_check int media_entity_enum_init(
  *
  * - dev must point to the parent device
  * - model must be filled with the device model name
+ *
+ * The bus_info field is set by media_device_init() for PCI and platform devices
+ * if the field begins with '\0'.
  */
 void media_device_init(struct media_device *mdev);
 
@@ -249,9 +252,6 @@ void media_device_cleanup(struct media_device *mdev);
  * The caller is responsible for initializing the &media_device structure
  * before registration. The following fields of &media_device must be set:
  *
- *  - &media_device.dev must point to the parent device (usually a &pci_dev,
- *    &usb_interface or &platform_device instance).
- *
  *  - &media_device.model must be filled with the device model name as a
  *    NUL-terminated UTF-8 string. The device/model revision must not be
  *    stored in this field.