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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8ECC8C4829E for ; Thu, 15 Feb 2024 22:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=3OenGn4MGdIjf6U76kCS7eB6ep8E0JRlKOUZGbnViPw=; b=dv3bfUuEV4fHbe kdtzjrwTaXbu+qP/KDljB8HnN2BoLe2qc4kBfXaPC4HIlJdmuSUpxzAWM67YWXWiXahQoXCV4sZT9 eVlxOCXkc/hINN8Uqxt/cGwIAUoannHyGuwgoxIJ1tp+AYlPzD1RPOT8uG85LvAG/YIkJrtVRcIMq pY0ZtGjcnSIRF9qhd7PNb24p9TPVq0Hxj05ukLnWUKTpZTNuibY9q5O2Uqb5YkGXCpU5ER5cXs6nW ZoTEzQZMXqLkIizqAACGObW7Mf8fEBjqMIf7VP7oJ9Aik3yRSr38TFqgeCQVLPJAKUZLBG3Dj30Ty BEFvK7Th0RJf8N7929qA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rajtB-00000000Hft-0rtb; Thu, 15 Feb 2024 22:07:29 +0000 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rajt6-00000000Hck-2tLU; Thu, 15 Feb 2024 22:07:27 +0000 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-55f0b2c79cdso2214624a12.3; Thu, 15 Feb 2024 14:07:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708034837; x=1708639637; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=21uIqFQMa/yVZznf8kmpsHONHVQ5nJQEZM8RZ+UmyrU=; b=KpgZvTTpVYF90p0StEd1SMGWupCVlnq5Ma+CQShCqcB7YKnJgkXqELp5ZeBbWMGxKU sz8lnJ8/xuu+ZV4NRygKLWEllb6qAa5wO6ZlTlAfsjL1BDI4AKRy2Rne4SFIrQyVAxIj jgqxx3RUaXGNU3Nt9EZMjQh/kP4V0W7oINAmlc2KxfIWr7SK129u2tn+Qf2Vc/BSidyS yhmQgSCkHuggXfL4KlpVwI+3F0yFDAlLtnUW2Q1MGuI5BV3mTF7BRhkzrshZh8/1o89P pmba32AJnspLNoexEkDubCsWQ35vErmfnYhiUP/Y288K7BCbwgQdc6MwzWa2vY8Gah8B clsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708034837; x=1708639637; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=21uIqFQMa/yVZznf8kmpsHONHVQ5nJQEZM8RZ+UmyrU=; b=B6kPBZUblddaBCsmX4mq+ebnInn7rcgzbByda8CRLke5GKQ60v//NwI0UrO1bS+Qyj GGgC973ifUyFioSl/MHDHO16hK72wvUrCGm8/xs6P+jWDMXmFwc7r+Tt5HX7EasPOmUE wh5J8KFFWPKw4J9ocEkpcPC7e8XE8NFpF8rpTSJpcVBSPta+IWi0h+g2yTa7MUrJF80S 23MM0s4Ez+IX23vviR+Vgld0/hwl3u80HHV/UgnXBtmBFqlqOleCRy0Iym5vYiDpIvyC UjwKcjyCyz3OlaeJCCnnDHsS/+Oh+/ShmOiApOUXr7zBgdogiBPTfq853OlkDrk/ipcV EFxw== X-Forwarded-Encrypted: i=1; AJvYcCWA7FOIiF3CZrCEgRJBHWl5MF9tvSTQ+crhaZP/ASPeeqkfPTLhFfxLdpmI1RlZXYfHmf579ecBjCTxJb7om2XZDckNEujo3G/UT4dChoY4l3H9+LLbgtBt9egqXyxBOy2oimc9EkECwUY3LpjQVaF3Kra5CCbSbghNkQ== X-Gm-Message-State: AOJu0YxmkkXiB1Z9uuda7L4b9h9PsQURUl6J/725aPmNT4YEmSssbAeW AF6kgKFumTedumk00dJKRnJPQrmf4XTd+nv7tfDwrfSOMtR40Vzw X-Google-Smtp-Source: AGHT+IHgDXQY8gMquNY6IZAlhBgxcOSmHelzr1+pZBlo3xkDM+cA9ECVhYbvw90kNcX2+3RpK9D+VA== X-Received: by 2002:a17:907:104c:b0:a3d:2fb7:98fe with SMTP id oy12-20020a170907104c00b00a3d2fb798femr2124907ejb.32.1708034837034; Thu, 15 Feb 2024 14:07:17 -0800 (PST) Received: from pinguine.lan (ip-176-198-146-182.um43.pools.vodafone-ip.de. [176.198.146.182]) by smtp.gmail.com with ESMTPSA id s17-20020a170906a19100b00a3d0e9bdc35sm948123ejy.68.2024.02.15.14.07.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 14:07:16 -0800 (PST) From: "Moritz C. Weber" To: florian.fainelli@broadcom.com Cc: linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Moritz C. Weber" Subject: [PATCH] Staging: vc04_services: bcm2835-camera: fixed several brace coding style checks Date: Thu, 15 Feb 2024 23:06:47 +0100 Message-Id: <20240215220647.4096-1-mo.c.weber@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240215_140724_749738_F80BBFE9 X-CRM114-Status: GOOD ( 10.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Fixed coding style checks raised by checkpatch Signed-off-by: Moritz C. Weber --- .../bcm2835-camera/bcm2835-camera.c | 62 +++++++++---------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index e6e89784d..1ef7a2118 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -350,12 +350,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)); + vchiq_mmal_port_parameter_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->mmal)) @@ -406,12 +405,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)); + vchiq_mmal_port_parameter_set(instance, + dev->capture.camera_port, + MMAL_PARAMETER_CAPTURE, + #N(#O(#O(#O(#O(&dev->capture.frame_count, + sizeof(dev->capture.frame_count)); } } @@ -420,11 +418,11 @@ static int enable_camera(struct bcm2835_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 = vchiq_mmal_port_parameter_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); @@ -468,11 +466,11 @@ static int disable_camera(struct bcm2835_mmal_dev *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)); + vchiq_mmal_port_parameter_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); @@ -786,9 +784,8 @@ static int vidioc_overlay(struct file *file, void *f, unsigned int on) ret = vchiq_mmal_port_connect_tunnel(dev->instance, src, NULL); if (ret >= 0) - ret = vchiq_mmal_component_disable( - dev->instance, - dev->component[COMP_PREVIEW]); + ret = vchiq_mmal_component_disable(dev->instance, + dev->component[COMP_PREVIEW]); disable_camera(dev); return ret; @@ -1006,7 +1003,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, return 0; } - static int mmal_setup_video_component(struct bcm2835_mmal_dev *dev, struct v4l2_format *f) { @@ -1042,8 +1038,8 @@ static int mmal_setup_video_component(struct bcm2835_mmal_dev *dev, if (overlay_enabled) { ret = vchiq_mmal_port_connect_tunnel(dev->instance, - preview_port, - &dev->component[COMP_PREVIEW]->input[0]); + preview_port, + &dev->component[COMP_PREVIEW]->input[0]); if (ret) return ret; @@ -1720,11 +1716,11 @@ static int mmal_init(struct bcm2835_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_VIDEO_IMMUTABLE_INPUT, + &enable, + sizeof(enable)); vchiq_mmal_port_parameter_set(dev->instance, &dev->component[COMP_VIDEO_ENCODE]->control, -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel