From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C0E7C4CECE for ; Sun, 13 Oct 2019 18:41:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C68E20659 for ; Sun, 13 Oct 2019 18:41:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TKS99qmu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C68E20659 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lip6.fr Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:Message-ID: In-Reply-To:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=z20eaGCGPQrf6CddjdcLPiYTsrMH5OBnG6/JsDBmoaY=; b=TKS99qmuCsvuiY oEEu11UHwP2ows44I7LlSHCGmu1n9k/YLqBA9k5+4B7Nmb0J+i6NH2RYaX/4pGBqm6sHCZM2EpEUg wS3DXxiCyfCBXRkTBAbluOBe5ZoxaUj/RE/g1ly5iskuIi77w1D9FQwwZgiyiB2W90a2vD8KpDs/q QCUr5X220SabyYuDeAjCzseqm9Ww3M9TscKwPrQwwoZAWMvHXuFFLZWLz9SjVf+HMf4YwQKr/2Wsb 9jiCzDFk+Pe/+Uq3hUeH70N5fFBuaOfNV2huOcxjNpA+h8E16lpnBLyFs6QjhcjEmyvYeHSiT0sxl eskHmJleTIGzst650x1Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iJioK-0001sa-Sa; Sun, 13 Oct 2019 18:41:44 +0000 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iJioF-0001rO-QV; Sun, 13 Oct 2019 18:41:42 +0000 X-IronPort-AV: E=Sophos;i="5.67,293,1566856800"; d="scan'208";a="322546275" Received: from 81-65-53-202.rev.numericable.fr (HELO hadrien) ([81.65.53.202]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Oct 2019 20:41:27 +0200 Date: Sun, 13 Oct 2019 20:41:27 +0200 (CEST) From: Julia Lawall X-X-Sender: jll@hadrien To: Jules Irenge Subject: Re: [Outreachy kernel] [PATCH 1/2] staging: vc04_services: fix lines ending with open parenthesis In-Reply-To: <20191013183420.13785-1-jbi.octave@gmail.com> Message-ID: References: <20191013183420.13785-1-jbi.octave@gmail.com> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191013_114140_307631_32DBC24E X-CRM114-Status: GOOD ( 22.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, f.fainelli@gmail.com, sbranden@broadcom.com, mchehab+samsung@kernel.org, outreachy-kernel@googlegroups.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, eric@anholt.net, daniela.mormocea@gmail.com, bcm-kernel-feedback-list@broadcom.com, wahrenst@gmx.net, dave.stevenson@raspberrypi.org, rjui@broadcom.com, hverkuil-cisco@xs4all.nl, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sun, 13 Oct 2019, Jules Irenge wrote: > Fix lines ending with open parenthesis. Issue detected by checkpatch tool. > In the process, change driver functions name in the multiple files from: > vchiq_mmal_port_parameter_set to vmp_prmtr_set > vchiq_mmal_component_disable to vm_cmpnt_disable > vchiq_mmal_port_connect_tunnel to vmp_cnnct_tunnel > vchiq_mmal_component_enable to vm_cmpnt_enable You should say why you change the names. As far as I can see, there is no change to the actual function definitions, so the code can't compile. Perhaps that comes later in the series, but the elements of the series have to be ordered such that compilation is possible after each patch. julia > > Signed-off-by: Jules Irenge > --- > .../bcm2835-camera/bcm2835-camera.c | 191 ++++++++---------- > 1 file changed, 89 insertions(+), 102 deletions(-) > > diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c > index beb6a0063bb8..0ffe95b3bfb2 100644 > --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c > +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c > @@ -337,12 +337,11 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, > if (is_capturing(dev)) { > v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, > "Grab another frame"); > - vchiq_mmal_port_parameter_set( > - instance, > - dev->capture.camera_port, > - MMAL_PARAMETER_CAPTURE, > - &dev->capture.frame_count, > - sizeof(dev->capture.frame_count)); > + vmp_prmtr_set(instance, > + dev->capture.camera_port, > + MMAL_PARAMETER_CAPTURE, > + &dev->capture.frame_count, > + sizeof(dev->capture.frame_count)); > } > if (vchiq_mmal_submit_buffer(instance, port, buf)) > v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, > @@ -392,12 +391,11 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, > is_capturing(dev)) { > v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, > "Grab another frame as buffer has EOS"); > - vchiq_mmal_port_parameter_set( > - instance, > - dev->capture.camera_port, > - MMAL_PARAMETER_CAPTURE, > - &dev->capture.frame_count, > - sizeof(dev->capture.frame_count)); > + vmp_prmtr_set(instance, > + dev->capture.camera_port, > + MMAL_PARAMETER_CAPTURE, > + &dev->capture.frame_count, > + sizeof(dev->capture.frame_count)); > } > } > > @@ -406,20 +404,18 @@ static int enable_camera(struct bm2835_mmal_dev *dev) > int ret; > > if (!dev->camera_use_count) { > - ret = vchiq_mmal_port_parameter_set( > - dev->instance, > - &dev->component[COMP_CAMERA]->control, > - MMAL_PARAMETER_CAMERA_NUM, &dev->camera_num, > - sizeof(dev->camera_num)); > + ret = vmp_prmtr_set(dev->instance, > + &dev->component[COMP_CAMERA]->control, > + MMAL_PARAMETER_CAMERA_NUM, &dev->camera_num, > + sizeof(dev->camera_num)); > if (ret < 0) { > v4l2_err(&dev->v4l2_dev, > "Failed setting camera num, ret %d\n", ret); > return -EINVAL; > } > > - ret = vchiq_mmal_component_enable( > - dev->instance, > - dev->component[COMP_CAMERA]); > + ret = vm_cmpnt_enable(dev->instance, > + dev->component[COMP_CAMERA]); > if (ret < 0) { > v4l2_err(&dev->v4l2_dev, > "Failed enabling camera, ret %d\n", ret); > @@ -449,19 +445,17 @@ static int disable_camera(struct bm2835_mmal_dev *dev) > v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, > "Disabling camera\n"); > ret = > - vchiq_mmal_component_disable( > - dev->instance, > - dev->component[COMP_CAMERA]); > + vm_cmpnt_disable(dev->instance, > + dev->component[COMP_CAMERA]); > if (ret < 0) { > v4l2_err(&dev->v4l2_dev, > "Failed disabling camera, ret %d\n", ret); > return -EINVAL; > } > - vchiq_mmal_port_parameter_set( > - dev->instance, > - &dev->component[COMP_CAMERA]->control, > - MMAL_PARAMETER_CAMERA_NUM, &i, > - sizeof(i)); > + vmp_prmtr_set(dev->instance, > + &dev->component[COMP_CAMERA]->control, > + MMAL_PARAMETER_CAMERA_NUM, &i, > + sizeof(i)); > } > v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, > "Camera refcount now %d\n", dev->camera_use_count); > @@ -569,11 +563,11 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) > } > > /* capture the first frame */ > - vchiq_mmal_port_parameter_set(dev->instance, > - dev->capture.camera_port, > - MMAL_PARAMETER_CAPTURE, > - &dev->capture.frame_count, > - sizeof(dev->capture.frame_count)); > + vmp_prmtr_set(dev->instance, > + dev->capture.camera_port, > + MMAL_PARAMETER_CAPTURE, > + &dev->capture.frame_count, > + sizeof(dev->capture.frame_count)); > return 0; > } > > @@ -601,11 +595,11 @@ static void stop_streaming(struct vb2_queue *vq) > v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, "stopping capturing\n"); > > /* stop capturing frames */ > - vchiq_mmal_port_parameter_set(dev->instance, > - dev->capture.camera_port, > - MMAL_PARAMETER_CAPTURE, > - &dev->capture.frame_count, > - sizeof(dev->capture.frame_count)); > + vmp_prmtr_set(dev->instance, > + dev->capture.camera_port, > + MMAL_PARAMETER_CAPTURE, > + &dev->capture.frame_count, > + sizeof(dev->capture.frame_count)); > > v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, > "disabling connection\n"); > @@ -675,9 +669,10 @@ static int set_overlay_params(struct bm2835_mmal_dev *dev, > .height = dev->overlay.w.height, > }, > }; > - return vchiq_mmal_port_parameter_set(dev->instance, port, > - MMAL_PARAMETER_DISPLAYREGION, > - &prev_config, sizeof(prev_config)); > + return vmp_prmtr_set(dev->instance, > + port, > + MMAL_PARAMETER_DISPLAYREGION, > + &prev_config, sizeof(prev_config)); > } > > /* overlay ioctl */ > @@ -772,12 +767,12 @@ static int vidioc_overlay(struct file *file, void *f, unsigned int on) > ret = vchiq_mmal_port_disable(dev->instance, src); > if (!ret) > ret = > - vchiq_mmal_port_connect_tunnel(dev->instance, src, > - NULL); > + vmp_cnnct_tunnel(dev->instance, > + src, > + NULL); > if (ret >= 0) > - ret = vchiq_mmal_component_disable( > - dev->instance, > - dev->component[COMP_PREVIEW]); > + ret = vm_cmpnt_disable(dev->instance, > + dev->component[COMP_PREVIEW]); > > disable_camera(dev); > return ret; > @@ -797,15 +792,14 @@ static int vidioc_overlay(struct file *file, void *f, unsigned int on) > if (enable_camera(dev) < 0) > return -EINVAL; > > - ret = vchiq_mmal_component_enable( > - dev->instance, > - dev->component[COMP_PREVIEW]); > + ret = vm_cmpnt_enable(dev->instance, > + dev->component[COMP_PREVIEW]); > if (ret < 0) > return ret; > > v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, "connecting %p to %p\n", > src, dst); > - ret = vchiq_mmal_port_connect_tunnel(dev->instance, src, dst); > + ret = vmp_cnnct_tunnel(dev->instance, src, dst); > if (ret) > return ret; > > @@ -1015,11 +1009,11 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, > "vid_cap - disconnect previous tunnel\n"); > > /* Disconnect any previous connection */ > - vchiq_mmal_port_connect_tunnel(dev->instance, > - dev->capture.camera_port, NULL); > + vmp_cnnct_tunnel(dev->instance, > + dev->capture.camera_port, NULL); > dev->capture.camera_port = NULL; > - ret = vchiq_mmal_component_disable(dev->instance, > - dev->capture.encode_component); > + ret = vm_cmpnt_disable(dev->instance, > + dev->capture.encode_component); > if (ret) > v4l2_err(&dev->v4l2_dev, > "Failed to disable encode component %d\n", > @@ -1072,10 +1066,10 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, > } > > remove_padding = mfmt->remove_padding; > - vchiq_mmal_port_parameter_set(dev->instance, > - camera_port, > - MMAL_PARAMETER_NO_IMAGE_PADDING, > - &remove_padding, sizeof(remove_padding)); > + vmp_prmtr_set(dev->instance, > + camera_port, > + MMAL_PARAMETER_NO_IMAGE_PADDING, > + &remove_padding, sizeof(remove_padding)); > > camera_port->format.encoding_variant = 0; > camera_port->es.video.width = f->fmt.pix.width; > @@ -1107,10 +1101,9 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, > preview_port); > if (!ret) > ret = > - vchiq_mmal_port_connect_tunnel( > - dev->instance, > - preview_port, > - NULL); > + vmp_cnnct_tunnel(dev->instance, > + preview_port, > + NULL); > } > preview_port->es.video.width = f->fmt.pix.width; > preview_port->es.video.height = f->fmt.pix.height; > @@ -1124,9 +1117,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, > dev->capture.timeperframe.numerator; > ret = vchiq_mmal_port_set_format(dev->instance, preview_port); > if (overlay_enabled) { > - ret = vchiq_mmal_port_connect_tunnel( > - dev->instance, > - preview_port, > + ret = vmp_cnnct_tunnel(dev->instance, > + preview_port, > &dev->component[COMP_PREVIEW]->input[0]); > if (!ret) > ret = vchiq_mmal_port_enable(dev->instance, > @@ -1154,10 +1146,9 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, > camera_port->recommended_buffer.num; > > ret = > - vchiq_mmal_port_connect_tunnel( > - dev->instance, > - camera_port, > - &encode_component->input[0]); > + vmp_cnnct_tunnel(dev->instance, > + camera_port, > + &encode_component->input[0]); > if (ret) { > v4l2_dbg(1, bcm2835_v4l2_debug, > &dev->v4l2_dev, > @@ -1205,9 +1196,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, > } > > if (!ret) { > - ret = vchiq_mmal_component_enable( > - dev->instance, > - encode_component); > + ret = vm_cmpnt_enable(dev->instance, > + encode_component); > if (ret) { > v4l2_dbg(1, bcm2835_v4l2_debug, > &dev->v4l2_dev, > @@ -1530,7 +1520,7 @@ static int set_camera_parameters(struct vchiq_mmal_instance *instance, > .use_stc_timestamp = MMAL_PARAM_TIMESTAMP_MODE_RAW_STC > }; > > - return vchiq_mmal_port_parameter_set(instance, &camera->control, > + return vmp_prmtr_set(instance, &camera->control, > MMAL_PARAMETER_CAMERA_CONFIG, > &cam_config, sizeof(cam_config)); > } > @@ -1655,9 +1645,9 @@ static int mmal_init(struct bm2835_mmal_dev *dev) > dev->capture.enc_level = V4L2_MPEG_VIDEO_H264_LEVEL_4_0; > > /* get the preview component ready */ > - ret = vchiq_mmal_component_init( > - dev->instance, "ril.video_render", > - &dev->component[COMP_PREVIEW]); > + ret = vchiq_mmal_component_init(dev->instance, > + "ril.video_render", > + &dev->component[COMP_PREVIEW]); > if (ret < 0) > goto unreg_camera; > > @@ -1669,9 +1659,9 @@ static int mmal_init(struct bm2835_mmal_dev *dev) > } > > /* get the image encoder component ready */ > - ret = vchiq_mmal_component_init( > - dev->instance, "ril.image_encode", > - &dev->component[COMP_IMAGE_ENCODE]); > + ret = vchiq_mmal_component_init(dev->instance, > + "ril.image_encode", > + &dev->component[COMP_IMAGE_ENCODE]); > if (ret < 0) > goto unreg_preview; > > @@ -1708,17 +1698,16 @@ static int mmal_init(struct bm2835_mmal_dev *dev) > { > unsigned int enable = 1; > > - vchiq_mmal_port_parameter_set( > - dev->instance, > - &dev->component[COMP_VIDEO_ENCODE]->control, > - MMAL_PARAMETER_VIDEO_IMMUTABLE_INPUT, > - &enable, sizeof(enable)); > - > - vchiq_mmal_port_parameter_set(dev->instance, > - &dev->component[COMP_VIDEO_ENCODE]->control, > - MMAL_PARAMETER_MINIMISE_FRAGMENTATION, > - &enable, > - sizeof(enable)); > + vmp_prmtr_set(dev->instance, > + &dev->component[COMP_VIDEO_ENCODE]->control, > + MMAL_PARAMETER_VIDEO_IMMUTABLE_INPUT, > + &enable, sizeof(enable)); > + > + vmp_prmtr_set(dev->instance, > + &dev->component[COMP_VIDEO_ENCODE]->control, > + MMAL_PARAMETER_MINIMISE_FRAGMENTATION, > + &enable, > + sizeof(enable)); > } > ret = bm2835_mmal_set_all_camera_controls(dev); > if (ret < 0) { > @@ -1731,15 +1720,13 @@ static int mmal_init(struct bm2835_mmal_dev *dev) > > unreg_vid_encoder: > pr_err("Cleanup: Destroy video encoder\n"); > - vchiq_mmal_component_finalise( > - dev->instance, > - dev->component[COMP_VIDEO_ENCODE]); > + vchiq_mmal_component_finalise(dev->instance, > + dev->component[COMP_VIDEO_ENCODE]); > > unreg_image_encoder: > pr_err("Cleanup: Destroy image encoder\n"); > - vchiq_mmal_component_finalise( > - dev->instance, > - dev->component[COMP_IMAGE_ENCODE]); > + vchiq_mmal_component_finalise(dev->instance, > + dev->component[COMP_IMAGE_ENCODE]); > > unreg_preview: > pr_err("Cleanup: Destroy video render\n"); > @@ -1799,13 +1786,13 @@ static void bcm2835_cleanup_instance(struct bm2835_mmal_dev *dev) > if (dev->capture.encode_component) { > v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, > "mmal_exit - disconnect tunnel\n"); > - vchiq_mmal_port_connect_tunnel(dev->instance, > - dev->capture.camera_port, NULL); > - vchiq_mmal_component_disable(dev->instance, > - dev->capture.encode_component); > + vmp_cnnct_tunnel(dev->instance, > + dev->capture.camera_port, NULL); > + vm_cmpnt_disable(dev->instance, > + dev->capture.encode_component); > } > - vchiq_mmal_component_disable(dev->instance, > - dev->component[COMP_CAMERA]); > + vm_cmpnt_disable(dev->instance, > + dev->component[COMP_CAMERA]); > > vchiq_mmal_component_finalise(dev->instance, > dev->component[COMP_VIDEO_ENCODE]); > -- > 2.21.0 > > -- > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20191013183420.13785-1-jbi.octave%40gmail.com. > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel