Skip to contentSkip to conversation

Staging: vc04_services: Cleanup in ctrl_set_bitrate()

PATCH Superseded Madhumitha Prabakaran 2 participants 3 messages Apr 20, 2019 – Apr 23, 2019

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Staging: vc04_services: Cleanup in ctrl_set_bitrate()

Remove unnecessary variable and replace return type.
In addition to that align the function parameters with parentheses to maintain Linux coding style.

Issue suggested by Coccinelle.

---
Changes in v2

1) Fix my own error of removing function call from the variable.
2) Align the function parameters with parentheses.

---

---
 .../staging/vc04_services/bcm2835-camera/controls.c    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/staging/vc04_services/bcm2835-camera/controls.c +4 -6
index e39ab5fae724..71eb349c3138 100644
@@ -607,18 +607,16 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,
 			    struct v4l2_ctrl *ctrl,
 			    const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
 {
-	int ret;
 	struct vchiq_mmal_port *encoder_out;
 
 	dev->capture.encode_bitrate = ctrl->val;
 
 	encoder_out = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0];
 
-	ret = vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
-					    mmal_ctrl->mmal_id,
-					    &ctrl->val, sizeof(ctrl->val));
-	ret = 0;
-	return ret;
+	vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
+				      mmal_ctrl->mmal_id, &ctrl->val,
+				      sizeof(ctrl->val));
+	return 0;
 }
 
 static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev,
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 34 lines · Madhumitha Prabakaran

Remove unnecessary variable and replace return type.
In addition to that align the function parameters with parentheses to maintain Linux coding style.

Issue suggested by Coccinelle.

---
Changes in v2

1) Fix my own error of removing function call from the variable.
2) Align the function parameters with parentheses.

---

---
 .../staging/vc04_services/bcm2835-camera/controls.c    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/staging/vc04_services/bcm2835-camera/controls.c +0 -1
index e39ab5fae724..71eb349c3138 100644
@@ -607,18 +607,16 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,
 			    struct v4l2_ctrl *ctrl,
 			    const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
 {
-	int ret;
 	struct vchiq_mmal_port *encoder_out;
 
 	dev->capture.encode_bitrate = ctrl->val;
 
 	encoder_out = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0];
 

drivers/staging/vc04_services/bcm2835-camera/controls.c static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev, · line 620

Quoted 10 lines
drivers/staging/vc04_services/bcm2835-camera/controls.c +4 -5
-	ret = vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
-					    mmal_ctrl->mmal_id,
-					    &ctrl->val, sizeof(ctrl->val));
-	ret = 0;
-	return ret;
+	vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
+				      mmal_ctrl->mmal_id, &ctrl->val,
+				      sizeof(ctrl->val));
+	return 0;
 }

Why does this function even return anything at all if it can not fail?

Why not return the value that vchiq_mmal_port_parameter_set() returned?

thanks,

greg k-h

#2 lore raw
Quoted 35 lines · Greg KH
Quoted 34 lines · Madhumitha Prabakaran

Remove unnecessary variable and replace return type.
In addition to that align the function parameters with parentheses to maintain Linux coding style.

Issue suggested by Coccinelle.

---
Changes in v2

1) Fix my own error of removing function call from the variable.
2) Align the function parameters with parentheses.

---

---
 .../staging/vc04_services/bcm2835-camera/controls.c    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/staging/vc04_services/bcm2835-camera/controls.c +0 -1
index e39ab5fae724..71eb349c3138 100644
@@ -607,18 +607,16 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,
 			    struct v4l2_ctrl *ctrl,
 			    const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
 {
-	int ret;
 	struct vchiq_mmal_port *encoder_out;
 
 	dev->capture.encode_bitrate = ctrl->val;
 
 	encoder_out = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0];
 
Quoted 12 lines

drivers/staging/vc04_services/bcm2835-camera/controls.c static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev, · line 620

Quoted 10 lines
drivers/staging/vc04_services/bcm2835-camera/controls.c +4 -5
-	ret = vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
-					    mmal_ctrl->mmal_id,
-					    &ctrl->val, sizeof(ctrl->val));
-	ret = 0;
-	return ret;
+	vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
+				      mmal_ctrl->mmal_id, &ctrl->val,
+				      sizeof(ctrl->val));
+	return 0;
 }

Why does this function even return anything at all if it can not fail?

I looked at the function vchiq_mmal_port_parameter_set, which calls another function for setting the port parameters, which inturns sends an synchronous message. If it is able to send the message successfully, it returns 0. It can also fail and can return any other value. Also the function ctrl_set_bitrate is not evaluated anywhere for true or false, so it is safe to return the value we get from vchiq_mmal_port_parameter_set instead of returning 0 always.

Quoted 3 lines

Why not return the value that vchiq_mmal_port_parameter_set() returned?

I will change the code to return the value from
vchiq_mmal_port_parameter_set directly.

Quoted 3 lines

thanks,

greg k-h