From patchwork Fri Aug 16 12:30:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 103518 X-Patchwork-Delegate: mchehab@kernel.org Received: from sv.mirrors.kernel.org ([139.178.88.99]) by linuxtv.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sew6q-0007Yd-1P for patchwork@linuxtv.org; Fri, 16 Aug 2024 12:31:13 +0000 Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 22F96286EF1 for ; Fri, 16 Aug 2024 12:31:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4F9851B8EA6; Fri, 16 Aug 2024 12:30:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="dpF4LyFB" X-Original-To: linux-media@vger.kernel.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 54AD91AE87B for ; Fri, 16 Aug 2024 12:30:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811435; cv=none; b=CfZ/GeJefkSlDCrQfRZAvgRtT0ivUMaTC4tYxBaKVsu/hTN17EFDYkiuelamkLjjr8sVV9XqUvVaLWtdOR+7xugWoFNWo37rGil6cfbU+eAat278F3zrVhoAkIWTDPBlIGZt0V8aRPmYT14Cthhsn/mh7FULzcgTAV4B8jt8QVI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811435; c=relaxed/simple; bh=AN2zkbqD250EjGBEmwuzJlE8f9nO0nY/af0JFueOjQI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QeMybI5OjF8r1MsLQQYhCVh5t2Ra6s1FQ/puOGMrFEqBLq+inYC4+/INUBBv5H1Kw/hwcpYvoxABwczZlpEzH25v1hVl4Ym2gD3HYtElo7Hqe1yD1x2rHwclhyv0cAv0KQTXhLe4bpfuFRct06YxRz6SShF6fycjcG3n5l/HyfM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=dpF4LyFB; arc=none smtp.client-ip=209.85.160.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-44ff99fcd42so10821421cf.0 for ; Fri, 16 Aug 2024 05:30:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723811433; x=1724416233; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=s0nrBOsUAqUgapKq+R34S7oSUAMCsQPiLYdOB0fBvGY=; b=dpF4LyFByvsA4sBvf6xOcUq9BpW5B7BT3TTHaXWX2SQNvq3vU45R5VLRinRWtt03CI Hizt6+FWPAPpVgxCgWSpEeBJKLzBBarSKmT32AQXKXAsisfDl4nkHoB5HBnHgunoUa56 NNcK3h3/9IJU2gruXljdIieKAS3+BN2Ox3gDg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723811433; x=1724416233; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s0nrBOsUAqUgapKq+R34S7oSUAMCsQPiLYdOB0fBvGY=; b=GvYwUf5EuH6soRNrSFz5DTf6FTJnaHzJCWAYM0HTaQgDCe+BYGlaTr9uS8U4GCRczY 3fvo8iiTSiZntu9m890N89t4wYnFHhiIGWMi4gxJ6DFdTx45xxI5AX3FThU3wI6w5HCJ gN/DHxcL2js2bbnacHWkJiTKPrRR8LeVHlHUdy5ENVMsgU63gggGTufacRK8nsBQvnQl Ize+ogkYgWwwJXg56tIsdJyBxNO4GExEponxZEw3kdB1ea9tGxcTr/vsb7BWzO3JZ/xD pMephs24qYWErIblNmWR9Npcs4hpxiVCE746NtaOe/+Z/SY2wvcKHmK5G/Ws7YbTgwFs ASNA== X-Gm-Message-State: AOJu0YxDdxc7XHtIscYpKOCVqdTOoMtmy6B03KfOMWXioPGxAZdHT7nJ lR6MKbUEcPPDadZmgeIdXBa6zqfFik5+IxvpS6lErZbirqF8Iw9Q8NDVp9r+qA== X-Google-Smtp-Source: AGHT+IGQPFo/pK6ONr5jhdyaMMEVlTHiYM6Dy3SXIYXya/U1WD7/VoBzANNiaowrEjln8pWihHYKBg== X-Received: by 2002:a05:622a:1c19:b0:44f:feef:efe1 with SMTP id d75a77b69052e-453743a947fmr24457181cf.54.1723811433219; Fri, 16 Aug 2024 05:30:33 -0700 (PDT) Received: from denia.c.googlers.com (123.178.145.34.bc.googleusercontent.com. [34.145.178.123]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45369fd9e39sm15853051cf.2.2024.08.16.05.30.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 05:30:32 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 16 Aug 2024 12:30:31 +0000 Subject: [PATCH v3 3/3] media: drivers/media/dvb-core: CodoStyle for dvb_frontend_open() Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240816-coccinelle-followup-v3-3-79fbc2742fa8@chromium.org> References: <20240816-coccinelle-followup-v3-0-79fbc2742fa8@chromium.org> In-Reply-To: <20240816-coccinelle-followup-v3-0-79fbc2742fa8@chromium.org> To: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Verkuil , Ricardo Ribalda X-Mailer: b4 0.13.0 X-LSpam-Score: -9.6 (---------) X-LSpam-Report: No, score=-9.6 required=5.0 tests=ARC_SIGNED=0.001,ARC_VALID=-0.1,BAYES_00=-1.9,DKIMWL_WL_HIGH=-1,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,DMARC_PASS=-0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,RCVD_IN_VALIDITY_CERTIFIED=-3,RCVD_IN_VALIDITY_RPBL=1.31,RCVD_IN_VALIDITY_SAFE=-2,SPF_HELO_NONE=0.001,SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no We can rearrange a bit the function to reduce the indentation levels. No functional change added to this patch. Signed-off-by: Ricardo Ribalda --- drivers/media/dvb-core/dvb_frontend.c | 49 ++++++++++++++++------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c index 16d21ec6ff35..f714fc432dea 100644 --- a/drivers/media/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb-core/dvb_frontend.c @@ -2875,7 +2875,6 @@ static int dvb_frontend_open(struct inode *inode, struct file *file) struct dvb_device *dvbdev = file->private_data; struct dvb_frontend *fe = dvbdev->priv; struct dvb_adapter *adapter = fe->dvb; - int ret; dev_dbg(fe->dvb->device, "%s:\n", __func__); if (fe->exit == DVB_FE_DEVICE_REMOVED) @@ -2893,36 +2892,32 @@ static int dvb_frontend_open(struct inode *inode, struct file *file) return -EBUSY; adapter->mfe_dvbdev = dvbdev; } - } else { - if (!adapter->mfe_dvbdev) { + return __dvb_frontend_open(inode, file); + } + + if (!adapter->mfe_dvbdev) { + adapter->mfe_dvbdev = dvbdev; + } else if (adapter->mfe_dvbdev != dvbdev) { + struct dvb_device *mfedev = adapter->mfe_dvbdev; + struct dvb_frontend *mfe = mfedev->priv; + struct dvb_frontend_private *mfepriv = mfe->frontend_priv; + int ret; + + ret = wait_dvb_frontend(adapter, mfedev); + if (ret) + return ret; + + if (adapter->mfe_dvbdev != dvbdev) { + mfedev = adapter->mfe_dvbdev; + mfe = mfedev->priv; + mfepriv = mfe->frontend_priv; + if (mfedev->users != -1 || mfepriv->thread) + return -EBUSY; adapter->mfe_dvbdev = dvbdev; - } else if (adapter->mfe_dvbdev != dvbdev) { - struct dvb_device - *mfedev = adapter->mfe_dvbdev; - struct dvb_frontend - *mfe = mfedev->priv; - struct dvb_frontend_private - *mfepriv = mfe->frontend_priv; - - ret = wait_dvb_frontend(adapter, mfedev); - if (ret) - return ret; - - if (adapter->mfe_dvbdev != dvbdev) { - mfedev = adapter->mfe_dvbdev; - mfe = mfedev->priv; - mfepriv = mfe->frontend_priv; - if (mfedev->users != -1 || - mfepriv->thread) - return -EBUSY; - adapter->mfe_dvbdev = dvbdev; - } } } - ret = __dvb_frontend_open(inode, file); - - return ret; + return __dvb_frontend_open(inode, file); } static int dvb_frontend_release(struct inode *inode, struct file *file)