From nobody Sun Jun 14 02:36:05 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 797823A4F2D for ; Mon, 4 May 2026 10:37:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777891057; cv=none; b=eT13a9knAbYeKSUvmI3D6ImImgSxis2aHSk5LnvEN83M59+kIA+9kysKRempPDEK1pSEdjHHeqFj46EEKGdgHcO4SvBobf6tZCT+y62C/bPrH9nrmB6ZGAySLr57kGXvG9njTw0I9ZzkR0kBLNpt/tUECafOmfiHuKRdDxBUr+E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777891057; c=relaxed/simple; bh=9tAaz20Ae5udo+1KfEibhpKitw73uVxHmbWSDrohfFU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=P73q7OXXDQpHJ4OrjAJQ2qSLtGwl9DtTqHXv2blDDwsSWiXpu18HTzuSO5cz1JT1XyZgW8lkiYruakE9J2EzsihkYXPaLRZikyMOSEqx2k0U2TNNLM3vTUrO28MM33fYRvT6nTf8EPgCnMBQWsrnrgn68dU9k3qQx2dzt+UsAlo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WxUaVRnG; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WxUaVRnG" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2b9ec9443c2so9305265ad.1 for ; Mon, 04 May 2026 03:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777891056; x=1778495856; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zwBefue+sqPVaGbAyP7uY++EiQcB2m+LSHBlyeXzufA=; b=WxUaVRnGVtJ/nkSLoArfAH2PsBO9ziasYwEAWVU5ZDpPMoOqb/x6EmNTQfeSGCIJ3V c0xZ3/9BaNT85CgF42WCXJNsQmG435jxKHpbi3Bnc0svTUhHWUOGl2PAUbxyrBAN5sIe 1Zd0LNSuCXZR4sao8ppNfdaBIb5CRagdk/AL/U2GHZDDhhY4ClSZrmDiFpF5MNppacVD B+GnK2U2STP72HF4lRwfk9/Ednrf6VcCLMm4dMeLAcL0Dn4zCTyR6g6FMwhk2E90OKUl DIZeXGucnenklZ3R/nIEemXqoqgnM5EojXtOimGKbkVF6TSVCfafk+XPeufDhFLuSjzi cbXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777891056; x=1778495856; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zwBefue+sqPVaGbAyP7uY++EiQcB2m+LSHBlyeXzufA=; b=W5RSw5/M/X6a+/RfFUtulxJ92fsmf+AiLWR1YJJ7P408K0ta0n9do9JcTAFfiiZJGq 1lWDSkZckvUb/I1LGuG5vRCAPBI3E3zV3vO8Uk5Xc8pkspvXd5gt5YiFbFPg1RCKOLb7 n7728ccmEy5/WI6FcniQ9PHD/+dXOorBucLrgqBkjmXW1HZ8A1Hw3ZCMJysTXALsGqSu XASWcoAPvD2zO3w1BCwK5EMZSJcdVPoRfMs0xV8PWiFJ8+WnfFvD+U7GpMe+ZMr3VLI4 vwZfpIb0d+W+juVyl9sGMqkeg93jfMihr/ySjnS5M8cWVxR3v3/uXoX/7o3EaG9IkMy8 Y+9g== X-Forwarded-Encrypted: i=1; AFNElJ8T9+RdXuciV86f+Qx9h4EfGmnjuXELfZIkdh3hOjYEoQ8BBPOBoUURknvTaA74q/q/XiAONtP2SSlyqWk=@vger.kernel.org X-Gm-Message-State: AOJu0YzmmB0T+7eIjEtfPv6fe/yxeORu4kkJOei3EZtI0II0YMPXjq2N GT0rHeKIBvMiVxsvRRRaU+tNjMAyU/Mj4LoH7R3t2YAzQGlVEoFM5qBZ X-Gm-Gg: AeBDiesIPfjpclWF+E46/I1LfhiUQ9p3c/xiJiiK8vqRpujof6dQihnu0yOeU4zYBfU kH6RCJ16u359kHzEPepnTP9/SOQNZO1cPc26HOj0akr4nTjJiViZ97B7j6O4HJdSZG7tIjuIbrF wQbfEvXnz9VAeQpSi130a5Ai/drX+cxhB0hw6TSQLEIidNYvajvGlgExDj7kdzVpNEg2rTv2YlZ +WidB2teB4yswQBimPriDfEMXRAdl7zx1TNhSThIFyoo4yGDCsU20y2QrKCA1/s2RrHS5vb+mbd cf0UnlkyLcYTegCGcsdZpRIuVUknV5AdSf5TtOKLSNO+xHwO5hOChlcwVGjIMQutelUY/WLKa+J D3ddF3sJzJBKJaO9trIji1JWw0d78fJxGqHZLjjGmFzoVfEZkkZ/P7kYCgJbnuRYCm15jaaaBeF M9qCf5jsrm9m8G3HzQDmvXMK9lZnmJRleMqXkijuXmG30hpliaIQcuG5C8bPeWi5njp4pZYDTFn 8B0Ino403lqUm8d0JouNJmybdr+Yjk1tbVp5E3UIsz0 X-Received: by 2002:a17:903:120f:b0:2b2:4bbc:14b0 with SMTP id d9443c01a7336-2b9a44e3639mr144821845ad.20.1777891055673; Mon, 04 May 2026 03:37:35 -0700 (PDT) Received: from shyam-VMware-Virtual-Platform.localdomain ([223.181.112.102]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ba41784313sm13194525ad.40.2026.05.04.03.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 03:37:35 -0700 (PDT) From: Shyam Sunder Reddy Padira To: andy@kernel.org, hansg@kernel.org, mchehab@kernel.org, gregkh@linuxfoundation.org Cc: sakari.ailus@linux.intel.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, Shyam Sunder Reddy Padira Subject: [PATCH v2] staging: media: atomisp: drop unnecessary else block after return/break Date: Mon, 4 May 2026 16:06:56 +0530 Message-ID: <20260504103656.32945-1-shyamsunderreddypadira@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove redundant else blocks following return or break statements. As control flow exits in these cases, the else branch is unnecessary. Dropping it improves code readability. No functional change. Signed-off-by: Shyam Sunder Reddy Padira Reviewed-by: Andy Shevchenko --- Changes in v2: - Fixed grammar and added missing spaces after punctuation. - Consolidated dev_err() call to occupy only two lines. .../staging/media/atomisp/pci/atomisp_fops.c | 18 +++++------- .../staging/media/atomisp/pci/atomisp_v4l2.c | 29 +++++++++---------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/sta= ging/media/atomisp/pci/atomisp_fops.c index c7aef066f209..1aee082d34bf 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_fops.c +++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c @@ -125,10 +125,8 @@ static int atomisp_q_one_metadata_buffer(struct atomis= p_sub_device *asd, stream_id, css_pipe_id)) { list_add(&metadata_buf->list, metadata_list); return -EINVAL; - } else { - list_add_tail(&metadata_buf->list, - &asd->metadata_in_css[md_type]); } + list_add_tail(&metadata_buf->list, &asd->metadata_in_css[md_type]); asd->metadata_bufs_in_css[stream_id][css_pipe_id]++; =20 return 0; @@ -165,11 +163,10 @@ static int atomisp_q_one_s3a_buffer(struct atomisp_su= b_device *asd, /* got from head, so return back to the head */ list_add(&s3a_buf->list, s3a_list); return -EINVAL; - } else { - list_add_tail(&s3a_buf->list, &asd->s3a_stats_in_css); - if (s3a_list =3D=3D &asd->s3a_stats_ready) - dev_dbg(asd->isp->dev, "drop one s3a stat with exp_id %d\n", exp_id); } + list_add_tail(&s3a_buf->list, &asd->s3a_stats_in_css); + if (s3a_list =3D=3D &asd->s3a_stats_ready) + dev_dbg(asd->isp->dev, "drop one s3a stat with exp_id %d\n", exp_id); =20 asd->s3a_bufs_in_css[css_pipe_id]++; return 0; @@ -206,11 +203,10 @@ static int atomisp_q_one_dis_buffer(struct atomisp_su= b_device *asd, list_add_tail(&dis_buf->list, &asd->dis_stats); spin_unlock_irqrestore(&asd->dis_stats_lock, irqflags); return -EINVAL; - } else { - spin_lock_irqsave(&asd->dis_stats_lock, irqflags); - list_add_tail(&dis_buf->list, &asd->dis_stats_in_css); - spin_unlock_irqrestore(&asd->dis_stats_lock, irqflags); } + spin_lock_irqsave(&asd->dis_stats_lock, irqflags); + list_add_tail(&dis_buf->list, &asd->dis_stats_in_css); + spin_unlock_irqrestore(&asd->dis_stats_lock, irqflags); =20 asd->dis_bufs_in_css++; =20 diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/sta= ging/media/atomisp/pci/atomisp_v4l2.c index 900a67552d6a..32b07834d66d 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c @@ -467,22 +467,21 @@ static int atomisp_mrfld_pre_power_down(struct atomis= p_device *isp) __func__, irq); spin_unlock_irqrestore(&isp->lock, flags); return -EAGAIN; - } else { - pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq); - irq &=3D BIT(INTR_IIR); - pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq); - - pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq); - if (!(irq & BIT(INTR_IIR))) { - atomisp_css2_hw_store_32(MRFLD_INTR_ENABLE_REG, 0x0); - goto done; - } - dev_err(isp->dev, - "%s: error in iunit interrupt. status reg=3D0x%x\n", - __func__, irq); - spin_unlock_irqrestore(&isp->lock, flags); - return -EAGAIN; } + pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq); + irq &=3D BIT(INTR_IIR); + pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq); + + pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq); + if (!(irq & BIT(INTR_IIR))) { + atomisp_css2_hw_store_32(MRFLD_INTR_ENABLE_REG, 0x0); + goto done; + } + dev_err(isp->dev, "%s: error in iunit interrupt. status reg=3D0x%x\n", + __func__, irq); + spin_unlock_irqrestore(&isp->lock, flags); + return -EAGAIN; + done: /* * MRFLD WORKAROUND: --=20 2.43.0