Commit cef69974 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

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: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 78a171e5

drivers/media/mc/mc-device.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

drivers/media/pci/intel/ipu3/ipu3-cio2-main.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/media/platform/renesas/rcar-vin/rcar-core.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/media/platform/renesas/vsp1/vsp1_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/media/platform/st/stm32/stm32-dcmi.c

+0 −2
Original line number Diff line number Diff line
@@ -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);