From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 2825D3B42D7 for ; Wed, 12 Aug 2026 20:55:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786568133; cv=none; b=h5nbUx8asIxBd7DsrFnhaCPuVhybYwLApAj0S9H0y0WMZjGZ+R/xOJul1qblR00x/Sfd2t8vs0hIzaZ9WHSw0hzX/laZNxkjHEsg5gBX+MKLBIdEWlunC5lPm3SgE/3yYajI0Wn86DYQwW3pcfum/tk1penvMA354Z8YyBhUQuw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786568133; c=relaxed/simple; bh=N7YavMIxn189yOCIt8BdETPEDeHw4RDxuO0Znx6qmho=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LJlHw7xOR6eN2C/FedOgFcnyH074KzNZmEayG8/3Ayo+tkf5NnEVDMAj1oy3w9QzmHOFeT24MN42cfJeqijwrWRWFjJjEABibE825D9RtI5BbFcm8jJBOQ1BjJo6Gsd7N1ApwY2nw6a2YJIf2weSqnQQSx/jiX/wV9nAy7Bs+ZI= 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=FSAS2MdD; arc=none smtp.client-ip=209.85.167.46 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="FSAS2MdD" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5aeba09900bso1063740e87.2 for ; Wed, 12 Aug 2026 13:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786568126; x=1787172926; darn=lists.linux.dev; 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=id+z5c34tokzsRgaGzBKaJJ/gVoWUF0wZyeg82CjYJg=; b=FSAS2MdDx77DU8GKmve41zdv4va3nWwNhvC7VAePJo6JfhSmvWDxFNuwcH5cnGHqKH phlrK0igzMEUAPrJoPTXNhhekZlgnTtu77TIyDh/fgV59y6/7ETduXuy5VtmcrwPzoln iAmFri3z8IdiMWPxTk/uk8kV6maAK4KI+TDUdPVn4xoDfWpdahfuxPCrtKnfrORpudpm W5PDb1uBxVOQ90V47YH1HjfXBgVlblBpey+dny5iKSYdcyZxArRQz/ty5tZdP8/L/uqg iKg275kvr+0+N55mzqL7swN3OwEnQXFtMySdnxE+/K8sl/NyEB2BPk4mXyh9ZGfN35iq gbug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786568126; x=1787172926; 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=id+z5c34tokzsRgaGzBKaJJ/gVoWUF0wZyeg82CjYJg=; b=TURkRyTDbhkB/+MGywbmY19RcMKe6jeGqeu+jS6x9Q/D0LOyt4VJKg0OrIF95zO7n/ loACCUeD8OJBhcVzsMCSszy1+J3eWkCBgeVho4+CdsdCbzAWUvKs2XrJxpjl3DKXrxHH 8od0qlMQEF4u7MJEbk7gyijaK5bunOOJRICF6BcbgzzkteRM9tlLtX8s1JRL8a9cQuVj 9IQx5X6o4xcep/iP025HTWJ0cKlJPCI+KgzSM5wPLM7oD54m7qrFWqutJ7Rb8BMbiuj7 ux7iqPvhpy/bE6pYBwGhXHWXRU/GuN/KkSziwTjTxsncClVo//YaI6zqcnzJAO1qxGby b+Rg== X-Forwarded-Encrypted: i=1; AHgh+Rq1wJTFUWdpaTHixRSQXC6oSm2MZitK8YDFhILTWBeTJNI/4j4sR66mwF5oGSZXeBZSeKv7ThenwocUvbEw@lists.linux.dev X-Gm-Message-State: AOJu0YzinQpY03JS8eXaoBaandBihEWf+0uRA17zpGtg56AYgK+6G0LT H8v8sqeZ7xTKbcm05PezTzmk1DB4+XV3D0t1lP7wEcwTa2GiB2i5Gafw X-Gm-Gg: AR+sD114Xr+FtTj6gHrm1LXEO5Twmm13G6H+qOKJk4c+hyVMtGg/aJxd/RT/Qzy33WS zIFEKxI0tDXNjFiTKomTWN82hf/VCkale6aWEPF2xxTx3mJv7gJUUZJvfVwb5qgEaG3uxWJRf/P BjiG7hS3MMix7B3oiZCPOVBllPp3/auBSMIVS3wN7zidG+ov+n4gIDtsIZj9NCxInIN0gyrapMS n/OmLTE4II5QOktwcMZ9nRClqcDqzmjCYoUL+BKES7QSDf4ePt7QBRYDBWLyq/A1hIKSMzfRs1o v78tyNinAp1KOjqEJDs7FOfxZtS4pLWGhrkpuzK4XjOdov5MiyxGPDXbcIl6vixHEMT3QWxg5eP KQe0DhOCc7Epf1GyzZpAMoA3hfBE6uFMECQi7pcRJMpJ1TaHpE0/rAfSpo4a21m4XPfpk7ofZ/a 3DFVxuEztU2m3OIGzFTv3+KBjHS15moZ1LMgmtuwFd8YM6ERAH4VWTf5rJTME= X-Received: by 2002:a05:6512:805b:b0:5ae:b86b:71f0 with SMTP id 2adb3069b0e04-5b453f830e2mr30498e87.37.1786568125682; Wed, 12 Aug 2026 13:55:25 -0700 (PDT) Received: from archlinux ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b4539e9605sm60999e87.22.2026.08.12.13.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 13:55:25 -0700 (PDT) From: Nikolay Kulikov To: Greg Kroah-Hartman , Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko , Andy Shevchenko Cc: linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nikolay Kulikov Subject: [PATCH v3 3/5] staging: media: atomisp: inline the check_bo_status_*() macros Date: Wed, 12 Aug 2026 23:51:36 +0300 Message-ID: <20260812205429.39181-4-nikolayof23@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260812205429.39181-1-nikolayof23@gmail.com> References: <20260812205429.39181-1-nikolayof23@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit These macros check a bit in the bo->status field. Replace them with conditional expressions to make the code clearer. Signed-off-by: Nikolay Kulikov --- .../media/atomisp/include/hmm/hmm_bo.h | 12 -------- .../media/atomisp/include/hmm/hmm_common.h | 18 ----------- .../staging/media/atomisp/pci/hmm/hmm_bo.c | 30 ++++++++++++------- 3 files changed, 20 insertions(+), 40 deletions(-) diff --git a/drivers/staging/media/atomisp/include/hmm/hmm_bo.h b/drivers/staging/media/atomisp/include/hmm/hmm_bo.h index e974ab5ca2fc..69cf490bd88c 100644 --- a/drivers/staging/media/atomisp/include/hmm/hmm_bo.h +++ b/drivers/staging/media/atomisp/include/hmm/hmm_bo.h @@ -19,18 +19,6 @@ #include "hmm/hmm_common.h" #include "ia_css_types.h" -#define check_bo_status_yes_goto(bo, _status, label) \ - var_not_equal_goto((bo->status & (_status)), (_status), \ - label, \ - "HMM buffer status not contain %s.\n", \ - #_status) - -#define check_bo_status_no_goto(bo, _status, label) \ - var_equal_goto((bo->status & (_status)), (_status), \ - label, \ - "HMM buffer status contains %s.\n", \ - #_status) - #define rbtree_node_to_hmm_bo(root_node) \ container_of((root_node), struct hmm_buffer_object, node) diff --git a/drivers/staging/media/atomisp/include/hmm/hmm_common.h b/drivers/staging/media/atomisp/include/hmm/hmm_common.h index f215130e5e17..c406fe8b1345 100644 --- a/drivers/staging/media/atomisp/include/hmm/hmm_common.h +++ b/drivers/staging/media/atomisp/include/hmm/hmm_common.h @@ -33,22 +33,4 @@ } \ } while (0) -#define var_equal_goto(var1, var2, label, fmt, arg ...) \ - do { \ - if ((var1) == (var2)) { \ - dev_err(atomisp_dev, \ - fmt, ## arg); \ - goto label;\ - } \ - } while (0) - -#define var_not_equal_goto(var1, var2, label, fmt, arg ...) \ - do { \ - if ((var1) != (var2)) { \ - dev_err(atomisp_dev, \ - fmt, ## arg); \ - goto label;\ - } \ - } 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 ecd920e49488..dbda4394a239 100644 --- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c @@ -687,7 +687,10 @@ int hmm_bo_alloc_pages(struct hmm_buffer_object *bo, } mutex_lock(&bo->mutex); - check_bo_status_no_goto(bo, HMM_BO_PAGE_ALLOCED, status_err); + if (bo->status & HMM_BO_PAGE_ALLOCED) { + dev_err(atomisp_dev, "HMM buffer status contains HMM_BO_PAGE_ALLOCED.\n"); + goto status_err; + } bo->pages = kzalloc_objs(struct page *, bo->pgnr); if (unlikely(!bo->pages)) { @@ -738,7 +741,10 @@ void hmm_bo_free_pages(struct hmm_buffer_object *bo) mutex_lock(&bo->mutex); - check_bo_status_yes_goto(bo, HMM_BO_PAGE_ALLOCED, status_err2); + if (!(bo->status & HMM_BO_PAGE_ALLOCED)) { + dev_err(atomisp_dev, "HMM buffer status not contain HMM_BO_PAGE_ALLOCED.\n"); + goto status_err2; + } /* clear the flag anyway. */ bo->status &= (~HMM_BO_PAGE_ALLOCED); @@ -788,11 +794,15 @@ int hmm_bo_bind(struct hmm_buffer_object *bo) mutex_lock(&bo->mutex); - check_bo_status_yes_goto(bo, - HMM_BO_PAGE_ALLOCED | HMM_BO_ALLOCED, - status_err1); + if (!(bo->status & (HMM_BO_PAGE_ALLOCED | HMM_BO_ALLOCED))) { + dev_err(atomisp_dev, "HMM buffer status not contain HMM_BO_PAGE_ALLOCED | HMM_BO_ALLOCED.\n"); + goto status_err1; + } - check_bo_status_no_goto(bo, HMM_BO_BINDED, status_err2); + if (bo->status & HMM_BO_BINDED) { + dev_err(atomisp_dev, "HMM buffer status contains HMM_BO_BINDED.\n"); + goto status_err2; + } bdev = bo->bdev; @@ -868,10 +878,10 @@ void hmm_bo_unbind(struct hmm_buffer_object *bo) mutex_lock(&bo->mutex); - check_bo_status_yes_goto(bo, - HMM_BO_PAGE_ALLOCED | - HMM_BO_ALLOCED | - HMM_BO_BINDED, status_err); + if (!(bo->status & (HMM_BO_PAGE_ALLOCED | HMM_BO_ALLOCED | HMM_BO_BINDED))) { + dev_err(atomisp_dev, "HMM buffer status not contain HMM_BO_PAGE_ALLOCED | HMM_BO_ALLOCED | HMM_BO_BINDED.\n"); + goto status_err; + } bdev = bo->bdev; -- 2.55.0