From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BBB69434E42 for ; Mon, 7 Sep 2026 11:30:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788780610; cv=none; b=HYgmeqCo78P/uswkOMEeYg/fe1YA53Vmxt2GQ3bAry726Yxckilm+bQ3sJv0uoNb0EXP8ndl6lx3Hx3wFJVVEiKYGOfdSlJaPZ3499xbpvAS8oPwfmsj5um4susSF2V2wiMZzMheIzXRJeYY3fEPfyjpBBScx/youIIq2rWwnvI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788780610; c=relaxed/simple; bh=6Fq/sR+IDESeqR0aOqL1FHd/ql43bGVGqDRH+Nt+aM4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=du5waSxZIuIwu57bm5hDfiOJB2TP9Mmbo2jPiRL2feAwplny+eoc3+xgCHdEzzgsdVg6VfSKl8JLdQCQF7y58TMV4RJH25bNGDL2F6g4xSxF48+fv8wzHmlcEIoLkxY2v60DXkxohLvb0D+2+7paCdRqXmV4DMK4JbxMbyf+noY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=aQORUCCq; arc=none smtp.client-ip=192.198.163.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="aQORUCCq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1788780607; x=1820316607; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6Fq/sR+IDESeqR0aOqL1FHd/ql43bGVGqDRH+Nt+aM4=; b=aQORUCCqSYsh8QDlCZVcPn8orzgNtvoBklKkInsAkX6AtkdPcacExbg1 vq/eVkZmVQn9ZtQU+M3LhxE3R0vqVMC9oNnqx+vmRuw7/quYUDyjiWl1r bV3t9lYw9lJDeAmnw/tRdRFOOMHR3OEVF/yd0yBBOKk4vJeB2q+VF0Yy2 NGk/SmPdntJUNyK07po+jbwsCYQnLMrvJCN1YHkBEE5M3OkJFBMC/Rapp /Pj+0qgYQ8K7HevPpTcFMXZ/q+bXovjZ4MUIalergE3Tsx4IqI7J+ik6Y 598UuXQaC1WiOmpUxfV0GWbWfQy9EixGMHBQPAJwQJvfYvQtadYM5+qJc Q==; X-CSE-ConnectionGUID: 8FWb7r/+R0CEfMgRWTZvAg== X-CSE-MsgGUID: ekJhOvSNTnG+myecWmNDnw== X-IronPort-AV: E=McAfee;i="6800,10657,11898"; a="100538596" X-IronPort-AV: E=Sophos;i="6.25,267,1779174000"; d="scan'208";a="100538596" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2026 04:30:06 -0700 X-CSE-ConnectionGUID: AFfalcQmRfSJoqjPaQKW9Q== X-CSE-MsgGUID: sS4vJtsASOK0nQr8iP58Bg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,267,1779174000"; d="scan'208";a="300569074" Received: from abityuts-desk1.ger.corp.intel.com (HELO kekkonen.fi.intel.com) ([10.245.245.230]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2026 04:30:05 -0700 Received: from punajuuri.localdomain (unknown [192.168.240.130]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 99AE5121C60; Mon, 07 Sep 2026 14:30:05 +0300 (EEST) Received: from sailus by punajuuri.localdomain with local (Exim 4.98.2) (envelope-from ) id 1x3XY5-0000000ARn3-0RqK; Mon, 07 Sep 2026 14:30:05 +0300 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo From: Sakari Ailus To: linux-media@vger.kernel.org Cc: Antti Laakso , sarang.sapre@intel.com, daxing.li@intel.com, ong.hock.yu@intel.com Subject: [PATCH v4 04/45] media: ipu6: Remove duplicate warnings in cpd validation Date: Mon, 7 Sep 2026 14:29:23 +0300 Message-ID: <20260907113004.2489993-5-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260907113004.2489993-1-sakari.ailus@linux.intel.com> References: <20260907113004.2489993-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Antti Laakso Some of the error paths printed same or similar errors twice, once is enough. Signed-off-by: Antti Laakso Signed-off-by: Sakari Ailus --- drivers/media/pci/intel/ipu6/ipu6-cpd.c | 29 ++++++------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/drivers/media/pci/intel/ipu6/ipu6-cpd.c b/drivers/media/pci/intel/ipu6/ipu6-cpd.c index b7013f6524ec..966a16a300f8 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-cpd.c +++ b/drivers/media/pci/intel/ipu6/ipu6-cpd.c @@ -266,7 +266,6 @@ static int ipu6_cpd_validate_moduledata(struct ipu6_device *isp, u32 moduledata_size) { const struct ipu6_cpd_module_data_hdr *mod_hdr = moduledata; - int ret; /* Ensure moduledata hdr is within moduledata */ if (moduledata_size < sizeof(*mod_hdr) || @@ -276,15 +275,9 @@ static int ipu6_cpd_validate_moduledata(struct ipu6_device *isp, } dev_dbg(&isp->pdev->dev, "FW version: %x\n", mod_hdr->fw_pkg_date); - ret = ipu6_cpd_validate_cpd(isp, moduledata + mod_hdr->hdr_len, - moduledata_size - mod_hdr->hdr_len, - moduledata_size); - if (ret) { - dev_err(&isp->pdev->dev, "Invalid CPD in moduledata\n"); - return ret; - } - - return 0; + return ipu6_cpd_validate_cpd(isp, moduledata + mod_hdr->hdr_len, + moduledata_size - mod_hdr->hdr_len, + moduledata_size); } static int ipu6_cpd_validate_metadata(struct ipu6_device *isp, @@ -325,10 +318,8 @@ int ipu6_cpd_validate_cpd_file(struct ipu6_device *isp, const void *cpd_file, ret = ipu6_cpd_validate_cpd(isp, cpd_file, cpd_file_size, cpd_file_size); - if (ret) { - dev_err(&isp->pdev->dev, "Invalid CPD in file\n"); + if (ret) return ret; - } /* Check for CPD file marker */ if (hdr->hdr_mark != CPD_HDR_MARK) { @@ -346,17 +337,11 @@ int ipu6_cpd_validate_cpd_file(struct ipu6_device *isp, const void *cpd_file, /* Validate metadata */ ent = ipu6_cpd_get_metadata(cpd_file); ret = ipu6_cpd_validate_metadata(isp, cpd_file + ent->offset, ent->len); - if (ret) { - dev_err(&isp->pdev->dev, "Invalid CPD metadata\n"); + if (ret) return ret; - } /* Validate moduledata */ ent = ipu6_cpd_get_moduledata(cpd_file); - ret = ipu6_cpd_validate_moduledata(isp, cpd_file + ent->offset, - ent->len); - if (ret) - dev_err(&isp->pdev->dev, "Invalid CPD moduledata\n"); - - return ret; + return ipu6_cpd_validate_moduledata(isp, cpd_file + ent->offset, + ent->len); } -- 2.47.3