From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Date: Tue, 15 Nov 2016 18:44:29 +0200

Subject: [PATCH] media: uvcvideo: Remove format descriptions

References: bsc#1012628

Patch-mainline: 6.2.5

Git-commit: 50459f103edfe47c9a599d766a850ef6014936c5

[ Upstream commit 50459f103edfe47c9a599d766a850ef6014936c5 ]

The V4L2 core overwrites format descriptions in v4l_fill_fmtdesc(),

there's no need to manually set the descriptions in the driver. This

prepares for removal of the format descriptions from the uvc_fmts table.

Unlike V4L2, UVC makes a distinction between the SD-DV, SDL-DV and HD-DV

formats. It also indicates whether the DV format uses 50Hz or 60Hz. This

information is parsed by the driver to construct a format name string

that is printed in a debug message, but serves no other purpose as V4L2

has a single V4L2_PIX_FMT_DV pixel format that covers all those cases.

As the information is available in the UVC descriptors, and thus

accessible to users with lsusb if they really care, don't log it in a

debug message and drop the format name string to simplify the code.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>

Reviewed-by: Michael Grzeschik <m.grzeschik@pengutronix.de>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/media/usb/uvc/uvc_driver.c | 24 ++----------------------

 drivers/media/usb/uvc/uvc_v4l2.c   |  2 --

 drivers/media/usb/uvc/uvcvideo.h   |  2 --

 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c

index d5ff8df2..d30f77d8 100644

--- a/drivers/media/usb/uvc/uvc_driver.c

+++ b/drivers/media/usb/uvc/uvc_driver.c

@@ -252,14 +252,10 @@ static int uvc_parse_format(struct uvc_device *dev,

 		fmtdesc = uvc_format_by_guid(&buffer[5]);

 		if (fmtdesc != NULL) {

-			strscpy(format->name, fmtdesc->name,

-				sizeof(format->name));

 			format->fcc = fmtdesc->fcc;

 		} else {

 			dev_info(&streaming->intf->dev,

 				 "Unknown video format %pUl\n", &buffer[5]);

-			snprintf(format->name, sizeof(format->name), "%pUl\n",

-				&buffer[5]);

 			format->fcc = 0;

 		}

@@ -271,8 +267,6 @@ static int uvc_parse_format(struct uvc_device *dev,

 		 */

 		if (dev->quirks & UVC_QUIRK_FORCE_Y8) {

 			if (format->fcc == V4L2_PIX_FMT_YUYV) {

-				strscpy(format->name, "Greyscale 8-bit (Y8  )",

-					sizeof(format->name));

 				format->fcc = V4L2_PIX_FMT_GREY;

 				format->bpp = 8;

 				width_multiplier = 2;

@@ -313,7 +307,6 @@ static int uvc_parse_format(struct uvc_device *dev,

 			return -EINVAL;

 		}

-		strscpy(format->name, "MJPEG", sizeof(format->name));

 		format->fcc = V4L2_PIX_FMT_MJPEG;

 		format->flags = UVC_FMT_FLAG_COMPRESSED;

 		format->bpp = 0;

@@ -329,17 +322,7 @@ static int uvc_parse_format(struct uvc_device *dev,

 			return -EINVAL;

 		}

-		switch (buffer[8] & 0x7f) {

-		case 0:

-			strscpy(format->name, "SD-DV", sizeof(format->name));

-			break;

-		case 1:

-			strscpy(format->name, "SDL-DV", sizeof(format->name));

-			break;

-		case 2:

-			strscpy(format->name, "HD-DV", sizeof(format->name));

-			break;

-		default:

+		if ((buffer[8] & 0x7f) > 2) {

 			uvc_dbg(dev, DESCR,

 				"device %d videostreaming interface %d: unknown DV format %u\n",

 				dev->udev->devnum,

@@ -347,9 +330,6 @@ static int uvc_parse_format(struct uvc_device *dev,

 			return -EINVAL;

 		}

-		strlcat(format->name, buffer[8] & (1 << 7) ? " 60Hz" : " 50Hz",

-			sizeof(format->name));

-

 		format->fcc = V4L2_PIX_FMT_DV;

 		format->flags = UVC_FMT_FLAG_COMPRESSED | UVC_FMT_FLAG_STREAM;

 		format->bpp = 0;

@@ -376,7 +356,7 @@ static int uvc_parse_format(struct uvc_device *dev,

 		return -EINVAL;

 	}

-	uvc_dbg(dev, DESCR, "Found format %s\n", format->name);

+	uvc_dbg(dev, DESCR, "Found format %p4cc", &format->fcc);

 	buflen -= buffer[0];

 	buffer += buffer[0];

diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c

index 0774a113..950b42d7 100644

--- a/drivers/media/usb/uvc/uvc_v4l2.c

+++ b/drivers/media/usb/uvc/uvc_v4l2.c

@@ -661,8 +661,6 @@ static int uvc_ioctl_enum_fmt(struct uvc_streaming *stream,

 	fmt->flags = 0;

 	if (format->flags & UVC_FMT_FLAG_COMPRESSED)

 		fmt->flags |= V4L2_FMT_FLAG_COMPRESSED;

-	strscpy(fmt->description, format->name, sizeof(fmt->description));

-	fmt->description[sizeof(fmt->description) - 1] = 0;

 	fmt->pixelformat = format->fcc;

 	return 0;

 }

diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h

index 1227ae63..4c89bf08 100644

--- a/drivers/media/usb/uvc/uvcvideo.h

+++ b/drivers/media/usb/uvc/uvcvideo.h

@@ -264,8 +264,6 @@ struct uvc_format {

 	u32 fcc;

 	u32 flags;

-	char name[32];

-

 	unsigned int nframes;

 	struct uvc_frame *frame;

 };

-- 

2.35.3