Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1732175 > unrolled thread

[PATCH 0/8] [media] ttusb_dec: Fine-tuning for some function implementations

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/8] [media] ttusb_dec: Fine-tuning for some function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-09-14 12:40 +0200
    [PATCH 7/8] [media] ttusb_dec: Add spaces for better code readability SF Markus Elfring <elfring@users.sourceforge.net> - 2017-09-14 12:40 +0200
    [PATCH 3/8] [media] ttusb_dec: Improve a size determination in three  functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-09-14 12:40 +0200

#1732175 — [PATCH 0/8] [media] ttusb_dec: Fine-tuning for some function implementations

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 14 Sep 2017 12:26:24 +0200

Some update suggestions were taken into account
from static source code analysis.

Markus Elfring (8):
  Use common error handling code in ttusb_dec_init_dvb()
  Adjust five checks for null pointers
  Improve a size determination in three functions
  Delete an error message for a failed memory allocation in ttusb_dec_probe()
  Move an assignment in ttusb_dec_probe()
  Reduce the scope for three variables in ttusb_dec_process_urb()
  Add spaces for better code readability
  Delete four unwanted spaces

 drivers/media/usb/ttusb-dec/ttusb_dec.c | 175 ++++++++++++++------------------
 1 file changed, 79 insertions(+), 96 deletions(-)

-- 
2.14.1

[toc] | [next] | [standalone]

#1732177 — [PATCH 7/8] [media] ttusb_dec: Add spaces for better code readability

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 13 Sep 2017 22:12:07 +0200

The script "checkpatch.pl" pointed information out like the following.

ERROR: spaces required around that '=' (ctx:VxV)

Thus fix the affected source code places.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/media/usb/ttusb-dec/ttusb_dec.c | 79 +++++++++++++++++----------------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
index e9fe4c6142a5..58256d518fa6 100644
--- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
@@ -209,47 +209,49 @@ static void dvb_filter_pes2ts_init(struct dvb_filter_pes2ts *p2ts,
 				   unsigned short pid,
 				   dvb_filter_pes2ts_cb_t *cb, void *priv)
 {
-	unsigned char *buf=p2ts->buf;
-
-	buf[0]=0x47;
-	buf[1]=(pid>>8);
-	buf[2]=pid&0xff;
-	p2ts->cc=0;
-	p2ts->cb=cb;
-	p2ts->priv=priv;
+	unsigned char *buf = p2ts->buf;
+
+	buf[0] = 0x47;
+	buf[1] = pid >> 8;
+	buf[2] = pid & 0xff;
+	p2ts->cc = 0;
+	p2ts->cb = cb;
+	p2ts->priv = priv;
 }
 
 static int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts,
 			     unsigned char *pes, int len, int payload_start)
 {
-	unsigned char *buf=p2ts->buf;
-	int ret=0, rest;
+	unsigned char *buf = p2ts->buf;
+	int ret = 0, rest;
 
 	//len=6+((pes[4]<<8)|pes[5]);
 
 	if (payload_start)
-		buf[1]|=0x40;
+		buf[1] |= 0x40;
 	else
-		buf[1]&=~0x40;
-	while (len>=184) {
-		buf[3]=0x10|((p2ts->cc++)&0x0f);
-		memcpy(buf+4, pes, 184);
-		if ((ret=p2ts->cb(p2ts->priv, buf)))
+		buf[1] &= ~0x40;
+	while (len >= 184) {
+		buf[3] = 0x10 | ((p2ts->cc++) & 0x0f);
+		memcpy(buf + 4, pes, 184);
+		ret = p2ts->cb(p2ts->priv, buf);
+		if (ret)
 			return ret;
-		len-=184; pes+=184;
-		buf[1]&=~0x40;
+		len -= 184;
+		pes += 184;
+		buf[1] &= ~0x40;
 	}
 	if (!len)
 		return 0;
-	buf[3]=0x30|((p2ts->cc++)&0x0f);
-	rest=183-len;
+	buf[3] = 0x30 | ((p2ts->cc++) & 0x0f);
+	rest = 183 - len;
 	if (rest) {
-		buf[5]=0x00;
-		if (rest-1)
-			memset(buf+6, 0xff, rest-1);
+		buf[5] = 0x00;
+		if (rest - 1)
+			memset(buf + 6, 0xff, rest - 1);
 	}
-	buf[4]=rest;
-	memcpy(buf+5+rest, pes, len);
+	buf[4] = rest;
+	memcpy(buf + 5 + rest, pes, len);
 	return p2ts->cb(p2ts->priv, buf);
 }
 
@@ -262,7 +264,7 @@ static void ttusb_dec_handle_irq( struct urb *urb)
 	char *buffer = dec->irq_buffer;
 	int retval;
 
-	switch(urb->status) {
+	switch (urb->status) {
 		case 0: /*success*/
 			break;
 		case -ECONNRESET:
@@ -275,7 +277,7 @@ static void ttusb_dec_handle_irq( struct urb *urb)
 			return;
 		default:
 			dprintk("%s:nonzero status received: %d\n",
-					__func__,urb->status);
+				__func__, urb->status);
 			goto exit;
 	}
 
@@ -1263,10 +1265,9 @@ static int ttusb_init_rc( struct ttusb_dec *dec)
 
 	dec->rc_input_dev = input_dev;
 	if (usb_submit_urb(dec->irq_urb, GFP_KERNEL))
-		printk("%s: usb_submit_urb failed\n",__func__);
+		printk("%s: usb_submit_urb failed\n", __func__);
 	/* enable irq pipe */
-	ttusb_dec_send_command(dec,0xb0,sizeof(b),b,NULL,NULL);
-
+	ttusb_dec_send_command(dec, 0xb0, sizeof(b), b, NULL, NULL);
 	return 0;
 }
 
@@ -1295,18 +1296,20 @@ static int ttusb_dec_init_usb(struct ttusb_dec *dec)
 	dec->out_pipe = usb_sndisocpipe(dec->udev, OUT_PIPE);
 	dec->irq_pipe = usb_rcvintpipe(dec->udev, IRQ_PIPE);
 
-	if(enable_rc) {
+	if (enable_rc) {
 		dec->irq_urb = usb_alloc_urb(0, GFP_KERNEL);
-		if(!dec->irq_urb) {
+		if (!dec->irq_urb)
 			return -ENOMEM;
-		}
-		dec->irq_buffer = usb_alloc_coherent(dec->udev,IRQ_PACKET_SIZE,
-					GFP_KERNEL, &dec->irq_dma_handle);
-		if(!dec->irq_buffer) {
+
+		dec->irq_buffer = usb_alloc_coherent(dec->udev,
+						     IRQ_PACKET_SIZE,
+						     GFP_KERNEL,
+						     &dec->irq_dma_handle);
+		if (!dec->irq_buffer) {
 			usb_free_urb(dec->irq_urb);
 			return -ENOMEM;
 		}
-		usb_fill_int_urb(dec->irq_urb, dec->udev,dec->irq_pipe,
+		usb_fill_int_urb(dec->irq_urb, dec->udev, dec->irq_pipe,
 				 dec->irq_buffer, IRQ_PACKET_SIZE,
 				 ttusb_dec_handle_irq, dec, 1);
 		dec->irq_urb->transfer_dma = dec->irq_dma_handle;
@@ -1739,7 +1742,7 @@ static void ttusb_dec_disconnect(struct usb_interface *intf)
 	if (dec->active) {
 		ttusb_dec_exit_tasklet(dec);
 		ttusb_dec_exit_filters(dec);
-		if(enable_rc)
+		if (enable_rc)
 			ttusb_dec_exit_rc(dec);
 		ttusb_dec_exit_usb(dec);
 		ttusb_dec_exit_dvb(dec);
-- 
2.14.1

[toc] | [prev] | [next] | [standalone]

#1732178 — [PATCH 3/8] [media] ttusb_dec: Improve a size determination in three functions

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 13 Sep 2017 19:56:38 +0200

* The script "checkpatch.pl" pointed information out like the following.

  ERROR: do not use assignment in if condition

  Thus fix a few source code places.

* Replace the specification of data structures by pointer dereferences
  as the parameter for the operator "sizeof" to make the corresponding size
  determination a bit safer according to the Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/media/usb/ttusb-dec/ttusb_dec.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
index 901cb221aad2..76070da3b7c7 100644
--- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
@@ -821,8 +821,8 @@ static void ttusb_dec_process_urb(struct urb *urb)
 			b = urb->transfer_buffer + d->offset;
 			length = d->actual_length;
 
-			if ((frame = kmalloc(sizeof(struct urb_frame),
-					     GFP_ATOMIC))) {
+			frame = kmalloc(sizeof(*frame), GFP_ATOMIC);
+			if (frame) {
 				unsigned long flags;
 
 				memcpy(frame->data, b, length);
@@ -1073,8 +1073,8 @@ static int ttusb_dec_start_sec_feed(struct dvb_demux_feed *dvbdmxfeed)
 
 	if (!result) {
 		if (c_length == 2) {
-			if (!(finfo = kmalloc(sizeof(struct filter_info),
-					      GFP_ATOMIC)))
+			finfo = kmalloc(sizeof(*finfo), GFP_ATOMIC);
+			if (!finfo)
 				return -ENOMEM;
 
 			finfo->stream_id = c[1];
@@ -1658,7 +1658,8 @@ static int ttusb_dec_probe(struct usb_interface *intf,
 
 	udev = interface_to_usbdev(intf);
 
-	if (!(dec = kzalloc(sizeof(struct ttusb_dec), GFP_KERNEL))) {
+	dec = kzalloc(sizeof(*dec), GFP_KERNEL);
+	if (!dec) {
 		printk("%s: couldn't allocate memory.\n", __func__);
 		return -ENOMEM;
 	}
-- 
2.14.1

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web