From patchwork Fri Oct 20 23:23:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bergh X-Patchwork-Id: 156365 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp29831vqx; Fri, 20 Oct 2023 16:23:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEvwWOdpw2a35UP6nuRKesGon38uWSHzfwFFalGtWBqoY2linqwOeWw9XhI5mvnKtW2ajk5 X-Received: by 2002:a17:902:eccb:b0:1c9:ba18:785c with SMTP id a11-20020a170902eccb00b001c9ba18785cmr4327061plh.25.1697844236338; Fri, 20 Oct 2023 16:23:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697844236; cv=none; d=google.com; s=arc-20160816; b=HDpRD75eaLB54gT2x3R2LLnoRmRh8xn8hCaqCFbgtNoo9TTyiI8HG+ONNeM9dzUDUI jRbfYby5tCkrPB0jixb5fEQxQN9G2+s3yYsPjork5SMc4jOZy5xCJwvJb4Mdgg254b7t 27C8UyJswKNBWhiDY09Txe6lRq5w1Y1gIKGOGVZHgNERHa8N8Z83IJa39pC4DtZMQ80M PIYT7vv++9SoRML+kYm4rwyxVk0wWvDmsdGzt2RhQtiy2tcpsbYdT/APS0BNaOCHdvfe aznC9dsxZykkLqG24LOC0IIfMnBGpCszO3AF2TwXYeCkkWvZL0RSDb3IGwaJbQJjcEIE JBKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ft8poZSombuD4W/Ja+9zHJlVT1MrHG6UJN71XEmxhrs=; fh=ME8Xwfp7Wtgd4jXRYjPyNsES0oUElkmAj29ZNbsXqso=; b=0eCedFaBmLYdMnQ6IYxvIcvxFQySScz1H3GVfzHiz+/CNKNmuR1D0Gms/f7oPaZg3q aaeKO+1EvyMoXVccIcc8LPnwHrPEzdgznFbOaMVfvLC/ap4SaCNoQzSi/bost3819BAy g+5QaztgRRlhvr6lRzCRMeCpsHqfygqtCwpW70HvQdh78CT5BwxN7fxSxEk9iS/aDXkh D7ctFT9W9oB9N98Oa1CRMWYVEQBOTgXhyJ23uTz6KbD79iPY2jD02jdkcrWY7BGc7Uzf j1MUDDqjIPFGi/rXqT3mIuTdsfkf6TjdURu4oMXoEGEwWcRvN76Dz/m4klFmY9mUs8xH zMrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bBmlnheP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id x3-20020a170902820300b001c9faf1439esi2417746pln.288.2023.10.20.16.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 16:23:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bBmlnheP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A7A43833E84F; Fri, 20 Oct 2023 16:23:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230405AbjJTXXw (ORCPT + 26 others); Fri, 20 Oct 2023 19:23:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229559AbjJTXXs (ORCPT ); Fri, 20 Oct 2023 19:23:48 -0400 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0BF6D46; Fri, 20 Oct 2023 16:23:46 -0700 (PDT) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2c503dbe50dso21781421fa.1; Fri, 20 Oct 2023 16:23:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697844225; x=1698449025; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ft8poZSombuD4W/Ja+9zHJlVT1MrHG6UJN71XEmxhrs=; b=bBmlnhePTWKOqHxKHFkqswkGtkHHFHObZkemZNO3jrxJN854MZcjm0zfKw8778GZkl pe607PeV3fe/QWzbiTCadyeVmAd1vXa5cDNA9vj1nX1Tq0TfObpcrE0lb4jOVLMdE+5y lmAIThfUGRLitH22EslSncY3IsvnIyl1QXU8GTQSOcvZ6j7pbDgW3KGVYxYHPYKz9Cph GtX6o+IK+CYtIIjm7qea8W/ZvS2sjlw7BeDhx0C0x+UycHZktlUW0iQaot5SqQEZMU6F fT2I/qHaNS0bSJ4w0Kev6yMBZckI38o8W9d2GtdWZ1UorN1LNFbJLjAQHRpiER5G+jqf ajmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697844225; x=1698449025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ft8poZSombuD4W/Ja+9zHJlVT1MrHG6UJN71XEmxhrs=; b=DlgFwCRSluY91mHst/k43EVS9SS/1QybHHmLnbCB9v4OvOu4/Quj5IaP0EfCuOX4fz SukJhSEEtkt1qRs6UfNk6SbdX44hQNMDvMirey6RZePpJ2s7HSgL/N5SlqCYu2Afv1w9 UJfNRVLt3G5oEHb5W4qngN/+VDbyeKWBIh9K80l6ewb9eYUR3BdO71WEpC38wgXOopMy g2wgGD5gYIKgBusI8l1/dZf7+Fds/D3jrGeOY+bo3rn99zx7ZhCjzCk8E1HXpUqQkYB9 S6ptm0XDIdnREKSFr3XqGM1KUzjB5FakVT1ecJ4j0uC9tlOu1pY0U3/ChgZMUGTBJe4U C5Xg== X-Gm-Message-State: AOJu0YwoIcGL7A7osjoRa/urRAnxlWuWT5nELVsDUtWf8Dc235rjXMJT xZtj+pXsvsclfKNpRFnrEqY= X-Received: by 2002:a2e:a7c7:0:b0:2c5:1867:b0bd with SMTP id x7-20020a2ea7c7000000b002c51867b0bdmr1018904ljp.23.1697844224768; Fri, 20 Oct 2023 16:23:44 -0700 (PDT) Received: from HP-ENVY-Notebook.lan (81-229-94-10-no68.tbcn.telia.com. [81.229.94.10]) by smtp.googlemail.com with ESMTPSA id s5-20020a05651c048500b002ba586d27a2sm567571ljc.26.2023.10.20.16.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 16:23:44 -0700 (PDT) From: Jonathan Bergh To: mchehab@kernel.org Cc: gregkh@linuxfoundation.org, error27@gmail.com, linux-staging@lists.linux.dev, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Bergh Subject: [PATCH 1/5] staging: media: av7110: Fix missing newlines after declaration warnings Date: Sat, 21 Oct 2023 01:23:28 +0200 Message-Id: <20231020232332.55024-2-bergh.jonathan@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231020232332.55024-1-bergh.jonathan@gmail.com> References: <20231020232332.55024-1-bergh.jonathan@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 20 Oct 2023 16:23:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780318718252424754 X-GMAIL-MSGID: 1780318718252424754 Fixed the following formatting problem: * Missing newlines after declarations Signed-off-by: Jonathan Bergh --- drivers/staging/media/av7110/av7110_av.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index 00dd6a7fea64..af3845406626 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -149,6 +149,7 @@ int av7110_av_start_record(struct av7110 *av7110, int av, int av7110_av_start_play(struct av7110 *av7110, int av) { int ret = 0; + dprintk(2, "av7110:%p, \n", av7110); if (av7110->rec_mode) @@ -183,6 +184,7 @@ int av7110_av_start_play(struct av7110 *av7110, int av) int av7110_av_stop(struct av7110 *av7110, int av) { int ret = 0; + dprintk(2, "av7110:%p, \n", av7110); if (!(av7110->playing & av) && !(av7110->rec_mode & av)) @@ -320,6 +322,7 @@ int av7110_set_volume(struct av7110 *av7110, unsigned int volleft, int av7110_set_vidmode(struct av7110 *av7110, enum av7110_video_mode mode) { int ret; + dprintk(2, "av7110:%p, \n", av7110); ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, LoadVidCode, 1, mode); @@ -408,6 +411,7 @@ static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf, static void play_video_cb(u8 *buf, int count, void *priv) { struct av7110 *av7110 = (struct av7110 *) priv; + dprintk(2, "av7110:%p, \n", av7110); if ((buf[3] & 0xe0) == 0xe0) { @@ -420,6 +424,7 @@ static void play_video_cb(u8 *buf, int count, void *priv) static void play_audio_cb(u8 *buf, int count, void *priv) { struct av7110 *av7110 = (struct av7110 *) priv; + dprintk(2, "av7110:%p, \n", av7110); aux_ring_buffer_write(&av7110->aout, buf, count); @@ -471,6 +476,7 @@ static ssize_t dvb_play(struct av7110 *av7110, const char __user *buf, unsigned long count, int nonblock, int type) { unsigned long todo = count, n; + dprintk(2, "av7110:%p, \n", av7110); if (!av7110->kbuf[type]) @@ -504,6 +510,7 @@ static ssize_t dvb_play_kernel(struct av7110 *av7110, const u8 *buf, unsigned long count, int nonblock, int type) { unsigned long todo = count, n; + dprintk(2, "av7110:%p, \n", av7110); if (!av7110->kbuf[type]) @@ -534,6 +541,7 @@ static ssize_t dvb_aplay(struct av7110 *av7110, const char __user *buf, unsigned long count, int nonblock, int type) { unsigned long todo = count, n; + dprintk(2, "av7110:%p, \n", av7110); if (!av7110->kbuf[type]) @@ -1039,6 +1047,7 @@ static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len /* search in buf for instances of 00 00 01 b5 1? */ for (i = 0; i < len; i++) { unsigned char c; + if (get_user(c, buf + i)) return -EFAULT; if (match == 5) { @@ -1223,6 +1232,7 @@ static int dvb_video_ioctl(struct file *file, case VIDEO_SET_DISPLAY_FORMAT: { video_displayformat_t format = (video_displayformat_t) arg; + switch (format) { case VIDEO_PAN_SCAN: av7110->display_panscan = VID_PAN_SCAN_PREF; @@ -1483,6 +1493,7 @@ static int dvb_audio_ioctl(struct file *file, case AUDIO_SET_MIXER: { struct audio_mixer *amix = (struct audio_mixer *)parg; + ret = av7110_set_volume(av7110, amix->volume_left, amix->volume_right); break; } From patchwork Fri Oct 20 23:23:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bergh X-Patchwork-Id: 156368 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp30014vqx; Fri, 20 Oct 2023 16:24:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHpcmgVQe5JNz5UpyLiLroSEmiPJV0lm43Hi5ls5P156fohQ4FlLYcb4gkurCj+oNne9+0y X-Received: by 2002:a05:6a20:2451:b0:14d:f41c:435a with SMTP id t17-20020a056a20245100b0014df41c435amr3611752pzc.39.1697844272341; Fri, 20 Oct 2023 16:24:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697844272; cv=none; d=google.com; s=arc-20160816; b=b8R2wuxskS7pORjI1n6NizWLB9SO0C3P6+hASEWhSAi1qNPIytaXB3vtACRB2RUn6C 89rIY7yWwv947O9+c/QzprROaE1IckG6gfRFDtdpO/wFD7EuVUv7Tt4ZZCwTIEgn/2Hq 1QPvqefdCenbqZK4Qf1A/owISW/RTG7hqP+y4otoaDfMVkpdjYEdLl50joBV9SrnxNnd /oj+PsjFbjBAki53rnRdccEFdQsiv5RIA7U3PH8mt4CrYr0Vf+SGQZiP7yJDxlF/gZJX p9hSehTKuyq93CNRj5HvDTro8N/zBZJsGMxjXKdQr25VHCJPxx4cHt3l2ruvTkTacUk3 rk8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=B2cKCGbV0vjVRHvgIodkiCSt+6sE3RRNYirzep6QnKc=; fh=ME8Xwfp7Wtgd4jXRYjPyNsES0oUElkmAj29ZNbsXqso=; b=B1fD5TEnfXvgdt7EltNKpZH6VinHdTmflj9dxaMDSHFIb0c92TIeWeRrJmXxbs1OKY 9UP9NnLODmD9kfb160VWWRHqJgWQ+hpDxOBkdC5rnHw0yJBm0Ch6mbclBg1/70ZuGB6z SvFRdvuz0awY6Fl7jXLgvUjSeul5ciNIOJ4DkYuUL4ln11NDWtBSsLksza9BGMQ7c4sG 5s8I6v1HRJ4Krwz5yDzRrv97zCP3GUnpzDLcy6YYVHCwbZjTKfwAo/rLXNfbIjtQ7KdV +16lDEJszix5KAIEBSDoO0kY6exbSRZA7t4GGVuEGLSgxdWPzJtpHv/FHdMI+blFkp3E OGAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NrL+PeRr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id t13-20020a63dd0d000000b005abea9d00f8si2675229pgg.472.2023.10.20.16.24.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 16:24:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NrL+PeRr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 6A5F281EB845; Fri, 20 Oct 2023 16:24:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231822AbjJTXX5 (ORCPT + 26 others); Fri, 20 Oct 2023 19:23:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230196AbjJTXXv (ORCPT ); Fri, 20 Oct 2023 19:23:51 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D03ED51; Fri, 20 Oct 2023 16:23:48 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2c518a1d83fso22203451fa.3; Fri, 20 Oct 2023 16:23:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697844227; x=1698449027; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B2cKCGbV0vjVRHvgIodkiCSt+6sE3RRNYirzep6QnKc=; b=NrL+PeRrHj8biSV/KxFZ4yyOr1NRjh+rHXW57cbU/pmwSBHnp0c7t63gNZov2DKaFw kx1EA+bd3xZKXovy8R4ioFf21t2getGh6vqkq6VqJmviAKEK0M2tdhSMNO3kvkZiSWwU j2S/o8tSrYpOKniZ0dzGV7X/1ytmpZt/3LdZ+ooJOzKiNDakeOc5fOaKSXJGqmNcP3gk HmDez/0uN0LsTIJut6hon2HtPSNDLSgQ9iKB4BgL8wnIKqOgbysRAyJCz73s5Z26huG6 044NIaUJB6J37FNtcBycjO2CPXxOpVKqLBAPaqtVrrLCXlGUd36IPXkBG7cM2/5Hi/s2 ogdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697844227; x=1698449027; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B2cKCGbV0vjVRHvgIodkiCSt+6sE3RRNYirzep6QnKc=; b=vdMrpUB/9u5JV7KdT+lACslbvl0jY3iGiUiUUxSq7vNt01Jh70V4a0m7tulIw36z9M utMlerFa3PHXySg+Kkjnj6UQ3dGkNLJDNGOpOR3QMZ3OpPb87twUWb+IAvUpqeybOS7s fDWgeJ+S0p+Q0R+Pt2NxuMgm+cuxv2seMS2kmFxzVoLaRsW/YGB1dtYAWJyttOco2YFx RV6Z88EOYGyCLdPEYLdnUxT2fBM1OWNw7z1tYnuFPFviBtA5siaQ2bagX68YUDW/wRg0 whMcFjY6YXuAKgRJLQJjJKcvr3YrbdRpa2i/8OcVJRz4MaRFuyGubmWRLmkE4rukG9hs 6n/w== X-Gm-Message-State: AOJu0Yy8ATBzX3cYi4YfQvcDFeDReLGa0a9aKneTaS9XWSmSXv9S2vJT 4ty1FQk/aCIhkGWochWhiKWEUILNxY1byg== X-Received: by 2002:a2e:a167:0:b0:2c5:12ae:adb3 with SMTP id u7-20020a2ea167000000b002c512aeadb3mr2257618ljl.44.1697844226406; Fri, 20 Oct 2023 16:23:46 -0700 (PDT) Received: from HP-ENVY-Notebook.lan (81-229-94-10-no68.tbcn.telia.com. [81.229.94.10]) by smtp.googlemail.com with ESMTPSA id s5-20020a05651c048500b002ba586d27a2sm567571ljc.26.2023.10.20.16.23.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 16:23:46 -0700 (PDT) From: Jonathan Bergh To: mchehab@kernel.org Cc: gregkh@linuxfoundation.org, error27@gmail.com, linux-staging@lists.linux.dev, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Bergh Subject: [PATCH 2/5] staging: media: av7110: Fix various whitespace checkpatch errors Date: Sat, 21 Oct 2023 01:23:29 +0200 Message-Id: <20231020232332.55024-3-bergh.jonathan@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231020232332.55024-1-bergh.jonathan@gmail.com> References: <20231020232332.55024-1-bergh.jonathan@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Fri, 20 Oct 2023 16:24:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780318755700478443 X-GMAIL-MSGID: 1780318755700478443 Fixed the following checkpatch errors relating to whitespaces: * extra whitespace after '~' symbol * remove whitespace before/after parentheses for switch statement and function parameters as well as after switch keyword * ensure whitespace before '{' braces * remove whitespace between function name and '(' parentheses * ensure whitespace after ',' commas in parameter lists Signed-off-by: Jonathan Bergh --- drivers/staging/media/av7110/av7110_av.c | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index af3845406626..482dfc548b16 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -241,8 +241,8 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen) sync |= DVB_RINGBUFFER_PEEK(buf, 2) << 8; sync |= DVB_RINGBUFFER_PEEK(buf, 3); - if (((sync &~ 0x0f) == 0x000001e0) || - ((sync &~ 0x1f) == 0x000001c0) || + if (((sync &~0x0f) == 0x000001e0) || + ((sync &~0x1f) == 0x000001c0) || (sync == 0x000001bd)) break; printk("resync\n"); @@ -599,7 +599,7 @@ static int find_pes_header(u8 const *buf, long int length, int *frags) while (c < length - 3 && !found) { if (buf[c] == 0x00 && buf[c + 1] == 0x00 && buf[c + 2] == 0x01) { - switch ( buf[c + 3] ) { + switch (buf[c + 3]) { case PROG_STREAM_MAP: case PRIVATE_STREAM2: case PROG_STREAM_DIR: @@ -644,9 +644,9 @@ void av7110_p2t_write(u8 const *buf, long int length, u16 pid, struct av7110_p2t c = 0; c2 = 0; - if (p->frags){ + if (p->frags) { check = 0; - switch(p->frags) { + switch (p->frags) { case 1: if (buf[c] == 0x00 && buf[c + 1] == 0x01) { check = 1; @@ -712,7 +712,7 @@ void av7110_p2t_write(u8 const *buf, long int length, u16 pid, struct av7110_p2t c2 = find_pes_header(buf + c + add, length - c - add, &p->frags); if (c2 >= 0) { c2 += c + add; - if (c2 > c){ + if (c2 > c) { p_to_t(buf + c, c2 - c, pid, &p->counter, p->feed); c = c2; clear_p2t(p); @@ -798,7 +798,7 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, while (c < length) { memset(obuf, 0, TS_SIZE); - if (length - c >= (TS_SIZE - 4)){ + if (length - c >= (TS_SIZE - 4)) { l = write_ts_header2(pid, counter, pes_start, obuf, (TS_SIZE - 4)); memcpy(obuf + l, buf + c, TS_SIZE - l); @@ -896,7 +896,7 @@ void dvb_video_add_event(struct av7110 *av7110, struct video_event *event) } -static int dvb_video_get_event (struct av7110 *av7110, struct video_event *event, int flags) +static int dvb_video_get_event(struct av7110 *av7110, struct video_event *event, int flags) { struct dvb_video_events *events = &av7110->video_events; @@ -1135,11 +1135,11 @@ static int dvb_video_ioctl(struct file *file, unsigned long arg = (unsigned long) parg; int ret = 0; - dprintk(1, "av7110:%p, cmd=%04x\n", av7110,cmd); + dprintk(1, "av7110:%p, cmd=%04x\n", av7110, cmd); if ((file->f_flags & O_ACCMODE) == O_RDONLY) { - if ( cmd != VIDEO_GET_STATUS && cmd != VIDEO_GET_EVENT && - cmd != VIDEO_GET_SIZE ) { + if (cmd != VIDEO_GET_STATUS && cmd != VIDEO_GET_EVENT && + cmd != VIDEO_GET_SIZE) { return -EPERM; } } @@ -1367,7 +1367,7 @@ static int dvb_audio_ioctl(struct file *file, unsigned long arg = (unsigned long) parg; int ret = 0; - dprintk(1, "av7110:%p, cmd=%04x\n", av7110,cmd); + dprintk(1, "av7110:%p, cmd=%04x\n", av7110, cmd); if (((file->f_flags & O_ACCMODE) == O_RDONLY) && (cmd != AUDIO_GET_STATUS)) @@ -1433,7 +1433,7 @@ static int dvb_audio_ioctl(struct file *file, case AUDIO_CHANNEL_SELECT: av7110->audiostate.channel_select = (audio_channel_select_t) arg; - switch(av7110->audiostate.channel_select) { + switch (av7110->audiostate.channel_select) { case AUDIO_STEREO: ret = audcom(av7110, AUDIO_CMD_STEREO); if (!ret) { @@ -1642,7 +1642,7 @@ int av7110_av_register(struct av7110 *av7110) spin_lock_init(&av7110->video_events.lock); av7110->video_events.eventw = av7110->video_events.eventr = 0; av7110->video_events.overflow = 0; - memset(&av7110->video_size, 0, sizeof (video_size_t)); + memset(&av7110->video_size, 0, sizeof(video_size_t)); dvb_register_device(&av7110->dvb_adapter, &av7110->video_dev, &dvbdev_video, av7110, DVB_DEVICE_VIDEO, 0); From patchwork Fri Oct 20 23:23:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bergh X-Patchwork-Id: 156369 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp30022vqx; Fri, 20 Oct 2023 16:24:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH3zOmOi4wdGxCvB8KxNaGIiyxGYdnt297/UIdp6pzdNiTbt25lkFK0LUuChRxxCaZ+pwY9 X-Received: by 2002:a05:6a21:328a:b0:16b:cc6c:d728 with SMTP id yt10-20020a056a21328a00b0016bcc6cd728mr3767489pzb.44.1697844273871; Fri, 20 Oct 2023 16:24:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697844273; cv=none; d=google.com; s=arc-20160816; b=GzwGpEdbyyPHNjshana2hz4Aetv02XRRxtlFAUN5Ye1MjsAvOzTY5ia6RWVcKLS0PN yCQ7LdQazyLhBIB7tlJPvhxEbgFJFo27fIxhFKLXDGrRjKg2lH38rK5pCE5JvnQ81W4Y jk1+43Q4qr5E9OrpjxdZZRGXD39mRHSK6vZKvG0ZtntfkWIBAPz57WXPWtD+ia4K+EFh jBpEx6Ecqx0LCM5nrUAL1LOW0vhbk/WUO76fr1/McrhhwSl2WnZQvktlCJdeldPkS7Dr HKlUKvZHPOfZuxEMZtlL1h3JcYPyFrz05UpeGZUIEuTO3z/eD2LrnGNBhhnjc8VTMfkD NMPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2xhWAgGK0TG28Y9dbvSoZSMOb85wa6hi070VtZ0aDXM=; fh=ME8Xwfp7Wtgd4jXRYjPyNsES0oUElkmAj29ZNbsXqso=; b=x8oMAo4TucbWwrHOqG7xXnTknKh+zK6cZL4M99C3EC9+tOEAZt4gDOFXIdxNu67kCR iGmYnvJNwTdhzZysWCMJ8g2HY3bJsaklt3NfyHrDNXhsdbNTFnhc+sBiwEj8vgCU1gPj RtcHjYagTAhapi84eOcPXqbrtnEZiv5wYTL5ruk1fxp/y7W6bfrGSel7nwEnWci4l3ir ptSktZlvj9Tdl0NILzSa9TUMNWzv6zKMdxiHahdTb64kR/ewTZ3kB7gWW8dOxhg1CZw0 bitV62WMUR17PTMSkqBD99H3uD/7yFbS86+ukx052sOvm/3NuVJLuAwg9lox2gBWcNh1 pdHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WsxuE0TS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id ba6-20020a170902720600b001c9fe071f2csi2482613plb.105.2023.10.20.16.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 16:24:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WsxuE0TS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 921B781042C5; Fri, 20 Oct 2023 16:24:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231252AbjJTXX7 (ORCPT + 26 others); Fri, 20 Oct 2023 19:23:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230372AbjJTXXw (ORCPT ); Fri, 20 Oct 2023 19:23:52 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29013D69; Fri, 20 Oct 2023 16:23:50 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2c50d1b9f22so18906361fa.0; Fri, 20 Oct 2023 16:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697844228; x=1698449028; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2xhWAgGK0TG28Y9dbvSoZSMOb85wa6hi070VtZ0aDXM=; b=WsxuE0TSh0Boeex3OAwIiqC8IZdl2bRmNY7g/T4V7oG49wNXKuxOdRtE/iQ/TR0w6g R7BLzAgQYUugEiGiKBLeaG8e0ozTj6Sy7f91ZI9VS3Ge8EuMXmY800AjbT2UssQFtW2d EBSDR2NpGgQ9keRfTJjr7VgucJ4NtaSS+CPOYvnyJLrnBPALc2rEowg0u/W77YMORSzB zOEUnBzkGNzU6JcuPad6dh79XQW6zXtqKnANPgpipLGiuP5xdbm14yuOKLHpAvJa9xyl 6Ixz7u+qcUZql0XTMZ/KVeGyYv5P1My+EIcnSLl8IvJStWdvrutkpIYe+dib6+L2JBC3 zQeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697844228; x=1698449028; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2xhWAgGK0TG28Y9dbvSoZSMOb85wa6hi070VtZ0aDXM=; b=GJFrJqLnER6PRsAAmtgnRyxwvL5oH2690SKcNFZnAhGR3L6H7I6mBdP729F/H3N55s VcB5YOSqzWHPKHm7m80isPAmlE65m4i2ZZrq+symhnCWaxZk/lF2AfuFg84/exzY0PEn 93Qqzrol0kLP32JPME8npqPQboVzqenoswuGpV0n4Ou2KGidgHJdPFTAkaMu7IDdmHAn XvRYGISKRMu2GFzaEuqzbhOGNvv45QCau9gIAcUQLVygRwz45FnSaALZHx+oQaUO6woB Z4JgWDbeuR6lCycE1XdRb9F9n73nsvKJJ4ZPoZwV6SgS32VI4nR2cbb3R+z/EdifkO95 +n0g== X-Gm-Message-State: AOJu0YxcfRxu5HwANXJNGdN3p/Q/OaXLp8J/okH5Lo6EqDRu2F2/qxo1 eGe0xdQ3m70zQsmybW5CYNg= X-Received: by 2002:a2e:7c15:0:b0:2c5:5926:de52 with SMTP id x21-20020a2e7c15000000b002c55926de52mr2231584ljc.53.1697844228180; Fri, 20 Oct 2023 16:23:48 -0700 (PDT) Received: from HP-ENVY-Notebook.lan (81-229-94-10-no68.tbcn.telia.com. [81.229.94.10]) by smtp.googlemail.com with ESMTPSA id s5-20020a05651c048500b002ba586d27a2sm567571ljc.26.2023.10.20.16.23.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 16:23:47 -0700 (PDT) From: Jonathan Bergh To: mchehab@kernel.org Cc: gregkh@linuxfoundation.org, error27@gmail.com, linux-staging@lists.linux.dev, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Bergh Subject: [PATCH 3/5] staging: media: av7110: Remove unnecessary whitespace before quoted newlines Date: Sat, 21 Oct 2023 01:23:30 +0200 Message-Id: <20231020232332.55024-4-bergh.jonathan@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231020232332.55024-1-bergh.jonathan@gmail.com> References: <20231020232332.55024-1-bergh.jonathan@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Fri, 20 Oct 2023 16:24:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780318757506276569 X-GMAIL-MSGID: 1780318757506276569 Fixed multiple instances where whitespaces were placed before quoted newlines Signed-off-by: Jonathan Bergh --- drivers/staging/media/av7110/av7110_av.c | 40 ++++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index 482dfc548b16..880fa8a314ba 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -150,7 +150,7 @@ int av7110_av_start_play(struct av7110 *av7110, int av) { int ret = 0; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if (av7110->rec_mode) return -EBUSY; @@ -185,7 +185,7 @@ int av7110_av_stop(struct av7110 *av7110, int av) { int ret = 0; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if (!(av7110->playing & av) && !(av7110->rec_mode & av)) return 0; @@ -272,7 +272,7 @@ int av7110_set_volume(struct av7110 *av7110, unsigned int volleft, unsigned int vol, val, balance = 0; int err; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); av7110->mixer.volume_left = volleft; av7110->mixer.volume_right = volright; @@ -323,7 +323,7 @@ int av7110_set_vidmode(struct av7110 *av7110, enum av7110_video_mode mode) { int ret; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, LoadVidCode, 1, mode); @@ -358,7 +358,7 @@ static int get_video_format(struct av7110 *av7110, u8 *buf, int count) u8 *p; int ret = 0; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if (av7110->sinfo) return 0; @@ -412,7 +412,7 @@ static void play_video_cb(u8 *buf, int count, void *priv) { struct av7110 *av7110 = (struct av7110 *) priv; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if ((buf[3] & 0xe0) == 0xe0) { get_video_format(av7110, buf, count); @@ -425,7 +425,7 @@ static void play_audio_cb(u8 *buf, int count, void *priv) { struct av7110 *av7110 = (struct av7110 *) priv; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); aux_ring_buffer_write(&av7110->aout, buf, count); } @@ -477,7 +477,7 @@ static ssize_t dvb_play(struct av7110 *av7110, const char __user *buf, { unsigned long todo = count, n; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if (!av7110->kbuf[type]) return -ENOBUFS; @@ -511,7 +511,7 @@ static ssize_t dvb_play_kernel(struct av7110 *av7110, const u8 *buf, { unsigned long todo = count, n; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if (!av7110->kbuf[type]) return -ENOBUFS; @@ -542,7 +542,7 @@ static ssize_t dvb_aplay(struct av7110 *av7110, const char __user *buf, { unsigned long todo = count, n; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if (!av7110->kbuf[type]) return -ENOBUFS; @@ -847,7 +847,7 @@ int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t l struct dvb_demux *demux = feed->demux; struct av7110 *av7110 = demux->priv; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if (av7110->full_ts && demux->dmx.frontend->source != DMX_MEMORY_FE) return 0; @@ -937,7 +937,7 @@ static __poll_t dvb_video_poll(struct file *file, poll_table *wait) struct av7110 *av7110 = dvbdev->priv; __poll_t mask = 0; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if ((file->f_flags & O_ACCMODE) != O_RDONLY) poll_wait(file, &av7110->avout.queue, wait); @@ -967,7 +967,7 @@ static ssize_t dvb_video_write(struct file *file, const char __user *buf, struct av7110 *av7110 = dvbdev->priv; unsigned char c; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if ((file->f_flags & O_ACCMODE) == O_RDONLY) return -EPERM; @@ -989,7 +989,7 @@ static __poll_t dvb_audio_poll(struct file *file, poll_table *wait) struct av7110 *av7110 = dvbdev->priv; __poll_t mask = 0; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); poll_wait(file, &av7110->aout.queue, wait); @@ -1009,7 +1009,7 @@ static ssize_t dvb_audio_write(struct file *file, const char __user *buf, struct av7110 *av7110 = dvbdev->priv; unsigned char c; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if (av7110->audiostate.stream_source != AUDIO_SOURCE_MEMORY) { printk(KERN_ERR "not audio source memory\n"); @@ -1034,7 +1034,7 @@ static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len int progressive = 0; int match = 0; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if (len == 0) return 0; @@ -1516,7 +1516,7 @@ static int dvb_video_open(struct inode *inode, struct file *file) struct av7110 *av7110 = dvbdev->priv; int err; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if ((err = dvb_generic_open(inode, file)) < 0) return err; @@ -1540,7 +1540,7 @@ static int dvb_video_release(struct inode *inode, struct file *file) struct dvb_device *dvbdev = file->private_data; struct av7110 *av7110 = dvbdev->priv; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if ((file->f_flags & O_ACCMODE) != O_RDONLY) { av7110_av_stop(av7110, RP_VIDEO); @@ -1555,7 +1555,7 @@ static int dvb_audio_open(struct inode *inode, struct file *file) struct av7110 *av7110 = dvbdev->priv; int err = dvb_generic_open(inode, file); - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); if (err < 0) return err; @@ -1569,7 +1569,7 @@ static int dvb_audio_release(struct inode *inode, struct file *file) struct dvb_device *dvbdev = file->private_data; struct av7110 *av7110 = dvbdev->priv; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p,\n", av7110); av7110_av_stop(av7110, RP_AUDIO); return dvb_generic_release(inode, file); From patchwork Fri Oct 20 23:23:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bergh X-Patchwork-Id: 156366 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp29914vqx; Fri, 20 Oct 2023 16:24:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFx7xV6MXeAFCVBY4BZZB6FLsFr6UWcKQWDarh/ZKtgorZzrfAdcpQg9R1ETcmxQWWCiI5o X-Received: by 2002:a05:6a00:2341:b0:6b3:2106:94b0 with SMTP id j1-20020a056a00234100b006b3210694b0mr3693233pfj.23.1697844253940; Fri, 20 Oct 2023 16:24:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697844253; cv=none; d=google.com; s=arc-20160816; b=izlHZFNrZPV01oMMdiWUrnPJY0Pck4VLWcGUUIaO7bLl+c/TjomGJjlxANwJbdvcoo cBBnbWelEHol5n33J8TpDvFjpTdGF5zTZq92cvxeuWdkDV7nKiCP8XopGf8EcujOKQFK Y74wjCDvJhBsLTu5LAJxYBsxYprOE75P2hfBg1HTBgjF66oWl1eV+dKP9T2DJUAq2rIT GZTHGURg/CdiMRYhn6TZpIgtzUIV/R9+8nFy2q7bBjeh1sjF4BVkFf+cRZBplLFB6azy ClB24FGQIX3PghI36PK0Uu9gsw6gy9oKUDrGYBLPw16+monlC5xJ5UACnPG9hrytOv/J w+HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=O6AsKFzmbJmMlgO7Kg4ODl3MalR7AIPucYJJTFRtUoA=; fh=ME8Xwfp7Wtgd4jXRYjPyNsES0oUElkmAj29ZNbsXqso=; b=HFCIuH0pohmMLdW+6s7B360EHlSnutqzOkXDypg7YHevmRVG4/zrd80gnVRSV5blb6 EYQ4dtCwpgEGG3ysD6Z4sPHTrYlaAXPS6jFst4VsdeXDIcH8Nqfs02zwNhgmdFwwSnPi ut0QvbRonBRB3R6aKC57czpSNcbGVE9rNxOiI66CQ9nz2Shn9KHtYGAVDuRcLsEWUmPK chcgH5rULkIz+PBpF8SZ/I0rOW1gkSDrQMsatryVqFLN34PRCbPrmaKGwIf/XqgLFlhc 3k/1eoqnR1gVxgZB+Jg/gPywy1RisZE7J5gc2hYekSmFzDoVs/r/1w3bVsxbFTEToHAq J1MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lxMBd7B0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id x21-20020aa79575000000b006b4319c78efsi2746748pfq.389.2023.10.20.16.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 16:24:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lxMBd7B0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 1C803833E86F; Fri, 20 Oct 2023 16:24:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232919AbjJTXYC (ORCPT + 26 others); Fri, 20 Oct 2023 19:24:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231301AbjJTXXy (ORCPT ); Fri, 20 Oct 2023 19:23:54 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF0F3D76; Fri, 20 Oct 2023 16:23:51 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2c523ac38fbso20141011fa.0; Fri, 20 Oct 2023 16:23:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697844230; x=1698449030; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O6AsKFzmbJmMlgO7Kg4ODl3MalR7AIPucYJJTFRtUoA=; b=lxMBd7B0YBZxZtghAeckNLb9m2QJkOG4gmY/qd8JPSq7OHmmFUarXQNRy8dz9NF+q5 0AmC5tB8u+7VU8pBU5Psy1L7jhT7VnmKk72Ihx92T3rfU6QNPV5PTbz/5Ah2hvLgF0g6 aJHom4t0tMOAeR3Z7FVj3PJ6tKqBuLhJ0ZwPhFWyzrNPNCel3T+8/K6BNt7HTgIASwbP HzXhNvCQV6OQzE4GI5w0C7BH/ureYqoW593pGTz6hKHFqFj0aMr8j7jiFyMU0JexN0OW DUqeDJzMmSjIbJ7eWUQ6uYTKPnjoOJHjFcrFDelIgNMQRbxvZhjmEqiJ5CoXCgnnGLbg X8+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697844230; x=1698449030; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O6AsKFzmbJmMlgO7Kg4ODl3MalR7AIPucYJJTFRtUoA=; b=ZVUW41WNMBTV5usEprxsEiOK5TJnCeQC9s6K09JrTf524aQFdAqG+BDNyrO0j94+kS lQiIxmF+Sqr56tyiGiuyj30zxWfYQH653L0S79JpB+E1UJAVUvPhV3E6MQ+JRYwNlBrM S/jioKj74qgFXN0EJj3BrIAJtStEhRUk2bRlVqrTMPipmjZSEvOBstNX/7UtGV3ytOZm /rQEyuUR05MEm1bqoRRTb+HeidCRNNchE3da3eQ6n2rmGZidrGqS8IuD7XraJetfq6C+ Nky0m0LZtCkFJyp/0V+K04GkMy1/bLX5JSQrc7uUUGb3JhVL51bTJ3OOPtDrw7jywTch kowA== X-Gm-Message-State: AOJu0YxDoB0HJpkDmJLgPP8gIX+nSP2QZw8p3X6HzUd03lkkedHBr70B qd/rMIPghRn4i9SyhcxkSA4= X-Received: by 2002:a2e:8619:0:b0:2c5:1989:ce1c with SMTP id a25-20020a2e8619000000b002c51989ce1cmr2244449lji.26.1697844229984; Fri, 20 Oct 2023 16:23:49 -0700 (PDT) Received: from HP-ENVY-Notebook.lan (81-229-94-10-no68.tbcn.telia.com. [81.229.94.10]) by smtp.googlemail.com with ESMTPSA id s5-20020a05651c048500b002ba586d27a2sm567571ljc.26.2023.10.20.16.23.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 16:23:49 -0700 (PDT) From: Jonathan Bergh To: mchehab@kernel.org Cc: gregkh@linuxfoundation.org, error27@gmail.com, linux-staging@lists.linux.dev, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Bergh Subject: [PATCH 4/5] staging: media: av7110: Fix 'long int' and 'unsigned' variable declarations Date: Sat, 21 Oct 2023 01:23:31 +0200 Message-Id: <20231020232332.55024-5-bergh.jonathan@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231020232332.55024-1-bergh.jonathan@gmail.com> References: <20231020232332.55024-1-bergh.jonathan@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 20 Oct 2023 16:24:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780318736432703373 X-GMAIL-MSGID: 1780318736432703373 Fixed the following warnings flagged by checkpatch: * Replaced 'long int' with 'long' * Replaced 'unsigned' with 'unsigned int' Signed-off-by: Jonathan Bergh --- drivers/staging/media/av7110/av7110_av.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index 880fa8a314ba..82d4c02ae3ef 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -71,7 +71,7 @@ #define SEAM_SPLICE 0x20 -static void p_to_t(u8 const *buf, long int length, u16 pid, +static void p_to_t(u8 const *buf, long length, u16 pid, u8 *counter, struct dvb_demux_feed *feed); static int write_ts_to_decoder(struct av7110 *av7110, int type, const u8 *buf, size_t len); @@ -589,7 +589,7 @@ static void clear_p2t(struct av7110_p2t *p) } -static int find_pes_header(u8 const *buf, long int length, int *frags) +static int find_pes_header(u8 const *buf, long length, int *frags) { int c = 0; int found = 0; @@ -637,7 +637,7 @@ static int find_pes_header(u8 const *buf, long int length, int *frags) return c; } -void av7110_p2t_write(u8 const *buf, long int length, u16 pid, struct av7110_p2t *p) +void av7110_p2t_write(u8 const *buf, long length, u16 pid, struct av7110_p2t *p) { int c, c2, l, add; int check, rest; @@ -767,7 +767,7 @@ static int write_ts_header2(u16 pid, u8 *counter, int pes_start, u8 *buf, u8 len } -static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, +static void p_to_t(u8 const *buf, long length, u16 pid, u8 *counter, struct dvb_demux_feed *feed) { int l, pes_start; @@ -1030,7 +1030,7 @@ static u8 iframe_header[] = { 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x80, 0x00, 0x static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len, int nonblock) { - unsigned i, n; + unsigned int i, n; int progressive = 0; int match = 0; From patchwork Fri Oct 20 23:23:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bergh X-Patchwork-Id: 156367 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp29936vqx; Fri, 20 Oct 2023 16:24:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGlcZbnvz5qjkGjDYdkMbpez+G0kZ/HyYZ9XcZLi0bG/AjVnp8oonM2CZz1+Sv1c6f7BzBy X-Received: by 2002:a17:903:1cd:b0:1c9:cad9:e6e3 with SMTP id e13-20020a17090301cd00b001c9cad9e6e3mr9651710plh.32.1697844258534; Fri, 20 Oct 2023 16:24:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697844258; cv=none; d=google.com; s=arc-20160816; b=rRpsWwR+zgvVnuOKDHZiaIWbrcP43qiIHxA9hbptlgOrN2jbwQHgQxJ7aOhqObZDyg 4Af5syIywy86qZMeHCrln+k2LZgYY4wqOyl/IKtVPmyUDHuUYa3IRV4Z3sXUiRg6ZWC0 exGbzppjjRuj9rUWp8dVSyKLy6dQ/3Oue1WU/3ww3W5AqwjZbypNA9+bawzDLHXV78Hf dY5hN94mDbPK2eW1I3G4EtTnURoMxxbVl0R+mBq0NvKnxcsmL18FVPWRzr4MqQmRKfpU EU0mGYp36fu44xAGqM6qNGHPKtXPoMjbMmZrTJWYNH7lfPq1YOXqj/1O1EwiCvE0zIpu pOfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iGRsKfkSWDnEn2JQQ9Vic5ujLknS138ZJ2S7yseoneg=; fh=ME8Xwfp7Wtgd4jXRYjPyNsES0oUElkmAj29ZNbsXqso=; b=YM3hnlyTftPW/MTfUpjJB3r+iLpdchN00/RGjw8lb7Fwhh03z4yuv/kMDgcM7u0r6X xLm18i35lfnr5aFvvMo6ce10R0tqhXhbAum/MtSwh6BjE8vIYUA2jbFX6vs/k45OkAHn 6V59sesGUBjVz0YftQfZFbqzRHX+nbo8uxvBOwnZEfgzlAufmJDkzfXKZG16bGaJanAD RPb5xMB63Z4MS5Y3gwpVe9tVKdpmPUGZQAN02P6CSOz8T46rHWYSbrvvRhbAwzAaObhi xDoQuSaSLZjvaOroJgER7AWQnvdu6g0clqde3ghqGVC8WNKHVpG43or2Rg+i4253K6qU CXNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="hQ/J7Ccx"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id w65-20020a636244000000b0057828b85afdsi2600210pgb.795.2023.10.20.16.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 16:24:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="hQ/J7Ccx"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 91CBC833E878; Fri, 20 Oct 2023 16:24:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232269AbjJTXYG (ORCPT + 26 others); Fri, 20 Oct 2023 19:24:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231228AbjJTXX6 (ORCPT ); Fri, 20 Oct 2023 19:23:58 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9739AD7E; Fri, 20 Oct 2023 16:23:54 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2c51682fddeso27615921fa.1; Fri, 20 Oct 2023 16:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697844232; x=1698449032; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iGRsKfkSWDnEn2JQQ9Vic5ujLknS138ZJ2S7yseoneg=; b=hQ/J7CcxH1E1UUk2p4qRLSNMKrtasio11zaKJAIg+J40C+0s7OBDujpSGhAcSVYKpT xUzyEa2Ok6noZLZVycXzr+5L0Sn6eMPl0fPzu3cvrEpBVvo685almepc8Q6H5HJmoSWl IcUvu2tErjnhSvNhrb46OVBtDmjSNpanCoOjrkDIkjAhckLyiPXq2sF08/PJ8EYmvRPF v2QwJ9qdfNbsWQXR6djbZltuquuYvCjcvdlP2jjKjI1bZct2hv/3AmwYsYI2YXIVswBp HD2qlmBPGnINXKZ6De6nvAzDAbdB/G5eQ8oj+Ig97ZoKVgFiQmKUbWZEb1kF3goylwzD 2kSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697844232; x=1698449032; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iGRsKfkSWDnEn2JQQ9Vic5ujLknS138ZJ2S7yseoneg=; b=bC+fKBJaupM/aFbeipqBhoErohd5R1Q3bENcxHyitxbaeSQPCofBEcuGzBAfhF6daz ZKKB5yM7Z938pg1CPgWkuP1GpeG798fpyaEn4s/43CIgtZ31+Ay8dxcaZRDQ0WaAyF7j Sy77BfxNPGcPgsrA053mIqsWvxuWEQEJNbMutu5QiCJTYsfskXXgJ1iDey9/mZ8cf9jA D/4DQzJoGQJU7mc2sAjZHphPTp0cCLnqXvOuyXrYAiCW0IFmdfqkBDGmVuc+hfI5MqkW 3EeYTDyGN9uf0y6vFLrr8465JeZLu+oiE+T+I4s7S8oFe3HOCMbczDSLk/rkRAmPoNNb GitQ== X-Gm-Message-State: AOJu0YyxwUXjB6d/MLRe0BfFmeRypEVmZcHLrCQJ+fN3Er5dwls8OAHZ rNdZKwMlVkv6a6+Td1OAs9s= X-Received: by 2002:a2e:9194:0:b0:2c0:a0d:1f0a with SMTP id f20-20020a2e9194000000b002c00a0d1f0amr2138271ljg.18.1697844232420; Fri, 20 Oct 2023 16:23:52 -0700 (PDT) Received: from HP-ENVY-Notebook.lan (81-229-94-10-no68.tbcn.telia.com. [81.229.94.10]) by smtp.googlemail.com with ESMTPSA id s5-20020a05651c048500b002ba586d27a2sm567571ljc.26.2023.10.20.16.23.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 16:23:52 -0700 (PDT) From: Jonathan Bergh To: mchehab@kernel.org Cc: gregkh@linuxfoundation.org, error27@gmail.com, linux-staging@lists.linux.dev, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Bergh Subject: [PATCH 5/5] staging: media: av7110: Fix various formating issues Date: Sat, 21 Oct 2023 01:23:32 +0200 Message-Id: <20231020232332.55024-6-bergh.jonathan@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231020232332.55024-1-bergh.jonathan@gmail.com> References: <20231020232332.55024-1-bergh.jonathan@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 20 Oct 2023 16:24:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780318741489852294 X-GMAIL-MSGID: 1780318741489852294 Fixed the following remaining formatting issues: * ensure balanced whitespaces around '&' symbol * fix irregular whitespacings in variable assignment statement * fix suspect identation after if statement * fix instances were trailing statements after case statements were not on a newline * fixed a block comment to use '*' on succesive lines * Remove unneeded braces {} for single line conditional statement Signed-off-by: Jonathan Bergh --- drivers/staging/media/av7110/av7110_av.c | 29 +++++++++++++----------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index 82d4c02ae3ef..bdef95244121 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -241,8 +241,8 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen) sync |= DVB_RINGBUFFER_PEEK(buf, 2) << 8; sync |= DVB_RINGBUFFER_PEEK(buf, 3); - if (((sync &~0x0f) == 0x000001e0) || - ((sync &~0x1f) == 0x000001c0) || + if (((sync & ~0x0f) == 0x000001e0) || + ((sync & ~0x1f) == 0x000001c0) || (sync == 0x000001bd)) break; printk("resync\n"); @@ -297,10 +297,10 @@ int av7110_set_volume(struct av7110 *av7110, unsigned int volleft, return 0; case DVB_ADAC_MSP34x0: - vol = (volleft > volright) ? volleft : volright; - val = (vol * 0x73 / 255) << 8; + vol = (volleft > volright) ? volleft : volright; + val = (vol * 0x73 / 255) << 8; if (vol > 0) - balance = ((volright - volleft) * 127) / vol; + balance = ((volright - volleft) * 127) / vol; msp_writereg(av7110, MSP_WR_DSP, 0x0001, balance << 8); msp_writereg(av7110, MSP_WR_DSP, 0x0000, val); /* loudspeaker */ msp_writereg(av7110, MSP_WR_DSP, 0x0006, val); /* headphonesr */ @@ -367,8 +367,8 @@ static int get_video_format(struct av7110 *av7110, u8 *buf, int count) if (p[0] || p[1] || p[2] != 0x01 || p[3] != 0xb3) continue; p += 4; - hsize = ((p[1] &0xF0) >> 4) | (p[0] << 4); - vsize = ((p[1] &0x0F) << 8) | (p[2]); + hsize = ((p[1] & 0xF0) >> 4) | (p[0] << 4); + vsize = ((p[1] & 0x0F) << 8) | (p[2]); sw = (p[3] & 0x0F); ret = av7110_set_vidmode(av7110, sw2mode[sw]); if (!ret) { @@ -1059,13 +1059,16 @@ static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len continue; } switch (match++) { - case 2: if (c == 0x01) + case 2: + if (c == 0x01) continue; break; - case 3: if (c == 0xb5) + case 3: + if (c == 0xb5) continue; break; - case 4: if ((c & 0xf0) == 0x10) + case 4: + if ((c & 0xf0) == 0x10) continue; break; } @@ -1073,7 +1076,8 @@ static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len } /* setting n always > 1, fixes problems when playing stillframes - consisting of I- and P-Frames */ + * consisting of I- and P-Frames + */ n = MIN_IFRAME / len + 1; /* FIXME: nonblock? */ @@ -1542,9 +1546,8 @@ static int dvb_video_release(struct inode *inode, struct file *file) dprintk(2, "av7110:%p,\n", av7110); - if ((file->f_flags & O_ACCMODE) != O_RDONLY) { + if ((file->f_flags & O_ACCMODE) != O_RDONLY) av7110_av_stop(av7110, RP_VIDEO); - } return dvb_generic_release(inode, file); }