Skip to contentSkip to conversation

gspca: print small buffers via %*ph

PATCH In review Andy Shevchenko 2 participants 2 messages Sep 3, 2013 – Sep 9, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gspca: print small buffers via %*ph

Instead of passing each byte through stack let's use %*ph specifier to do this job better.

---
 drivers/media/usb/gspca/sonixb.c      |  5 +----
 drivers/media/usb/gspca/xirlink_cit.c | 12 ++++--------
 2 files changed, 5 insertions(+), 12 deletions(-)
drivers/media/usb/gspca/sonixb.c +1 -4
index d7ff3b9..5e5613e 100644
@@ -513,10 +513,7 @@ static void i2c_w(struct gspca_dev *gspca_dev, const u8 *buf)
 		if (gspca_dev->usb_buf[0] & 0x04) {
 			if (gspca_dev->usb_buf[0] & 0x08) {
 				dev_err(gspca_dev->v4l2_dev.dev,
-					"i2c error writing %02x %02x %02x %02x"
-					" %02x %02x %02x %02x\n",
-					buf[0], buf[1], buf[2], buf[3],
-					buf[4], buf[5], buf[6], buf[7]);
+					"i2c error writing %8ph\n", buf);
 				gspca_dev->usb_err = -EIO;
 			}
 			return;
drivers/media/usb/gspca/xirlink_cit.c +4 -8
index 7eaf64e..3beb351 100644
@@ -2864,20 +2864,16 @@ static u8 *cit_find_sof(struct gspca_dev *gspca_dev, u8 *data, int len)
 				if (data[i] == 0xff) {
 					if (i >= 4)
 						PDEBUG(D_FRAM,
-						       "header found at offset: %d: %02x %02x 00 %02x %02x %02x\n",
+						       "header found at offset: %d: %02x %02x 00 %3ph\n",
 						       i - 1,
 						       data[i - 4],
 						       data[i - 3],
-						       data[i],
-						       data[i + 1],
-						       data[i + 2]);
+						       &data[i]);
 					else
 						PDEBUG(D_FRAM,
-						       "header found at offset: %d: 00 %02x %02x %02x\n",
+						       "header found at offset: %d: 00 %3ph\n",
 						       i - 1,
-						       data[i],
-						       data[i + 1],
-						       data[i + 2]);
+						       &data[i]);
 					return data + i + (sd->sof_len - 1);
 				}
 				break;
Signature · 1 line
1.8.4.rc3
#1 lore raw

Hi,

Thanks! I've added these to my gspca tree for 3.13, and send a pull-request with these for 3.13 to Mauro.

Regards,

Hans

Quoted 55 lines · Andy Shevchenko

Instead of passing each byte through stack let's use %*ph specifier to do this job better.

---
  drivers/media/usb/gspca/sonixb.c      |  5 +----
  drivers/media/usb/gspca/xirlink_cit.c | 12 ++++--------
  2 files changed, 5 insertions(+), 12 deletions(-)
drivers/media/usb/gspca/sonixb.c +1 -4
index d7ff3b9..5e5613e 100644
@@ -513,10 +513,7 @@ static void i2c_w(struct gspca_dev *gspca_dev, const u8 *buf)
  		if (gspca_dev->usb_buf[0] & 0x04) {
  			if (gspca_dev->usb_buf[0] & 0x08) {
  				dev_err(gspca_dev->v4l2_dev.dev,
-					"i2c error writing %02x %02x %02x %02x"
-					" %02x %02x %02x %02x\n",
-					buf[0], buf[1], buf[2], buf[3],
-					buf[4], buf[5], buf[6], buf[7]);
+					"i2c error writing %8ph\n", buf);
  				gspca_dev->usb_err = -EIO;
  			}
  			return;
drivers/media/usb/gspca/xirlink_cit.c +4 -8
index 7eaf64e..3beb351 100644
@@ -2864,20 +2864,16 @@ static u8 *cit_find_sof(struct gspca_dev *gspca_dev, u8 *data, int len)
  				if (data[i] == 0xff) {
  					if (i >= 4)
  						PDEBUG(D_FRAM,
-						       "header found at offset: %d: %02x %02x 00 %02x %02x %02x\n",
+						       "header found at offset: %d: %02x %02x 00 %3ph\n",
  						       i - 1,
  						       data[i - 4],
  						       data[i - 3],
-						       data[i],
-						       data[i + 1],
-						       data[i + 2]);
+						       &data[i]);
  					else
  						PDEBUG(D_FRAM,
-						       "header found at offset: %d: 00 %02x %02x %02x\n",
+						       "header found at offset: %d: 00 %3ph\n",
  						       i - 1,
-						       data[i],
-						       data[i + 1],
-						       data[i + 2]);
+						       &data[i]);
  					return data + i + (sd->sof_len - 1);
  				}
  				break;