Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9380e112 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mauro Carvalho Chehab
Browse files

[media] hdpvr: reduce memory footprint when debugging 



There is no need to use hex_dump_to_buffer() since we have a kernel helper to
dump up to 64 bytes just via printk().

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 3232e04d

drivers/media/usb/hdpvr/hdpvr-control.c

+6 −15
Original line number Diff line number Diff line
@@ -59,13 +59,10 @@ int get_video_info(struct hdpvr_device *dev, struct hdpvr_video_info *vidinf) 
			      1000);



#ifdef HDPVR_DEBUG

	if (hdpvr_debug & MSG_INFO) {

		char print_buf[15];

		hex_dump_to_buffer(dev->usbc_buf, 5, 16, 1, print_buf,

				   sizeof(print_buf), 0);

	if (hdpvr_debug & MSG_INFO)

		v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev,

			 "get video info returned: %d, %s\n", ret, print_buf);

	}

			 "get video info returned: %d, %5ph\n", ret,

			 dev->usbc_buf);

#endif

	mutex_unlock(&dev->usbc_mutex);
@@ -82,9 +79,6 @@ int get_video_info(struct hdpvr_device *dev, struct hdpvr_video_info *vidinf) 


int get_input_lines_info(struct hdpvr_device *dev)

{

#ifdef HDPVR_DEBUG

	char print_buf[9];

#endif

	int ret, lines;



	mutex_lock(&dev->usbc_mutex);
@@ -96,13 +90,10 @@ int get_input_lines_info(struct hdpvr_device *dev) 
			      1000);



#ifdef HDPVR_DEBUG

	if (hdpvr_debug & MSG_INFO) {

		hex_dump_to_buffer(dev->usbc_buf, 3, 16, 1, print_buf,

				   sizeof(print_buf), 0);

	if (hdpvr_debug & MSG_INFO)

		v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev,

			 "get input lines info returned: %d, %s\n", ret,

			 print_buf);

	}

			 "get input lines info returned: %d, %3ph\n", ret,

			 dev->usbc_buf);

#else

	(void)ret;	/* suppress compiler warning */

#endif

drivers/media/usb/hdpvr/hdpvr-core.c

+6 −21
Original line number Diff line number Diff line
@@ -124,14 +124,6 @@ static int device_authorization(struct hdpvr_device *dev) 
	int ret, retval = -ENOMEM;

	char request_type = 0x38, rcv_request = 0x81;

	char *response;

#ifdef HDPVR_DEBUG

	size_t buf_size = 46;

	char *print_buf = kzalloc(5*buf_size+1, GFP_KERNEL);

	if (!print_buf) {

		v4l2_err(&dev->v4l2_dev, "Out of memory\n");

		return retval;

	}

#endif



	mutex_lock(&dev->usbc_mutex);

	ret = usb_control_msg(dev->udev,
@@ -147,11 +139,9 @@ static int device_authorization(struct hdpvr_device *dev) 
	}

#ifdef HDPVR_DEBUG

	else {

		hex_dump_to_buffer(dev->usbc_buf, 46, 16, 1, print_buf,

				   5*buf_size+1, 0);

		v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev,

			 "Status request returned, len %d: %s\n",

			 ret, print_buf);

			 "Status request returned, len %d: %46ph\n",

			 ret, dev->usbc_buf);

	}

#endif
@@ -189,15 +179,13 @@ static int device_authorization(struct hdpvr_device *dev) 


	response = dev->usbc_buf+38;

#ifdef HDPVR_DEBUG

	hex_dump_to_buffer(response, 8, 16, 1, print_buf, 5*buf_size+1, 0);

	v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev, "challenge: %s\n",

		 print_buf);

	v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev, "challenge: %8ph\n",

		 response);

#endif

	challenge(response);

#ifdef HDPVR_DEBUG

	hex_dump_to_buffer(response, 8, 16, 1, print_buf, 5*buf_size+1, 0);

	v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev, " response: %s\n",

		 print_buf);

	v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev, " response: %8ph\n",

		 response);

#endif



	msleep(100);
@@ -213,9 +201,6 @@ static int device_authorization(struct hdpvr_device *dev) 
	retval = ret != 8;

unlock:

	mutex_unlock(&dev->usbc_mutex);

#ifdef HDPVR_DEBUG

	kfree(print_buf);

#endif

	return retval;

}