Commit 5cdbca89 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Hans Verkuil
Browse files

media: uvcvideo: Use intf instead of udev for printks 



The UVC driver is a usb_interface driver. Use the correct device for
printks to avoid confusions with other interface drivers associated to
the same usb device.

With this change:
uvcvideo 3-6:1.0: Found UVC 1.10 device USB2.0 WebCam (1234:abcd)

Without this change:
usb 3-6: Found UVC 1.10 device USB2.0 WebCam (1234:abcd)

Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans de Goede <hansg@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent 3e412a7b

drivers/media/usb/uvc/uvc_ctrl.c

+5 −5
Original line number Diff line number Diff line
@@ -1619,7 +1619,7 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, 
		}



		if (ret == -EIO) {

			dev_warn_ratelimited(&chain->dev->udev->dev,

			dev_warn_ratelimited(&chain->dev->intf->dev,

					     "UVC non compliance: Error %d querying master control %x (%s)\n",

					     ret, master_map->id,

					     uvc_map_get_name(master_map));
@@ -1643,7 +1643,7 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, 


	ret = __uvc_queryctrl_boundaries(chain, ctrl, mapping, v4l2_ctrl);

	if (ret && !mapping->disabled) {

		dev_warn(&chain->dev->udev->dev,

		dev_warn(&chain->dev->intf->dev,

			 "UVC non compliance: permanently disabling control %x (%s), due to error %d\n",

			 mapping->id, uvc_map_get_name(mapping), ret);

		mapping->disabled = true;
@@ -1858,7 +1858,7 @@ static int uvc_ctrl_set_handle(struct uvc_control *ctrl, struct uvc_fh *handle) 
	lockdep_assert_held(&handle->chain->ctrl_mutex);



	if (ctrl->handle) {

		dev_warn_ratelimited(&handle->stream->dev->udev->dev,

		dev_warn_ratelimited(&handle->stream->dev->intf->dev,

				     "UVC non compliance: Setting an async control with a pending operation.");



		if (ctrl->handle == handle)
@@ -1956,7 +1956,7 @@ static void uvc_ctrl_status_event_work(struct work_struct *work) 
	w->urb->interval = dev->int_ep->desc.bInterval;

	ret = usb_submit_urb(w->urb, GFP_KERNEL);

	if (ret < 0)

		dev_err(&dev->udev->dev,

		dev_err(&dev->intf->dev,

			"Failed to resubmit status URB (%d).\n", ret);

}
@@ -2895,7 +2895,7 @@ int uvc_ctrl_restore_values(struct uvc_device *dev) 
			if (!ctrl->initialized || !ctrl->modified ||

			    (ctrl->info.flags & UVC_CTRL_FLAG_RESTORE) == 0)

				continue;

			dev_dbg(&dev->udev->dev,

			dev_dbg(&dev->intf->dev,

				"restoring control %pUl/%u/%u\n",

				ctrl->info.entity, ctrl->info.index,

				ctrl->info.selector);

drivers/media/usb/uvc/uvc_driver.c

+10 −10
Original line number Diff line number Diff line
@@ -1864,7 +1864,7 @@ static int uvc_scan_device(struct uvc_device *dev) 
		uvc_scan_fallback(dev);



	if (list_empty(&dev->chains)) {

		dev_info(&dev->udev->dev, "No valid video chain found.\n");

		dev_info(&dev->intf->dev, "No valid video chain found.\n");

		return -ENODEV;

	}
@@ -2088,7 +2088,7 @@ static int uvc_register_terms(struct uvc_device *dev, 


		stream = uvc_stream_by_id(dev, term->id);

		if (stream == NULL) {

			dev_info(&dev->udev->dev,

			dev_info(&dev->intf->dev,

				 "No streaming interface found for terminal %u.",

				 term->id);

			continue;
@@ -2124,7 +2124,7 @@ static int uvc_register_chains(struct uvc_device *dev) 
#ifdef CONFIG_MEDIA_CONTROLLER

		ret = uvc_mc_register_entities(chain);

		if (ret < 0)

			dev_info(&dev->udev->dev,

			dev_info(&dev->intf->dev,

				 "Failed to register entities (%d).\n", ret);

#endif

	}
@@ -2225,23 +2225,23 @@ static int uvc_probe(struct usb_interface *intf, 
	if (ret < 0)

		goto error;



	dev_info(&dev->udev->dev, "Found UVC %u.%02x device %s (%04x:%04x)\n",

	dev_info(&dev->intf->dev, "Found UVC %u.%02x device %s (%04x:%04x)\n",

		 dev->uvc_version >> 8, dev->uvc_version & 0xff,

		 udev->product ? udev->product : "<unnamed>",

		 le16_to_cpu(udev->descriptor.idVendor),

		 le16_to_cpu(udev->descriptor.idProduct));



	if (dev->quirks != dev->info->quirks) {

		dev_info(&dev->udev->dev,

		dev_info(&dev->intf->dev,

			 "Forcing device quirks to 0x%x by module parameter for testing purpose.\n",

			 dev->quirks);

		dev_info(&dev->udev->dev,

		dev_info(&dev->intf->dev,

			 "Please report required quirks to the linux-media mailing list.\n");

	}



	if (dev->info->uvc_version) {

		dev->uvc_version = dev->info->uvc_version;

		dev_info(&dev->udev->dev, "Forcing UVC version to %u.%02x\n",

		dev_info(&dev->intf->dev, "Forcing UVC version to %u.%02x\n",

			 dev->uvc_version >> 8, dev->uvc_version & 0xff);

	}
@@ -2277,21 +2277,21 @@ static int uvc_probe(struct usb_interface *intf, 
	/* Initialize the interrupt URB. */

	ret = uvc_status_init(dev);

	if (ret < 0) {

		dev_info(&dev->udev->dev,

		dev_info(&dev->intf->dev,

			 "Unable to initialize the status endpoint (%d), status interrupt will not be supported.\n",

			 ret);

	}



	ret = uvc_gpio_init_irq(dev);

	if (ret < 0) {

		dev_err(&dev->udev->dev,

		dev_err(&dev->intf->dev,

			"Unable to request privacy GPIO IRQ (%d)\n", ret);

		goto error;

	}



	ret = uvc_meta_init(dev);

	if (ret < 0) {

		dev_err(&dev->udev->dev,

		dev_err(&dev->intf->dev,

			"Error initializing the metadata formats (%d)\n", ret);

		goto error;

	}

drivers/media/usb/uvc/uvc_entity.c

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ int uvc_mc_register_entities(struct uvc_video_chain *chain) 
	list_for_each_entry(entity, &chain->entities, chain) {

		ret = uvc_mc_init_entity(chain, entity);

		if (ret < 0) {

			dev_info(&chain->dev->udev->dev,

			dev_info(&chain->dev->intf->dev,

				 "Failed to initialize entity for entity %u\n",

				 entity->id);

			return ret;
@@ -150,7 +150,7 @@ int uvc_mc_register_entities(struct uvc_video_chain *chain) 
	list_for_each_entry(entity, &chain->entities, chain) {

		ret = uvc_mc_create_links(chain, entity);

		if (ret < 0) {

			dev_info(&chain->dev->udev->dev,

			dev_info(&chain->dev->intf->dev,

				 "Failed to create links for entity %u\n",

				 entity->id);

			return ret;

drivers/media/usb/uvc/uvc_status.c

+2 −2
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static void uvc_status_complete(struct urb *urb) 
		return;



	default:

		dev_warn(&dev->udev->dev,

		dev_warn(&dev->intf->dev,

			 "Non-zero status (%d) in status completion handler.\n",

			 urb->status);

		return;
@@ -248,7 +248,7 @@ static void uvc_status_complete(struct urb *urb) 
	urb->interval = dev->int_ep->desc.bInterval;

	ret = usb_submit_urb(urb, GFP_ATOMIC);

	if (ret < 0)

		dev_err(&dev->udev->dev,

		dev_err(&dev->intf->dev,

			"Failed to resubmit status URB (%d).\n", ret);

}

drivers/media/usb/uvc/uvc_video.c

+3 −3
Original line number Diff line number Diff line
@@ -95,14 +95,14 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, 
	 */

	if (ret > 0 && query != UVC_GET_INFO) {

		memset(data + ret, 0, size - ret);

		dev_warn_once(&dev->udev->dev,

		dev_warn_once(&dev->intf->dev,

			      "UVC non compliance: %s control %u on unit %u returned %d bytes when we expected %u.\n",

			      uvc_query_name(query), cs, unit, ret, size);

		return 0;

	}



	if (ret != -EPIPE) {

		dev_err(&dev->udev->dev,

		dev_err(&dev->intf->dev,

			"Failed to query (%s) UVC control %u on unit %u: %d (exp. %u).\n",

			uvc_query_name(query), cs, unit, ret, size);

		return ret < 0 ? ret : -EPIPE;
@@ -119,7 +119,7 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, 
	*(u8 *)data = tmp;



	if (ret != 1) {

		dev_err_ratelimited(&dev->udev->dev,

		dev_err_ratelimited(&dev->intf->dev,

				    "Failed to query (%s) UVC error code control %u on unit %u: %d (exp. 1).\n",

				    uvc_query_name(query), cs, unit, ret);

		return ret < 0 ? ret : -EPIPE;