From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (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 ECB4544C51B for ; Thu, 23 Jul 2026 18:52:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832760; cv=none; b=n76CUG5DNNYZZLV9pwpv/J28nT7L2/CeWSwHjnTQvjrY1KQnzyDpTaJaR0SQj6AQxhHA+WBC5J8h6HcYC5TPSOCAMVhrqi3x02BfUqnV6JL08aZWMEpKijeeVcpQkmg2PZKTYQXy41lb5tdt9rlFCCFYolB09yFQkBDuN2cJJ5U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832760; c=relaxed/simple; bh=OVmx7bz1anzh7SJEzCCdyFNH42oX0UnoJzEUACuGO0U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YatbgnkpwFoGNgx8zJxNBXQ4pTmOPgPLJQ9XRIYwWueJmSdJR8YnbuzNUrOQ+KDPjBg2KBBPtUjZR4MSCb0B3xogyhvwVrp+JiYq2ZYqCWQ+ewNLWsgjaExMiHcgLNyPZxPXQ8j07uWRtGKci+tFgK+7ZCqioQ9osGYaM82rMLc= 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=iEI2kGum; arc=none smtp.client-ip=209.85.208.178 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="iEI2kGum" Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-39c62764c7cso6948351fa.0 for ; Thu, 23 Jul 2026 11:52:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784832749; x=1785437549; 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=kfpo1gIaGV53zHpPh1d3zVcmwfOmBbYJTZ53Q0pKaz8=; b=iEI2kGum7wTwe885HrS5UTQdZf5RahavIu2usdL5XCR1IFe77Sl6mwPZ0g5bkX0beF xu/ByUV3ILJLZW9HwU+DWiOgfMXgqtM6xCliKBQC9toTQoGUsEn+8sCQWWxc5gR3i6aW 1c/zEsDh6WM8cvWn0sSJcJ+f5sq4PezJjnd1T1pIWoRnWvzu03d6JUBuRf2Z+J+eWBYl YGi1hxlvcwpKppPSbso2s3yWI7dq2GzMrlRb9qvT8lCJJEgdhYtXMQz1hg9ymsL6Bv/d 8MFgeNIwf8T865XFtgTpAhtrSJfvfTcS4P2KUNKI6UGy2J6wcFTfI6dpIiPyjfsKDspN VhLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784832749; x=1785437549; 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=kfpo1gIaGV53zHpPh1d3zVcmwfOmBbYJTZ53Q0pKaz8=; b=aBUK5yqW0YxfgqlfnbLi/F2cJFXUOa0Grri4JsE8il1GUjqrs0pIRlFBsVtdvxTVNB Khcig33Gj2d8/6Ortt0rk1ezj19f9fEYFtuCZ8Vd10D+Xu+8f0F9PHFvj0DPlUbWukxX 7y+G1yPvcY5GdBQhUOzxJhUjzU0SxlW9WjO9dLdWsdBr5O+ffpyrJdx9o3Djq+RjPG/6 kYDPCJLKrAQ2egGKbdY/7VXq3Ym/VQkVupz+y19/hpG9smE1z7Hpx05k5XY6gZMukr5n pr0vi7GuEbMc+UPr4zANWI04D9+G4cZxEikjXpv2GUcHngCuGmF4IXUQSzsdaP253KVx 3iRw== X-Forwarded-Encrypted: i=1; AHgh+Rqj3UWMG+Aqn4mq3SbuyNjqmL77Yito4m2GJBgNetYpmeRbTrWaveeBO6gGic4159fUoCkjRXK3DpnD+rY=@vger.kernel.org X-Gm-Message-State: AOJu0YzYGO5CYSCz1HKZnJYWaM75M6nhLacOwIeJM7ObvTm6WXv76yCF ueIvlZ2P3crIIhsZc3eio1oylaenjo32DYA83joohhd2Gj1VWXxxPVZS X-Gm-Gg: AR+sD12FFYbZvNMR9XmKyQBaoe6loPgdYOjN64xQYzsmnhcUp5D/dcJ6G7RFseKV4/A rV93cx8NIaiWFGFWQbmy2hR6oNZBD8D5RK7tlhCR58P+Z6+8248Dg6SEbk0whhq8YLmk6lsJzZb 3JwIX4h7RNIWC1awAclRI7DxNTYsY03Hx41d02xPw/sW3NiAYZCCQeemLNdrDqWxd+nDKi2SOxi hOGfLvNu1Ve5MwVGvq216+kKNyy7GpxU4t8Lo4XLNmyF0DGtkVKBp28oQ2Z2Y6h1NyxtuoFFsCV sMu3jAjZZDA9aHjdZA3qiMZQMXglNuGJ69YUR/GqNkA5q7GdZ0fRiajiCq1UJsFE1JHOs896JAF qTVXL3fIE5T55C9t//kQ531lVFsZ4NSeZtVyItT1ebyTGxfLqSiF9Zj6P8UOHm3ESut9Fo4x6fH bgpcIBLv9E+A== X-Received: by 2002:a2e:b887:0:b0:39c:753a:853f with SMTP id 38308e7fff4ca-39f0948cf0bmr7754951fa.3.1784832749380; Thu, 23 Jul 2026 11:52:29 -0700 (PDT) Received: from archlinux ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-39ef68b68ebsm11601731fa.10.2026.07.23.11.52.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 11:52:29 -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 2/4] staging: media: atomisp: inline macros for checking the bo/bodev pointer Date: Thu, 23 Jul 2026 21:51:19 +0300 Message-ID: <20260723185217.317981-3-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 These macros perform a pointer check. Replace it with direct conditional expressions to simplify the code. Signed-off-by: Nikolay Kulikov --- .../media/atomisp/include/hmm/hmm_bo.h | 14 --- .../media/atomisp/include/hmm/hmm_common.h | 6 - .../staging/media/atomisp/pci/hmm/hmm_bo.c | 104 ++++++++++++++---- 3 files changed, 83 insertions(+), 41 deletions(-) diff --git a/drivers/staging/media/atomisp/include/hmm/hmm_bo.h b/drivers/staging/media/atomisp/include/hmm/hmm_bo.h index ba3c582a0f89..e974ab5ca2fc 100644 --- a/drivers/staging/media/atomisp/include/hmm/hmm_bo.h +++ b/drivers/staging/media/atomisp/include/hmm/hmm_bo.h @@ -19,14 +19,6 @@ #include "hmm/hmm_common.h" #include "ia_css_types.h" -#define check_bodev_null_return(bdev, exp) \ - check_null_return(bdev, exp, \ - "NULL hmm_bo_device.\n") - -#define check_bodev_null_return_void(bdev) \ - check_null_return_void(bdev, \ - "NULL hmm_bo_device.\n") - #define check_bo_status_yes_goto(bo, _status, label) \ var_not_equal_goto((bo->status & (_status)), (_status), \ label, \ @@ -48,12 +40,6 @@ #define kref_to_hmm_bo(kref_ptr) \ list_entry((kref_ptr), struct hmm_buffer_object, kref) -#define check_bo_null_return(bo, exp) \ - check_null_return(bo, exp, "NULL hmm buffer object.\n") - -#define check_bo_null_return_void(bo) \ - check_null_return_void(bo, "NULL hmm buffer object.\n") - #define ISP_VM_START 0x0 #define ISP_VM_SIZE (0x7FFFFFFF) /* 2G address space */ #define ISP_PTR_NULL NULL diff --git a/drivers/staging/media/atomisp/include/hmm/hmm_common.h b/drivers/staging/media/atomisp/include/hmm/hmm_common.h index b251e96cc19d..f215130e5e17 100644 --- a/drivers/staging/media/atomisp/include/hmm/hmm_common.h +++ b/drivers/staging/media/atomisp/include/hmm/hmm_common.h @@ -51,10 +51,4 @@ } \ } while (0) -#define check_null_return(ptr, exp, fmt, arg ...) \ - var_equal_return(ptr, NULL, exp, fmt, ## arg) - -#define check_null_return_void(ptr, fmt, arg ...) \ - var_equal_return_void(ptr, NULL, fmt, ## arg) - #endif diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c index 837077f1d229..b9949cc080e5 100644 --- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c @@ -36,7 +36,10 @@ static int __bo_init(struct hmm_bo_device *bdev, struct hmm_buffer_object *bo, unsigned int pgnr) { - check_bodev_null_return(bdev, -EINVAL); + if (!bdev) { + dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); + return -EINVAL; + } /* prevent zero size buffer object */ if (pgnr == 0) { dev_err(atomisp_dev, "0 size buffer is not allowed.\n"); @@ -324,7 +327,10 @@ int hmm_bo_device_init(struct hmm_bo_device *bdev, unsigned long flags; int ret; - check_bodev_null_return(bdev, -EINVAL); + if (!bdev) { + dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); + return -EINVAL; + } ret = isp_mmu_init(&bdev->mmu, mmu_driver); if (ret) { @@ -382,9 +388,14 @@ struct hmm_buffer_object *hmm_bo_alloc(struct hmm_bo_device *bdev, unsigned int pgnr) { struct hmm_buffer_object *bo, *new_bo; - struct rb_root *root = &bdev->free_rbtree; + struct rb_root *root; + + if (!bdev) { + dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); + return NULL; + } - check_bodev_null_return(bdev, NULL); + root = &bdev->free_rbtree; var_equal_return(hmm_bo_device_inited(bdev), 0, NULL, "hmm_bo_device not inited yet.\n"); @@ -493,7 +504,10 @@ void hmm_bo_device_exit(struct hmm_bo_device *bdev) dev_dbg(atomisp_dev, "%s: entering!\n", __func__); - check_bodev_null_return_void(bdev); + if (!bdev) { + dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); + return; + } /* * release all allocated bos even they a in use @@ -526,14 +540,20 @@ void hmm_bo_device_exit(struct hmm_bo_device *bdev) int hmm_bo_device_inited(struct hmm_bo_device *bdev) { - check_bodev_null_return(bdev, -EINVAL); + if (!bdev) { + dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); + return -EINVAL; + } return bdev->flag == HMM_BO_DEVICE_INITED; } int hmm_bo_allocated(struct hmm_buffer_object *bo) { - check_bo_null_return(bo, 0); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return 0; + } return bo->status & HMM_BO_ALLOCED; } @@ -543,7 +563,10 @@ struct hmm_buffer_object *hmm_bo_device_search_start( { struct hmm_buffer_object *bo; - check_bodev_null_return(bdev, NULL); + if (!bdev) { + dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); + return NULL; + } mutex_lock(&bdev->rbtree_mutex); bo = __bo_search_by_addr(&bdev->allocated_rbtree, vaddr); @@ -563,7 +586,10 @@ struct hmm_buffer_object *hmm_bo_device_search_in_range( { struct hmm_buffer_object *bo; - check_bodev_null_return(bdev, NULL); + if (!bdev) { + dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); + return NULL; + } mutex_lock(&bdev->rbtree_mutex); bo = __bo_search_by_addr_in_range(&bdev->allocated_rbtree, vaddr); @@ -655,7 +681,10 @@ int hmm_bo_alloc_pages(struct hmm_buffer_object *bo, { int ret = -EINVAL; - check_bo_null_return(bo, -EINVAL); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return -EINVAL; + } mutex_lock(&bo->mutex); check_bo_status_no_goto(bo, HMM_BO_PAGE_ALLOCED, status_err); @@ -702,7 +731,10 @@ int hmm_bo_alloc_pages(struct hmm_buffer_object *bo, */ void hmm_bo_free_pages(struct hmm_buffer_object *bo) { - check_bo_null_return_void(bo); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } mutex_lock(&bo->mutex); @@ -731,7 +763,10 @@ void hmm_bo_free_pages(struct hmm_buffer_object *bo) int hmm_bo_page_allocated(struct hmm_buffer_object *bo) { - check_bo_null_return(bo, 0); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return 0; + } return bo->status & HMM_BO_PAGE_ALLOCED; } @@ -746,7 +781,10 @@ int hmm_bo_bind(struct hmm_buffer_object *bo) struct hmm_bo_device *bdev; unsigned int i; - check_bo_null_return(bo, -EINVAL); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return -EINVAL; + } mutex_lock(&bo->mutex); @@ -823,7 +861,10 @@ void hmm_bo_unbind(struct hmm_buffer_object *bo) struct hmm_bo_device *bdev; unsigned int i; - check_bo_null_return_void(bo); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } mutex_lock(&bo->mutex); @@ -862,7 +903,10 @@ void hmm_bo_unbind(struct hmm_buffer_object *bo) void *hmm_bo_vmap(struct hmm_buffer_object *bo, bool cached) { - check_bo_null_return(bo, NULL); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return NULL; + } mutex_lock(&bo->mutex); if (((bo->status & HMM_BO_VMAPED) && !cached) || @@ -893,7 +937,10 @@ void *hmm_bo_vmap(struct hmm_buffer_object *bo, bool cached) void hmm_bo_flush_vmap(struct hmm_buffer_object *bo) { - check_bo_null_return_void(bo); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } mutex_lock(&bo->mutex); if (!(bo->status & HMM_BO_VMAPED_CACHED) || !bo->vmap_addr) { @@ -907,7 +954,10 @@ void hmm_bo_flush_vmap(struct hmm_buffer_object *bo) void hmm_bo_vunmap(struct hmm_buffer_object *bo) { - check_bo_null_return_void(bo); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } mutex_lock(&bo->mutex); if (bo->status & HMM_BO_VMAPED || bo->status & HMM_BO_VMAPED_CACHED) { @@ -922,7 +972,10 @@ void hmm_bo_vunmap(struct hmm_buffer_object *bo) void hmm_bo_ref(struct hmm_buffer_object *bo) { - check_bo_null_return_void(bo); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } kref_get(&bo->kref); } @@ -937,7 +990,10 @@ static void kref_hmm_bo_release(struct kref *kref) void hmm_bo_unref(struct hmm_buffer_object *bo) { - check_bo_null_return_void(bo); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } kref_put(&bo->kref, kref_hmm_bo_release); } @@ -946,7 +1002,10 @@ static void hmm_bo_vm_open(struct vm_area_struct *vma) { struct hmm_buffer_object *bo = vma->vm_private_data; - check_bo_null_return_void(bo); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } hmm_bo_ref(bo); @@ -963,7 +1022,10 @@ static void hmm_bo_vm_close(struct vm_area_struct *vma) { struct hmm_buffer_object *bo = vma->vm_private_data; - check_bo_null_return_void(bo); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } hmm_bo_unref(bo); -- 2.55.0