From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) (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 A8E7925A359 for ; Sat, 4 Jul 2026 19:09:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.66 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783192146; cv=none; b=J1CaSoXXKLtrb+ZcJIQ4ddab6U01cxvOBokLhGHxFcTdaU1E30/KhS8wCVDCT9Hzi+khVktFWGro3x7Ow9iRQVUca1BHi2sstLM53lqIB1vIZrTDTERVC2OB3hLLXbwX00V0EAWUSQk9lWkLktpo6V8mLRhnnoMJKY5/FMj8iRA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783192146; c=relaxed/simple; bh=A06Yy2EYDfHEtoWJM6CBiEhn33Kee9RzFJyasyjw0wY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=OJJLcm7HDCEJ0IVDoQkDWHUMICDB/QRodazFLAEqrLgN2G+fVqDrvscuIn5tXhKPgT+njMp4dJG4G7N7hkw/bWzyIDXmrN0CCFrXRE/5jdWQg4CTN7EDA0LGo0IyTtfdi7+0auxewyYVgoxVhQsPKKlJlZf70Mgv8vxVwEJSLXI= 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=ctw+Ms5S; arc=none smtp.client-ip=209.85.128.66 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="ctw+Ms5S" Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-493b27c7451so24236765e9.0 for ; Sat, 04 Jul 2026 12:09:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783192143; x=1783796943; 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=VRh4MeESNZjA8ZY8SVwMDtx07Fu+whGeI3UAREbb+eo=; b=ctw+Ms5SuErnRfBoCHrSqcBnW0gv7PR2KkYsb2KVQMm0FBv+cTY0oFfka5Yjv3Vw7e 2dcD547IWmvBTf+K2omr+Zd5KGqzA26tLEjQ4h3ZI3ZdYOQt7q32cYaY07UO5gQk764w JU8yMVfidY6mk1BWRHWNMny9JwhSn1y8g+S2sjT1P1w4qTfqS75wSK972L/hHQcRvIKY NuEldezrCWEgxn5cls5sPB6acpkYbcS8xbPiryZrEZXqdzwgpiGj3rVo+AaPJjpHs4bI v+AZEVaL3ADD7evPmERiLNxpCwHfOdtcpwHnixBOdpoRjl/bH+gvqOMLI33wtWsH0ZKZ gJow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783192143; x=1783796943; 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=VRh4MeESNZjA8ZY8SVwMDtx07Fu+whGeI3UAREbb+eo=; b=EkpJto5i7jg/rTGqAH6Wlulayq2OMwXJmwo0vPbs9nCGgA7ZSy2C4vN2HB89ZfHKxU zMRhr4P0yf1kwV7IEVTATDgtopyDzy/1NJSxA8Z9rqVg+BUmqOH+fO3UJrfasdKZLZrm Ug+zknJ/WHu7EtptaB9/qTP4uZuAccG+6S2hlimnc9zfv0JuIJuQqkPVkW5yCigIrsFI cGHwWYqpQNd15l14QWBUS08gKcFWF1BefHSPL4WRl6ZTMlgw+8JUCzZj208kqHoTOED+ ZKJufX2g5wXo9xwHMwKd+34B8urBcvbokSr7UHpTWhAI5nhLXxQ2uWvohnvfY9ILWAzR rwOQ== X-Forwarded-Encrypted: i=1; AFNElJ/qQx5931AE3a7QOCfNzRLmGP/pOzsfQzaUZcc86LClFDZqyI0Qp4jUkboCtrdAf4hErQvmklNxlST81TA=@vger.kernel.org X-Gm-Message-State: AOJu0YxRY8iXakiJf6/iRUWjF+TE2k0blSWQDt/C9ZPCD3HbQe0a2XBG /8dtheZyJP7zDiLAt4Xyvwn3MaDR2C0G7d3DgL+tWSlXHmZKU9WjppYP X-Gm-Gg: AfdE7cnJ09/Y5nb9aSh48H0tuLnBtFDm1tr8LC4cvvIj/WNPSL0dC30MUMtNqkTUzbh OjyHFzSGThHomZLbwpdBEAZk0xoiyR48MMH6/bJ32/ppPyKmX5xbOKAOoouJ6ffyS0gtkj1DbuV ig45k326tS2OC6OlqwQ8qpspmO4mnWHiQOSpv3x13f1PHyUHq2lM9Bg+1xWHXzBypMop1T4jrlg 1PgKwwaDfkEFyqCyiHewwsi36Y3POHMgtdqXAlOw4T9IOJm1c9WNRYNd1Ey3Hy0eepdF1pBu5Ee ohR87qFKQ7qKXhSoMvw2Gq/fTUbR7fH3dlsMAYqivm/recJMbSD9gR271KZQu0hx56lS3+H6Yp/ Sc4OIkzgKhMWQnH4sUWQOTdfKVbNaDPdRYFxcxwi5y0hTK27b3AcwgWM0hztrxRBtSdRKthEt9i nlNMGFCD07JN/Fs/pYboHS X-Received: by 2002:a05:600c:3b28:b0:493:b698:9247 with SMTP id 5b1f17b1804b1-493d1593adbmr39535475e9.14.1783192142995; Sat, 04 Jul 2026 12:09:02 -0700 (PDT) Received: from myhost.localdomain ([89.253.41.227]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493c63bfba1sm261718885e9.15.2026.07.04.12.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2026 12:09:02 -0700 (PDT) From: Ruziev Miraly To: hansg@kernel.org, mchehab@kernel.org, gregkh@linuxfoundation.org Cc: andy@kernel.org, sakari.ailus@linux.intel.com, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ruziev Miraly Subject: [PATCH v2] media: atomisp: flatten pre_power_down logic and clean up staging code Date: Sun, 5 Jul 2026 00:08:54 +0500 Message-ID: <20260704190854.114172-1-miraly.dev@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Refactor atomisp_mrfld_pre_power_down() by removing the redundant nested 'else' block, making the function structure linear and easier to follow. Keep both error logging branches intact to ensure consistency in hardware failure reporting. In addition, fix minor checkpatch.pl style warnings in the same file regarding code alignment and hanging open parentheses. Signed-off-by: Ruziev Miraly --- Changes in v2: - Fixed an issue from v1 where dev_err() was accidentally dropped. - Kept both error logging branches for consistency with original behavior. - Flattened the code structure by removing the nested 'else' block. - Fixed checkpatch.pl style issues (hanging parenthesis and alignment). --- .../staging/media/atomisp/pci/atomisp_v4l2.c | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c index 2d72467eb..78cf09753 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c @@ -439,14 +439,14 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp) struct pci_dev *pdev = to_pci_dev(isp->dev); u32 irq; unsigned long flags; + int ret = 0; spin_lock_irqsave(&isp->lock, flags); /* * MRFLD HAS requirement: cannot power off i-unit if * ISP has IRQ not serviced. - * So, here we need to check if there is any pending - * IRQ, if so, waiting for it to be served + * Wait for pending IRQs to be served. */ pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq); irq &= BIT(INTR_IIR); @@ -454,29 +454,36 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp) pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq); if (!(irq & BIT(INTR_IIR))) - goto done; + goto power_down; + /* Clear and check interrupt status registers */ atomisp_css2_hw_store_32(MRFLD_INTR_CLEAR_REG, 0xFFFFFFFF); atomisp_load_uint32(MRFLD_INTR_STATUS_REG, &irq); + if (irq != 0) { dev_err(isp->dev, "%s: fail to clear isp interrupt status reg=0x%x\n", __func__, irq); - spin_unlock_irqrestore(&isp->lock, flags); - return -EAGAIN; + ret = -EAGAIN; + goto unlock_exit; } + pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq); irq &= 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; + if (irq & BIT(INTR_IIR)) { + dev_err(isp->dev, + "%s: error in iunit interrupt. status reg=0x%x\n", + __func__, irq); + ret = -EAGAIN; + goto unlock_exit; } - spin_unlock_irqrestore(&isp->lock, flags); - return -EAGAIN; -done: + + atomisp_css2_hw_store_32(MRFLD_INTR_ENABLE_REG, 0x0); + +power_down: /* * MRFLD WORKAROUND: * before powering off IUNIT, clear the pending interrupts @@ -490,9 +497,10 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp) atomisp_msi_irq_uninit(isp); atomisp_freq_scaling(isp, ATOMISP_DFS_MODE_LOW, true); - spin_unlock_irqrestore(&isp->lock, flags); - return 0; +unlock_exit: + spin_unlock_irqrestore(&isp->lock, flags); + return ret; } /* @@ -839,7 +847,7 @@ static int atomisp_register_entities(struct atomisp_device *isp) /* Register internal entities */ for (i = 0; i < ATOMISP_CAMERA_NR_PORTS; i++) { ret = atomisp_mipi_csi2_register_entities(&isp->csi2_port[i], - &isp->v4l2_dev); + &isp->v4l2_dev); if (ret == 0) continue; @@ -847,8 +855,7 @@ static int atomisp_register_entities(struct atomisp_device *isp) dev_err(isp->dev, "failed to register the CSI port: %d\n", i); /* deregister all registered CSI ports */ while (i--) - atomisp_mipi_csi2_unregister_entities( - &isp->csi2_port[i]); + atomisp_mipi_csi2_unregister_entities(&isp->csi2_port[i]); goto csi_and_subdev_probe_failed; } -- 2.54.0