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

Commit 07cfe2e3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "diag: Change format used for printing pointers"

parents 0c19dfd3 be4ccae9

drivers/char/diag/diag_debugfs.c

+4 −4
Original line number Diff line number Diff line
@@ -606,8 +606,8 @@ static ssize_t diag_dbgfs_read_bridge(struct file *file, char __user *ubuf, 
			"in_busy_hsic_write: %d\n"

			"count_hsic_pool: %d\n"

			"count_hsic_write_pool: %d\n"

			"diag_hsic_pool: %x\n"

			"diag_hsic_write_pool: %x\n"

			"diag_hsic_pool: %p\n"

			"diag_hsic_write_pool: %p\n"

			"HSIC write_len: %d\n"

			"num_hsic_buf_tbl_entries: %d\n"

			"HSIC usb_connected: %d\n"
@@ -624,8 +624,8 @@ static ssize_t diag_dbgfs_read_bridge(struct file *file, char __user *ubuf, 
			diag_hsic[i].in_busy_hsic_write,

			diag_hsic[i].count_hsic_pool,

			diag_hsic[i].count_hsic_write_pool,

			(unsigned int)diag_hsic[i].diag_hsic_pool,

			(unsigned int)diag_hsic[i].diag_hsic_write_pool,

			diag_hsic[i].diag_hsic_pool,

			diag_hsic[i].diag_hsic_write_pool,

			diag_bridge[i].write_len,

			diag_hsic[i].num_hsic_buf_tbl_entries,

			diag_bridge[i].usb_connected,

drivers/char/diag/diagchar_core.c

+8 −10
Original line number Diff line number Diff line
@@ -497,8 +497,8 @@ int diag_copy_remote(char __user *buf, size_t count, int *pret, int *pnum_data) 


		for (i = 0; i < diag_hsic[index].poolsize_hsic_write; i++) {

			if (hsic_buf_tbl[i].length > 0) {

				pr_debug("diag: HSIC copy to user, i: %d, buf: %x, len: %d\n",

					i, (unsigned int)hsic_buf_tbl[i].buf,

				pr_debug("diag: HSIC copy to user, i: %d, buf: %p, len: %d\n",

					i, hsic_buf_tbl[i].buf,

					hsic_buf_tbl[i].length);

				num_data++;
@@ -1222,9 +1222,8 @@ static ssize_t diagchar_read(struct file *file, char __user *buf, size_t count, 
		for (i = 0; i < driver->buf_tbl_size; i++) {

			if (driver->buf_tbl[i].length > 0) {

#ifdef DIAG_DEBUG

				pr_debug("diag: WRITING the buf address "

				       "and length is %x , %d\n", (unsigned int)

					(driver->buf_tbl[i].buf),

				pr_debug("diag: WRITING the buf address and length is %p , %d\n",

					 driver->buf_tbl[i].buf,

					 driver->buf_tbl[i].length);

#endif

				num_data++;
@@ -1246,10 +1245,9 @@ static ssize_t diagchar_read(struct file *file, char __user *buf, size_t count, 
				ret += driver->buf_tbl[i].length;

drop:

#ifdef DIAG_DEBUG

				pr_debug("diag: DEQUEUE buf address and"

				       " length is %x,%d\n", (unsigned int)

				       (driver->buf_tbl[i].buf), driver->

				       buf_tbl[i].length);

				pr_debug("diag: DEQUEUE buf address and length is %p, %d\n",

					 driver->buf_tbl[i].buf,

					 driver->buf_tbl[i].length);

#endif

				diagmem_free(driver, (unsigned char *)

				(driver->buf_tbl[i].buf), POOL_TYPE_HDLC);

drivers/char/diag/diagfwd.c

+6 −7
Original line number Diff line number Diff line
@@ -880,10 +880,9 @@ int diag_device_write(void *buf, int data_type, struct diag_request *write_ptr) 
					driver->buf_tbl[i].length =

								 driver->used;

#ifdef DIAG_DEBUG

					pr_debug("diag: ENQUEUE buf ptr"

						   " and length is %x , %d\n",

						   (unsigned int)(driver->buf_

				tbl[i].buf), driver->buf_tbl[i].length);

					pr_debug("diag: ENQUEUE buf ptr and length is %p , %d\n",

						 driver->buf_tbl[i].buf,

						 driver->buf_tbl[i].length);

#endif

					break;

				}
@@ -915,9 +914,9 @@ int diag_device_write(void *buf, int data_type, struct diag_request *write_ptr) 
			if (foundIndex == -1)

				err = -1;

			else

				pr_debug("diag: ENQUEUE HSIC buf ptr and length is %x , %d, ch %d\n",

					(unsigned int)buf,

					 diag_bridge[index].write_len, index);

				pr_debug("diag: ENQUEUE HSIC buf ptr and length is %p , %d, ch %d\n",

					 buf, diag_bridge[index].write_len,

					 index);

		}

#endif

		for (i = 0; i < driver->num_clients; i++)