From nobody Mon Feb 9 10:42:33 2026 Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) (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 3ED4519DF4F for ; Fri, 16 Aug 2024 12:30:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811434; cv=none; b=VCYC/DahLIiiBA2PrQ+exSYWIJ5ESbvUUAAl0AbH2qyayJhzpLkH9btosRIdk5AIhPiiuhjA6lKARp/6r1vBMS19VlQCvTTd57LYQ17CkaPhy+HM58EkZnQ2Hs9wEmZVD+6LqjbUvP4NSoxiouGMkQ7w62EkIQFD9ib/X66ySYA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811434; c=relaxed/simple; bh=568YwfJwS19eXY00SNElYpfCguoOx4QLLp+DlESW9is=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bJ9eY4YG06avX+ZWEycyEnuZ7y8evubyymrwPRH2voOJzVM9rxHAyjKvLVPUTD7dRVyS7FWaA8mv9KNw0C7854AnAP6c7an6aIqwaHhO7pCjmslHYo6LhBh96/pDpok5CP2RfdTB+UR8MWgzswYwA+/biD0Ni08JxjCcslQIIgU= 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=HT0b2Ao3; arc=none smtp.client-ip=209.85.160.174 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="HT0b2Ao3" Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-44fe9aa3bfaso11433811cf.0 for ; Fri, 16 Aug 2024 05:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723811432; x=1724416232; 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=S9+z6gpUkXqdscNtaq7xrhbv4UjN8Jhn3DWImgjgzCA=; b=HT0b2Ao3kkXG2qbVTWRBT065VwQi+FYTkWzxGX+HzM5WVkryR0kUtnmjlVZiHZ59AI C6jDOjCZ+VcFml0EvzQWbcwG7L6vg0gA3BbJ7yV1+BZ3FWMz0cl+Bz/Bm3UGeqrbHC1I u4XAskt6hUlwjHHJGqFsLxsrrtBlQUx5DiW2A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723811432; x=1724416232; 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=S9+z6gpUkXqdscNtaq7xrhbv4UjN8Jhn3DWImgjgzCA=; b=SNSsj6BMwkZHkxE1tkfVKIg/lljlDlypRlNtmYScBpXrpdisBW4v+lkgh/3v55/3dx mQXxtljVnSlOEEAjx9nqEK0re/My2bVtbKuWW2K2XSkF9XmIj1lF4XE5jW90pXtq+j9B xIpzvxpyUGsjBrvgFA/3UZUhCnW7ZnI8zI7uZ6+jBgGZzMtYjqcDN9H+ViP/ahxPHQMq vcwov3jQXrJzK2KAKu4xef7OCLUSZzC9EHhNHm9KNH/pr+fm58qnYv97zl4sES71zit6 IPEovW3RLO7V7UUrrGPCmhVdXPwjDVL8Dogr46quJQc8o2xOw6x/F+GwWD66I5NyS+VS ZJ1g== X-Forwarded-Encrypted: i=1; AJvYcCUKLX7QnpBENxBWsFSNXys6VrGt9WWIYtYthw6qp1s+wdqjXB+mPO9Tsu2YN97ewjj4MrTk5Bq8aSav/0oPjDPcIcrETDmIanonIjRr X-Gm-Message-State: AOJu0YzHtXzA/uOaENp0t/9ZJ5BUlbpzBqJKwWljyuHePqKEo+LJ3WvO Fam3Q7eHH8tufawgdJ+xArjnopZmr6LLBBe2Ncpb9kaJ5rIaSUpyz0NMT3VE3g== X-Google-Smtp-Source: AGHT+IG1ysskNar2G6UxqNwrChFpnXW+yrLaTjloZETNU435Cn2/Ocy8z8Un46AKaDseQscvtgw8oQ== X-Received: by 2002:a05:622a:1f17:b0:44f:e753:c541 with SMTP id d75a77b69052e-453742fa038mr32797401cf.37.1723811431966; Fri, 16 Aug 2024 05:30:31 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 05:30:31 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 16 Aug 2024 12:30:29 +0000 Subject: [PATCH v3 1/3] media: drivers/media/dvb-core: Split dvb_frontend_open() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240816-coccinelle-followup-v3-1-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 Move the actual opening to its own function. Not intended code change. This is a preparation for the next patch. Signed-off-by: Ricardo Ribalda --- drivers/media/dvb-core/dvb_frontend.c | 148 ++++++++++++++++++------------= ---- 1 file changed, 80 insertions(+), 68 deletions(-) diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core= /dvb_frontend.c index 4f78f30b3646..26d1e8cd2108 100644 --- a/drivers/media/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb-core/dvb_frontend.c @@ -2760,77 +2760,25 @@ static __poll_t dvb_frontend_poll(struct file *file= , struct poll_table_struct *w return 0; } =20 -static int dvb_frontend_open(struct inode *inode, struct file *file) +static int __dvb_frontend_open(struct inode *inode, struct file *file) { struct dvb_device *dvbdev =3D file->private_data; struct dvb_frontend *fe =3D dvbdev->priv; struct dvb_frontend_private *fepriv =3D fe->frontend_priv; - struct dvb_adapter *adapter =3D fe->dvb; int ret; =20 - dev_dbg(fe->dvb->device, "%s:\n", __func__); - if (fe->exit =3D=3D DVB_FE_DEVICE_REMOVED) - return -ENODEV; - - if (adapter->mfe_shared =3D=3D 2) { - mutex_lock(&adapter->mfe_lock); - if ((file->f_flags & O_ACCMODE) !=3D O_RDONLY) { - if (adapter->mfe_dvbdev && - !adapter->mfe_dvbdev->writers) { - mutex_unlock(&adapter->mfe_lock); - return -EBUSY; - } - adapter->mfe_dvbdev =3D dvbdev; - } - } else if (adapter->mfe_shared) { - mutex_lock(&adapter->mfe_lock); - - if (!adapter->mfe_dvbdev) - adapter->mfe_dvbdev =3D dvbdev; - - else if (adapter->mfe_dvbdev !=3D dvbdev) { - struct dvb_device - *mfedev =3D adapter->mfe_dvbdev; - struct dvb_frontend - *mfe =3D mfedev->priv; - struct dvb_frontend_private - *mfepriv =3D mfe->frontend_priv; - int mferetry =3D (dvb_mfe_wait_time << 1); - - mutex_unlock(&adapter->mfe_lock); - while (mferetry-- && (mfedev->users !=3D -1 || - mfepriv->thread)) { - if (msleep_interruptible(500)) { - if (signal_pending(current)) - return -EINTR; - } - } - - mutex_lock(&adapter->mfe_lock); - if (adapter->mfe_dvbdev !=3D dvbdev) { - mfedev =3D adapter->mfe_dvbdev; - mfe =3D mfedev->priv; - mfepriv =3D mfe->frontend_priv; - if (mfedev->users !=3D -1 || - mfepriv->thread) { - mutex_unlock(&adapter->mfe_lock); - return -EBUSY; - } - adapter->mfe_dvbdev =3D dvbdev; - } - } - } - if (dvbdev->users =3D=3D -1 && fe->ops.ts_bus_ctrl) { if ((ret =3D fe->ops.ts_bus_ctrl(fe, 1)) < 0) - goto err0; - - /* If we took control of the bus, we need to force - reinitialization. This is because many ts_bus_ctrl() - functions strobe the RESET pin on the demod, and if the - frontend thread already exists then the dvb_init() routine - won't get called (which is what usually does initial - register configuration). */ + return ret; + + /* + * If we took control of the bus, we need to force + * reinitialization. This is because many ts_bus_ctrl() + * functions strobe the RESET pin on the demod, and if the + * frontend thread already exists then the dvb_init() routine + * won't get called (which is what usually does initial + * register configuration). + */ fepriv->reinitialise =3D 1; } =20 @@ -2871,8 +2819,6 @@ static int dvb_frontend_open(struct inode *inode, str= uct file *file) =20 dvb_frontend_get(fe); =20 - if (adapter->mfe_shared) - mutex_unlock(&adapter->mfe_lock); return ret; =20 err3: @@ -2891,9 +2837,75 @@ static int dvb_frontend_open(struct inode *inode, st= ruct file *file) err1: if (dvbdev->users =3D=3D -1 && fe->ops.ts_bus_ctrl) fe->ops.ts_bus_ctrl(fe, 0); -err0: - if (adapter->mfe_shared) - mutex_unlock(&adapter->mfe_lock); + + return ret; +} + +static int dvb_frontend_open(struct inode *inode, struct file *file) +{ + struct dvb_device *dvbdev =3D file->private_data; + struct dvb_frontend *fe =3D dvbdev->priv; + struct dvb_adapter *adapter =3D fe->dvb; + int ret; + + dev_dbg(fe->dvb->device, "%s:\n", __func__); + if (fe->exit =3D=3D DVB_FE_DEVICE_REMOVED) + return -ENODEV; + + if (!adapter->mfe_shared) + return __dvb_frontend_open(inode, file); + + if (adapter->mfe_shared =3D=3D 2) { + mutex_lock(&adapter->mfe_lock); + if ((file->f_flags & O_ACCMODE) !=3D O_RDONLY) { + if (adapter->mfe_dvbdev && + !adapter->mfe_dvbdev->writers) { + mutex_unlock(&adapter->mfe_lock); + return -EBUSY; + } + adapter->mfe_dvbdev =3D dvbdev; + } + } else { + mutex_lock(&adapter->mfe_lock); + + if (!adapter->mfe_dvbdev) { + adapter->mfe_dvbdev =3D dvbdev; + } else if (adapter->mfe_dvbdev !=3D dvbdev) { + struct dvb_device + *mfedev =3D adapter->mfe_dvbdev; + struct dvb_frontend + *mfe =3D mfedev->priv; + struct dvb_frontend_private + *mfepriv =3D mfe->frontend_priv; + int mferetry =3D (dvb_mfe_wait_time << 1); + + mutex_unlock(&adapter->mfe_lock); + while (mferetry-- && (mfedev->users !=3D -1 || + mfepriv->thread)) { + if (msleep_interruptible(500)) { + if (signal_pending(current)) + return -EINTR; + } + } + + mutex_lock(&adapter->mfe_lock); + if (adapter->mfe_dvbdev !=3D dvbdev) { + mfedev =3D adapter->mfe_dvbdev; + mfe =3D mfedev->priv; + mfepriv =3D mfe->frontend_priv; + if (mfedev->users !=3D -1 || + mfepriv->thread) { + mutex_unlock(&adapter->mfe_lock); + return -EBUSY; + } + adapter->mfe_dvbdev =3D dvbdev; + } + } + } + + ret =3D __dvb_frontend_open(inode, file); + mutex_unlock(&adapter->mfe_lock); + return ret; } =20 --=20 2.46.0.184.g6999bdac58-goog From nobody Mon Feb 9 10:42:33 2026 Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) (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 B9B932E859 for ; Fri, 16 Aug 2024 12:30:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811435; cv=none; b=ReMguMZ9b9YJjtSCLtYXQ9esAwwBhhmWnvGqFypqbHRDXnJlW0iwhu1MBJ/Km/+RJ+qeK5GVCpd/URY+36JJD3PO0j6/4KIERdiQKpvszEpmwifWV7bCDZOd0cLgFQxn1a42vvO7Bx5TRYhvhWRtb7hD1JDq7BLozUiISCellOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811435; c=relaxed/simple; bh=AZKrq35caHyUC1AOx2BHGxje6p+Qp28K1jvfGAPDILk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lhd32vJva8UOboHqA3tkO4J0HdlBxo5mYO/Ee/D/Qmr2bKPlBzG4PAsrM+o7r5VMxwOkxCu2E6EhH3EfWQBjZyrNvv5IPXdT/S0NqtG7U0tqr3LozHOEUfK2E/gyotgsgumJQ/lxYas+IlAr07M1wXtxoKyl4mm5RACjMlQBs44= 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=nxtqWHW+; arc=none smtp.client-ip=209.85.167.179 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="nxtqWHW+" Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3db18c4927bso1190145b6e.1 for ; Fri, 16 Aug 2024 05:30:33 -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=9/QU+rV1Nd5TU+U1vgju3PydQyZ7PV27wGq420iJA4U=; b=nxtqWHW+NdFExhTogcJpuiRR5ruNEwhEz37Ks31wkc/EUTuKY2FXbrDhTbtbesj9KF Sm3UZLFA4/FAMHEiP/fuB/bUTZUij9CQehcSlJHlEcUtoQloIokp6PYmrMERt7l6ouDK QXNwmbtoWry3B/jC7wzIc+czsYDQH6JMwBoRs= 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=9/QU+rV1Nd5TU+U1vgju3PydQyZ7PV27wGq420iJA4U=; b=fhVgwcF7xge1DVN000RLtHk2N00xPPyQVtjzAAFSKGKpPb2CFyqAeudPO0XsW6kt6m xBK32LKn5/MW5+H3PB3xx9xq8942Y1AxdgX+CD08UXh8wnI56vq7JbMtUFFDMSHPtNOt PuWNwDmDFmIPn/jGrEVY4oVK0UR6cfBf0QCpDGqkAvUJ5B8h3vxujfOW3G81uEL9xXUl c0CTCCLFufH6j3jHNz1No8XqckwK8CpD+vb6cnIFQJk/pP0sGkEEXaHYVJIMQyv22ldS pEJxMJyfPz4zPT/q/FQpMrB1ImezMdCFtbiZz+csnRNO2KtsFkFakoa9zo9DPq7gBOcL /ymw== X-Forwarded-Encrypted: i=1; AJvYcCV1SIWDZd9dE5KNUHdqRpkrcasJdsxX6I7G63eK5gOf1x8R4qETXTrVIjdlSO8eB6tFsR+oiWRff6MxVLMhHAfBoozu1y+O8tonRyuG X-Gm-Message-State: AOJu0YzRdAje6/wse6iw1mxNspZOmkfLaSh8mArJN4YCgP5TEh+lRWPU gZWUvedsTwAT+tcNdIMnz6SaVt54/Kr3ZDc632CT+KL6cE5RbaQ//sJj4pla3A== X-Google-Smtp-Source: AGHT+IHjyuDdk6080uZHYBYL0mtSfgS+GpjPjfdGO3VjFw+1uuHfaAIvPhfZJz4zvTAfrCYH0dFSAw== X-Received: by 2002:a05:6808:d50:b0:3db:37ff:42b2 with SMTP id 5614622812f47-3dd3ae3881amr2338824b6e.45.1723811432555; Fri, 16 Aug 2024 05:30:32 -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:30 +0000 Subject: [PATCH v3 2/3] media: drivers/media/dvb-core: Refactor dvb_frontend_open locking Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240816-coccinelle-followup-v3-2-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 Split out the wait function, and introduce some new toys: guard and lockdep. This fixes the following cocci warnings: drivers/media/dvb-core/dvb_frontend.c:2897:1-7: preceding lock on line 2776 drivers/media/dvb-core/dvb_frontend.c:2897:1-7: preceding lock on line 2786 drivers/media/dvb-core/dvb_frontend.c:2897:1-7: preceding lock on line 2809 Signed-off-by: Ricardo Ribalda --- drivers/media/dvb-core/dvb_frontend.c | 58 ++++++++++++++++++++++---------= ---- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core= /dvb_frontend.c index 26d1e8cd2108..16d21ec6ff35 100644 --- a/drivers/media/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb-core/dvb_frontend.c @@ -30,6 +30,7 @@ #include #include #include +#include #include =20 #include @@ -2841,6 +2842,34 @@ static int __dvb_frontend_open(struct inode *inode, = struct file *file) return ret; } =20 +static int wait_dvb_frontend(struct dvb_adapter *adapter, + struct dvb_device *mfedev) +{ + struct dvb_frontend *mfe =3D mfedev->priv; + struct dvb_frontend_private *mfepriv =3D mfe->frontend_priv; + int mferetry =3D (dvb_mfe_wait_time << 1); + int ret =3D 0; + + lockdep_assert_held(&adapter->mfe_lock); + + if (mfedev->users =3D=3D -1 && !mfepriv->thread) + return 0; + + mutex_unlock(&adapter->mfe_lock); + + while (mferetry-- && (mfedev->users !=3D -1 || mfepriv->thread)) { + if (msleep_interruptible(500)) + if (signal_pending(current)) { + ret =3D -EINTR; + break; + } + } + + mutex_lock(&adapter->mfe_lock); + + return ret; +} + static int dvb_frontend_open(struct inode *inode, struct file *file) { struct dvb_device *dvbdev =3D file->private_data; @@ -2855,19 +2884,16 @@ static int dvb_frontend_open(struct inode *inode, s= truct file *file) if (!adapter->mfe_shared) return __dvb_frontend_open(inode, file); =20 + guard(mutex)(&adapter->mfe_lock); + if (adapter->mfe_shared =3D=3D 2) { - mutex_lock(&adapter->mfe_lock); if ((file->f_flags & O_ACCMODE) !=3D O_RDONLY) { if (adapter->mfe_dvbdev && - !adapter->mfe_dvbdev->writers) { - mutex_unlock(&adapter->mfe_lock); + !adapter->mfe_dvbdev->writers) return -EBUSY; - } adapter->mfe_dvbdev =3D dvbdev; } } else { - mutex_lock(&adapter->mfe_lock); - if (!adapter->mfe_dvbdev) { adapter->mfe_dvbdev =3D dvbdev; } else if (adapter->mfe_dvbdev !=3D dvbdev) { @@ -2877,34 +2903,24 @@ static int dvb_frontend_open(struct inode *inode, s= truct file *file) *mfe =3D mfedev->priv; struct dvb_frontend_private *mfepriv =3D mfe->frontend_priv; - int mferetry =3D (dvb_mfe_wait_time << 1); - - mutex_unlock(&adapter->mfe_lock); - while (mferetry-- && (mfedev->users !=3D -1 || - mfepriv->thread)) { - if (msleep_interruptible(500)) { - if (signal_pending(current)) - return -EINTR; - } - } =20 - mutex_lock(&adapter->mfe_lock); + ret =3D wait_dvb_frontend(adapter, mfedev); + if (ret) + return ret; + if (adapter->mfe_dvbdev !=3D dvbdev) { mfedev =3D adapter->mfe_dvbdev; mfe =3D mfedev->priv; mfepriv =3D mfe->frontend_priv; if (mfedev->users !=3D -1 || - mfepriv->thread) { - mutex_unlock(&adapter->mfe_lock); + mfepriv->thread) return -EBUSY; - } adapter->mfe_dvbdev =3D dvbdev; } } } =20 ret =3D __dvb_frontend_open(inode, file); - mutex_unlock(&adapter->mfe_lock); =20 return ret; } --=20 2.46.0.184.g6999bdac58-goog From nobody Mon Feb 9 10:42:33 2026 Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (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 62DA51B3F05 for ; Fri, 16 Aug 2024 12:30:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811437; cv=none; b=qUTygoxJbdHrFryKtj248IpulW2Lds+nbAcaA4sY/tRiRq7DUbIcF22OcNiBpELO6k29lnRPg28xoYbmbZAWDY6mBIE/QAYo0pAZoH7eGxeT4U+Ew15YtSVj8dh0B1Vl+6c2JxDE9hFlqk2V+FHB1lhcRwmDmuIWjgfz58f1u+I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811437; c=relaxed/simple; bh=AN2zkbqD250EjGBEmwuzJlE8f9nO0nY/af0JFueOjQI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Tm3KN9HHd31p5DNrGxvFU0goubxXtaTlAfVlENa6O/e2zOC730kgLt5FH0tTbZ1ce+0GtOR2IoX/f5OwuEfBU9E+UWf7oED0S8aCjFR1U6oRPPveZRCZfkTMRb1vo4sTN/zQUk85Gt0gnczv+kiknonqpM9P+ynapMsvYcl0EVg= 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.175 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="dpF4LyFB" Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-44fded90c41so9413301cf.3 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=Zx8ImHMQ88IQeFihBBYT9e3NCdVi21TNj9nkyXl1/6A2FrsqPOm12l4zVQEVmez8mP HEeEhzxe2jLOY0h8+07zQ8uPB+CAsMVy946ZvFFuKwh9eoMfanRVEpBRvmS3TSsmBQRh eo0izLTLOaX4jHKVWyouZ7DmMDorg76rxbgkZoELmbEL9Vs7ZyqHX3KP0SO4dYgHCp81 NeiCLI44RIehQXi8xcbPrK6sV4h4AJdc6WwQ2uzQ+IS/V6fLsRYAhW/iiWxEfF6qHm0s 7LvPZCs2WD9bzdqY4WBM33LFJS00Wrwre7PCyQjwTDUu3psmXWE2XcJzEMMl0GIz0QoI BACA== X-Forwarded-Encrypted: i=1; AJvYcCVOwvQnRu+F2azvgHgWlX5YyZ/T00IyJ/Rqw0Aa2khzLLoclPfdsSoGoNf6YFd2LRf6RF5XoqhfzCWwNsei8qHPdxxtDld5rtMkS72L X-Gm-Message-State: AOJu0Yw/VsyLRAQf6irmUZvUhWmpMT1hKehaHNKWEFFmFFgUQAKtmyWL 4P/0c8SuBm/scLLFI2P4KWDZFEGKFD84mbByfQftWXxGF5K6bX/3vJfHxMAcWQ== 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 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, str= uct file *file) struct dvb_device *dvbdev =3D file->private_data; struct dvb_frontend *fe =3D dvbdev->priv; struct dvb_adapter *adapter =3D fe->dvb; - int ret; =20 dev_dbg(fe->dvb->device, "%s:\n", __func__); if (fe->exit =3D=3D DVB_FE_DEVICE_REMOVED) @@ -2893,36 +2892,32 @@ static int dvb_frontend_open(struct inode *inode, s= truct file *file) return -EBUSY; adapter->mfe_dvbdev =3D dvbdev; } - } else { - if (!adapter->mfe_dvbdev) { + return __dvb_frontend_open(inode, file); + } + + if (!adapter->mfe_dvbdev) { + adapter->mfe_dvbdev =3D dvbdev; + } else if (adapter->mfe_dvbdev !=3D dvbdev) { + struct dvb_device *mfedev =3D adapter->mfe_dvbdev; + struct dvb_frontend *mfe =3D mfedev->priv; + struct dvb_frontend_private *mfepriv =3D mfe->frontend_priv; + int ret; + + ret =3D wait_dvb_frontend(adapter, mfedev); + if (ret) + return ret; + + if (adapter->mfe_dvbdev !=3D dvbdev) { + mfedev =3D adapter->mfe_dvbdev; + mfe =3D mfedev->priv; + mfepriv =3D mfe->frontend_priv; + if (mfedev->users !=3D -1 || mfepriv->thread) + return -EBUSY; adapter->mfe_dvbdev =3D dvbdev; - } else if (adapter->mfe_dvbdev !=3D dvbdev) { - struct dvb_device - *mfedev =3D adapter->mfe_dvbdev; - struct dvb_frontend - *mfe =3D mfedev->priv; - struct dvb_frontend_private - *mfepriv =3D mfe->frontend_priv; - - ret =3D wait_dvb_frontend(adapter, mfedev); - if (ret) - return ret; - - if (adapter->mfe_dvbdev !=3D dvbdev) { - mfedev =3D adapter->mfe_dvbdev; - mfe =3D mfedev->priv; - mfepriv =3D mfe->frontend_priv; - if (mfedev->users !=3D -1 || - mfepriv->thread) - return -EBUSY; - adapter->mfe_dvbdev =3D dvbdev; - } } } =20 - ret =3D __dvb_frontend_open(inode, file); - - return ret; + return __dvb_frontend_open(inode, file); } =20 static int dvb_frontend_release(struct inode *inode, struct file *file) --=20 2.46.0.184.g6999bdac58-goog