From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (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 BC1393BCD25 for ; Thu, 23 Jul 2026 18:52:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832767; cv=none; b=QtMhKuRdb8QUJgvPKL0mbqn+C+DGqb5ViiRXRVh/8KpbFdCAoSNKKx6L+RdJiJRO+j23Gjf42hCX9znuX0pLJpZ5RdfHS+Dz/Qpll3tLyaz+2tuCxghDs2ndNZBxwQalcxHgwdoViBkA9OmUef+foqbXYXInf8jBL9U+brY6jlU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832767; c=relaxed/simple; bh=2bkdw8OxJrwnYUGhU/fhin1Aq0ZRsS8rd/JhENskV60=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FLhXtyfmCnHGoNEswiNQHd7B0xPGfwFNFJVg/FWKTL3UYqIA3EEIPqhzOnj+DD+Dnn09e6sexkeQ+f+GTUY+bq24hYpN4Hy+Law2uniVdcbaaT+PjDCrNdIyeEyck7chutum2Agw3epDmiJ10C4Fpb/igtF0ITFlpwQ6Qv3JduI= 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=l++qRngV; arc=none smtp.client-ip=209.85.208.180 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="l++qRngV" Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-39c95395230so9324431fa.2 for ; Thu, 23 Jul 2026 11:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784832757; x=1785437557; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=75cngzgMY/OVAP7GKlxdzDklRXPgWBQ/BrWuJHHZzts=; b=l++qRngVhplsAUNXdPZ+l5DinSqVDTlBVbJ4pTS6rIGwIPZ4ZJWsJLE9in7r/98/Cb GZwSASjKPok9qmX6jg1htAHImvJcPKRn/90t31RcbY4i0BmX57UuAFxiIyJixPWQ78hP NdzZWlgbhwHmeuPu1u5q0UveDL0WwMALf6mMpZG28TsIESDF9XV8XEYq6G2f6jUKxWoI 6ZSQBZTHWUVHEUaQfFCZcn7B/jNWFC/8M8S4w13NiFuRNotf+eXrHJudG//Mo++Wwik2 myDvki8vmWqq7G5TVPUeAlnlgO8dOpyTwk2SpbQiQM0m+Nwe4XHyoXxSo/SIpMZhlB/L u0ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784832757; x=1785437557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=75cngzgMY/OVAP7GKlxdzDklRXPgWBQ/BrWuJHHZzts=; b=s2sw7601Q93hA6XV+fMgeFkDRxEFhLJ+MhnpIzIGElEFNLleDJNP15FPTp2c26n7BU oQphBQT9J+5bl6yIIhJcLMx+Al49aLVqkzDCzUEHUu5IRANKfuqfTB3zk4NmwUS0ttN1 WLpLJaC6NMS0iM1RYWcHq/xRx0cvrdJMeqVCnPjHU8q0BKJzYjVztcVxfq0nmZcOUBAn CdMYEbyQfdrYB6oLlKnA2IaNHKwYBaigax8lYjLaTLh+IaAFZX73Mc5+RSbz9+Mw49gw yabgOzrfVaQEVKYxOYTddTqO3+GcKSnVUGh7iZPwzdOghKmCbiXsvjNr8qP0bgRObfxW ADGA== X-Forwarded-Encrypted: i=1; AHgh+RqYlhmtPyAV2BfzkATfNGlpOsaG3qT3IqYncgCPp8N32CfwaggJdFPmCkkZDRhN0drQXRemq5JTjkc9p+w=@vger.kernel.org X-Gm-Message-State: AOJu0Yzaho9Ffkpdji+2kKk2b4yTsIWprgyygXObu8rb9JX/lLHbBOrm FqWv+QmaAlg5BqcHB6eQcryWJGH0cmZ3ZB2NSDao+duakxob3QsuFT7E X-Gm-Gg: AR+sD122+QKw7sgr2Rc75BOUZf7AvRCx+n76OhNQFVjuJ7xJhOTltRrlqVliTZbgSe6 xOFdIozm2tsQ62/5Nm9JSH+F3c1o4cMAP5Ap9SDi1PaZwXkNTOSGMeP+hzjONHTAo/c41S0r8i+ K6QmwtJsQg1YEvYf94S7NQUtnTE/8CKW7JQMv9ZWK4G+4EHaFQVBCLEkxfd+pb6Op4T9vHkFYcZ /FLQL9et8ivEeuxXZZIUnrj+keBfau3UCsBdaXdvzt+kvb7w3PDyy/4UBHuYBC1Ws37g6tdQZSn D805ic4nEeD5sc/BkyKV36xX6rpfneErTyn0IvHRB1r9pUDkMRpksR9k1DJQGNjwMr9/mC349Kx 4SKMeVfXXVuzo06KMw9YwdioyuwYnNiU9voXuhCBtQDrzeKBgcGo0i3Sl3lslWKVGJLIdgr5QuN 4= X-Received: by 2002:a2e:a88a:0:b0:39e:b257:e878 with SMTP id 38308e7fff4ca-39f07bdfdafmr9749291fa.8.1784832756862; Thu, 23 Jul 2026 11:52:36 -0700 (PDT) Received: from archlinux ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-39ef68b68ebsm11601731fa.10.2026.07.23.11.52.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 11:52:36 -0700 (PDT) From: Nikolay Kulikov To: Greg Kroah-Hartman , Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko Cc: linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nikolay Kulikov Subject: [PATCH v2 4/4] staging: media: atomisp: remove include/hmm/hmm_common.h file Date: Thu, 23 Jul 2026 21:51:21 +0300 Message-ID: <20260723185217.317981-5-nikolayof23@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260723185217.317981-1-nikolayof23@gmail.com> References: <20260723185217.317981-1-nikolayof23@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace the last used macro with a conditional expression and remove this header file, as it no longer contains any code that is being used. Signed-off-by: Nikolay Kulikov --- .../staging/media/atomisp/include/hmm/hmm.h | 1 - .../media/atomisp/include/hmm/hmm_bo.h | 1 - .../media/atomisp/include/hmm/hmm_common.h | 36 ------------------- .../staging/media/atomisp/pci/hmm/hmm_bo.c | 9 +++-- 4 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 drivers/staging/media/atomisp/include/hmm/hmm_common.h diff --git a/drivers/staging/media/atomisp/include/hmm/hmm.h b/drivers/staging/media/atomisp/include/hmm/hmm.h index 6bda02b9ff85..be92a9c9046f 100644 --- a/drivers/staging/media/atomisp/include/hmm/hmm.h +++ b/drivers/staging/media/atomisp/include/hmm/hmm.h @@ -15,7 +15,6 @@ #include #include -#include "hmm_common.h" #include "hmm/hmm_bo.h" #include "ia_css_types.h" diff --git a/drivers/staging/media/atomisp/include/hmm/hmm_bo.h b/drivers/staging/media/atomisp/include/hmm/hmm_bo.h index 69cf490bd88c..2a19e3b2c1f9 100644 --- a/drivers/staging/media/atomisp/include/hmm/hmm_bo.h +++ b/drivers/staging/media/atomisp/include/hmm/hmm_bo.h @@ -16,7 +16,6 @@ #include #include #include "mmu/isp_mmu.h" -#include "hmm/hmm_common.h" #include "ia_css_types.h" #define rbtree_node_to_hmm_bo(root_node) \ diff --git a/drivers/staging/media/atomisp/include/hmm/hmm_common.h b/drivers/staging/media/atomisp/include/hmm/hmm_common.h deleted file mode 100644 index c406fe8b1345..000000000000 --- a/drivers/staging/media/atomisp/include/hmm/hmm_common.h +++ /dev/null @@ -1,36 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Support for Medifield PNW Camera Imaging ISP subsystem. - * - * Copyright (c) 2010 Intel Corporation. All Rights Reserved. - * - * Copyright (c) 2010 Silicon Hive www.siliconhive.com. - */ - -#ifndef __HMM_BO_COMMON_H__ -#define __HMM_BO_COMMON_H__ - -#define HMM_BO_NAME "HMM" - -/* - * some common use micros - */ -#define var_equal_return(var1, var2, exp, fmt, arg ...) \ - do { \ - if ((var1) == (var2)) { \ - dev_err(atomisp_dev, \ - fmt, ## arg); \ - return exp;\ - } \ - } while (0) - -#define var_equal_return_void(var1, var2, fmt, arg ...) \ - do { \ - if ((var1) == (var2)) { \ - dev_err(atomisp_dev, \ - fmt, ## arg); \ - return;\ - } \ - } while (0) - -#endif diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c index e92538ab025e..dd1897cdf662 100644 --- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c @@ -30,7 +30,6 @@ #include #include "atomisp_internal.h" -#include "hmm/hmm_common.h" #include "hmm/hmm_bo.h" static int __bo_init(struct hmm_bo_device *bdev, struct hmm_buffer_object *bo, @@ -389,6 +388,7 @@ struct hmm_buffer_object *hmm_bo_alloc(struct hmm_bo_device *bdev, { struct hmm_buffer_object *bo, *new_bo; struct rb_root *root; + int ret; if (!bdev) { dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); @@ -396,8 +396,11 @@ struct hmm_buffer_object *hmm_bo_alloc(struct hmm_bo_device *bdev, } root = &bdev->free_rbtree; - var_equal_return(hmm_bo_device_inited(bdev), 0, NULL, - "hmm_bo_device not inited yet.\n"); + ret = hmm_bo_device_inited(bdev); + if (!ret) { + dev_err(atomisp_dev, "hmm_bo_device not inited yet.\n"); + return NULL; + } if (pgnr == 0) { dev_err(atomisp_dev, "0 size buffer is not allowed.\n"); -- 2.55.0