Re: [PATCH 49/57] [media] uvc: don't break long lines

[Laurent Pinchart]

Hi Mauro,

Thank you for the patch.

Same comment, please add line breaks where applicable.

On Friday 14 Oct 2016 17:20:37 Mauro Carvalho Chehab wrote:
> Due to the 80-cols checkpatch warnings, several strings
> were broken into multiple lines. This is not considered
> a good practice anymore, as it makes harder to grep for
> strings at the source code. So, join those continuation
> lines.
> 
> Signed-off-by: Mauro Carvalho Chehab 
> ---
>  drivers/media/usb/uvc/uvc_ctrl.c|  24 ++
>  drivers/media/usb/uvc/uvc_debugfs.c |   3 +-
>  drivers/media/usb/uvc/uvc_driver.c  | 148 ++--
>  drivers/media/usb/uvc/uvc_entity.c  |   6 +-
>  drivers/media/usb/uvc/uvc_isight.c  |   9 +--
>  drivers/media/usb/uvc/uvc_status.c  |  15 ++--
>  drivers/media/usb/uvc/uvc_v4l2.c|   6 +-
>  drivers/media/usb/uvc/uvc_video.c   |  69 ++---
>  8 files changed, 91 insertions(+), 189 deletions(-)
> 
> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c
> b/drivers/media/usb/uvc/uvc_ctrl.c index c2ee6e39fd0c..6f26451bcb75 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -960,8 +960,7 @@ static int uvc_ctrl_populate_cache(struct
> uvc_video_chain *chain, * resolution value to zero.
>*/
>   uvc_warn_once(chain->dev, UVC_WARN_XU_GET_RES,
> -   "UVC non compliance - GET_RES failed on 
"
> -   "an XU control. Enabling workaround.
\n");
> +   "UVC non compliance - GET_RES failed on 
an XU control. Enabling
> workaround.\n"); memset(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES), 0,
>  ctrl->info.size);
>   }
> @@ -1680,8 +1679,7 @@ static int uvc_ctrl_fill_xu_info(struct uvc_device
> *dev,
> 
>   uvc_ctrl_fixup_xu_info(dev, ctrl, info);
> 
> - uvc_trace(UVC_TRACE_CONTROL, "XU control %pUl/%u queried: len %u, "
> -   "flags { get %u set %u auto %u }.\n",
> + uvc_trace(UVC_TRACE_CONTROL, "XU control %pUl/%u queried: len %u, 
flags {
> get %u set %u auto %u }.\n", info->entity, info->selector, info->size,
> (info->flags & UVC_CTRL_FLAG_GET_CUR) ? 1 : 0,
> (info->flags & UVC_CTRL_FLAG_SET_CUR) ? 1 : 0,
> @@ -1710,8 +1708,7 @@ static int uvc_ctrl_init_xu_ctrl(struct uvc_device
> *dev,
> 
>   ret = uvc_ctrl_add_info(dev, ctrl, );
>   if (ret < 0)
> - uvc_trace(UVC_TRACE_CONTROL, "Failed to initialize control "
> -   "%pUl/%u on device %s entity %u\n", info.entity,
> + uvc_trace(UVC_TRACE_CONTROL, "Failed to initialize control 
%pUl/%u on
> device %s entity %u\n", info.entity, info.selector, dev->udev->devpath,
> ctrl->entity->id);
> 
>   return ret;
> @@ -1904,8 +1901,7 @@ static int uvc_ctrl_add_info(struct uvc_device *dev,
> struct uvc_control *ctrl,
> 
>   ctrl->initialized = 1;
> 
> - uvc_trace(UVC_TRACE_CONTROL, "Added control %pUl/%u to device %s "
> - "entity %u\n", ctrl->info.entity, ctrl->info.selector,
> + uvc_trace(UVC_TRACE_CONTROL, "Added control %pUl/%u to device %s 
entity
> %u\n", ctrl->info.entity, ctrl->info.selector, dev->udev->devpath,
> ctrl->entity->id);
> 
>  done:
> @@ -1964,8 +1960,7 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain
> *chain, int ret;
> 
>   if (mapping->id & ~V4L2_CTRL_ID_MASK) {
> - uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', control 
"
> - "id 0x%08x is invalid.\n", mapping->name,
> + uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', control 
id 0x%08x
> is invalid.\n", mapping->name, mapping->id);
>   return -EINVAL;
>   }
> @@ -2004,8 +1999,7 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain
> *chain,
> 
>   list_for_each_entry(map, >info.mappings, list) {
>   if (mapping->id == map->id) {
> - uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', 
"
> - "control id 0x%08x already exists.\n",
> + uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', 
control id 0x%08x
> already exists.\n", mapping->name, mapping->id);
>   ret = -EEXIST;
>   goto done;
> @@ -2015,8 +2009,7 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain
> *chain, /* Prevent excess memory consumption */
>   if (atomic_inc_return(>nmappings) > UVC_MAX_CONTROL_MAPPINGS) {
>   atomic_dec(>nmappings);
> - uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', maximum 
"
> - "mappings count (%u) exceeded.\n", mapping->name,
> + uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', maximum 
mappings
> count (%u) exceeded.\n", mapping->name, UVC_MAX_CONTROL_MAPPINGS);
>   ret = -ENOMEM;
>   goto done;
> @@ -2086,8 +2079,7 @@ static void 

[PATCH 49/57] [media] uvc: don't break long lines

[Mauro Carvalho Chehab]

Due to the 80-cols checkpatch warnings, several strings
were broken into multiple lines. This is not considered
a good practice anymore, as it makes harder to grep for
strings at the source code. So, join those continuation
lines.

Signed-off-by: Mauro Carvalho Chehab 
---
 drivers/media/usb/uvc/uvc_ctrl.c|  24 ++
 drivers/media/usb/uvc/uvc_debugfs.c |   3 +-
 drivers/media/usb/uvc/uvc_driver.c  | 148 
 drivers/media/usb/uvc/uvc_entity.c  |   6 +-
 drivers/media/usb/uvc/uvc_isight.c  |   9 +--
 drivers/media/usb/uvc/uvc_status.c  |  15 ++--
 drivers/media/usb/uvc/uvc_v4l2.c|   6 +-
 drivers/media/usb/uvc/uvc_video.c   |  69 ++---
 8 files changed, 91 insertions(+), 189 deletions(-)

diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index c2ee6e39fd0c..6f26451bcb75 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -960,8 +960,7 @@ static int uvc_ctrl_populate_cache(struct uvc_video_chain 
*chain,
 * resolution value to zero.
 */
uvc_warn_once(chain->dev, UVC_WARN_XU_GET_RES,
- "UVC non compliance - GET_RES failed on "
- "an XU control. Enabling workaround.\n");
+ "UVC non compliance - GET_RES failed on 
an XU control. Enabling workaround.\n");
memset(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES), 0,
   ctrl->info.size);
}
@@ -1680,8 +1679,7 @@ static int uvc_ctrl_fill_xu_info(struct uvc_device *dev,
 
uvc_ctrl_fixup_xu_info(dev, ctrl, info);
 
-   uvc_trace(UVC_TRACE_CONTROL, "XU control %pUl/%u queried: len %u, "
- "flags { get %u set %u auto %u }.\n",
+   uvc_trace(UVC_TRACE_CONTROL, "XU control %pUl/%u queried: len %u, flags 
{ get %u set %u auto %u }.\n",
  info->entity, info->selector, info->size,
  (info->flags & UVC_CTRL_FLAG_GET_CUR) ? 1 : 0,
  (info->flags & UVC_CTRL_FLAG_SET_CUR) ? 1 : 0,
@@ -1710,8 +1708,7 @@ static int uvc_ctrl_init_xu_ctrl(struct uvc_device *dev,
 
ret = uvc_ctrl_add_info(dev, ctrl, );
if (ret < 0)
-   uvc_trace(UVC_TRACE_CONTROL, "Failed to initialize control "
- "%pUl/%u on device %s entity %u\n", info.entity,
+   uvc_trace(UVC_TRACE_CONTROL, "Failed to initialize control 
%pUl/%u on device %s entity %u\n", info.entity,
  info.selector, dev->udev->devpath, ctrl->entity->id);
 
return ret;
@@ -1904,8 +1901,7 @@ static int uvc_ctrl_add_info(struct uvc_device *dev, 
struct uvc_control *ctrl,
 
ctrl->initialized = 1;
 
-   uvc_trace(UVC_TRACE_CONTROL, "Added control %pUl/%u to device %s "
-   "entity %u\n", ctrl->info.entity, ctrl->info.selector,
+   uvc_trace(UVC_TRACE_CONTROL, "Added control %pUl/%u to device %s entity 
%u\n", ctrl->info.entity, ctrl->info.selector,
dev->udev->devpath, ctrl->entity->id);
 
 done:
@@ -1964,8 +1960,7 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain,
int ret;
 
if (mapping->id & ~V4L2_CTRL_ID_MASK) {
-   uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', control "
-   "id 0x%08x is invalid.\n", mapping->name,
+   uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', control 
id 0x%08x is invalid.\n", mapping->name,
mapping->id);
return -EINVAL;
}
@@ -2004,8 +1999,7 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain,
 
list_for_each_entry(map, >info.mappings, list) {
if (mapping->id == map->id) {
-   uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', "
-   "control id 0x%08x already exists.\n",
+   uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', 
control id 0x%08x already exists.\n",
mapping->name, mapping->id);
ret = -EEXIST;
goto done;
@@ -2015,8 +2009,7 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain,
/* Prevent excess memory consumption */
if (atomic_inc_return(>nmappings) > UVC_MAX_CONTROL_MAPPINGS) {
atomic_dec(>nmappings);
-   uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', maximum "
-   "mappings count (%u) exceeded.\n", mapping->name,
+   uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', maximum 
mappings count (%u) exceeded.\n", mapping->name,
UVC_MAX_CONTROL_MAPPINGS);
ret = -ENOMEM;
goto done;
@@ -2086,8 +2079,7 @@ static void uvc_ctrl_prune_entity(struct uvc_device *dev,