From nobody Fri Jul 24 04:50:33 2026 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (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 3210434DB72 for ; Thu, 23 Jul 2026 18:52:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832761; cv=none; b=p/UeXgMXpY6bOzdTBpXgm6zvN4Z0USrbjlRpI7azciwoCWGvJVxgfLt2QxRUxsMw0XHimdxmpwIXohAT/dHtp+gFMx9NBeqsjQCzmANMJlroH/dChDwIfTdVxfh48TxbJdrXaNO5+tdikW9azu9TcYbkpOy+Y0hajXyeNua2O3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832761; c=relaxed/simple; bh=FOycCqunyoZT8bgxjzlkGYKt/0jU9FcTV7Q7HQv2ThM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rRcUpWJIVNjwMKbMk2bJQ94sI1osIR/rEheMHjw5ljeBgUBMop1XesxzsC7o7nnvKIQlNIPw0DHjDWj+RNpj/K8RhYSx/AHRxPVE1swvJwacu+miqKPZKWvAuvjuBkktTsdNYn3NG0JjSfvcapXp/vjL5bmvCVm67fIfDB92uYM= 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=ZqSzu0vc; arc=none smtp.client-ip=209.85.208.171 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="ZqSzu0vc" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-39c74722e27so9058891fa.0 for ; Thu, 23 Jul 2026 11:52:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784832747; x=1785437547; 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=i6ugBaIIKiiLCYgtPZsQcl5yA/18Djk/6dZvEnQ+uks=; b=ZqSzu0vc3YMGuX2Tp41dNDlxc56xKPIUEJvJXckrhvhRRzFDymP7cHMokZBAhDGRME QXIiD11bceSdt2JywZOotUbGSkbdDafRNgsTc5rPJTG8rH8jAlHlt+p0kYvBURJLD2yd dvp6QB3okul+m1OZEt11ZjG+vZ+BhfAUc+MxiEhI2glptdNJepwxOZlb8QzFpQnrT2Uy AH6Od19MjOg4ORsFePAM5uH1c+VOZOE+oCAyzTP/a/pjiVePawFIrFTM+omhQfNGPXpH VTI/PEg2prU7HWdoUE8sJCxYhxLo7RhJbDsY/RK5qWf5JkMWv9Vq24oIh9aw3EfotfAa 3wKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784832747; x=1785437547; 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=i6ugBaIIKiiLCYgtPZsQcl5yA/18Djk/6dZvEnQ+uks=; b=MaG0urzAOO16vR8Hw3MvDXzPuXoggAW1Ch2s5sQYsx3+gVTBIcyBSp+7sL6G94XSav UiV2Hp/EiLovgJLrbM6+nqJ/jW6B7He+chK8JqoT5pbRgi+KhHGeirrn518Iit162Vnl 3Os/Z9wtiKnxHMtuuZB04OtyJIB0SoEZ/b0G+WzJW6iObNSButC8AI9eIoNRjZXxLrgy xD7EmD2YxRkerVt73ov2kXyyO2XRYby3LAJvYj2NTVhSNDPVa6qj7j3op+7QzSXwH10l R8SZD2Oqxhr02YaTavXY1o9wyKLGbaCf4XS8N/l0aUtCrZOTiFGC1NCRg9v5vOnqHcOE UR5g== X-Forwarded-Encrypted: i=1; AHgh+Rov2BN54rkiaLr4lqCRWFeTT2yED4sFgM/1G4JeYLitwxkffB75QZFcOyhPpJZHu8aqmx1Y3Vklazt5EbU=@vger.kernel.org X-Gm-Message-State: AOJu0YxqHbjj+9Lw1kj+RrTbcFJPpPC58WjukcNasvDB4zBCSpX85VX2 zt2NaCWrlsoK0KxigkM2hYxfo/b9ZoP8o9LdhegKhQUPllggK3RJcoq7 X-Gm-Gg: AR+sD111PloCg8bgQo2kXtfg3XxVpxzwsVI7R0oFVe5nrPNaCKcVoNlu4H9cr6gvimC F3ZA0I/SYaYxlG7C/6q3HNXDQCjyH7YIfFL++EXD8Ng9YmGJiNMyBlaxVHu230hTMFHAoe5Z3DI jEJrg/aYD0wDJJcD9IslJX8oZD1aoKKuNSitlq2+OkeHReYRRa8/GosLZEBCGhc5WpxxOY6SjcS XZrlcqUpLNOXicY/RolwRiz58+5jvq187SO/icN+jzx/elJrJkgm8TkQR5LNxa8/D7scHTMrbLL 3pONbtqFholQPmtIizC0RIS/ketsxEQdUaHNv/r4b8GkT4rc8PFrjql6hCzACkpNImanaCXfR7C L4WHWBeIa4A/C1OOZYBL2LyaHwSB4Vc0u2Lsdl314mU7h5oMS6bqfSKmhkm1b3/zOD9leUOBxWF E= X-Received: by 2002:a05:651c:2120:b0:391:11de:dd5b with SMTP id 38308e7fff4ca-39f098567d2mr7079571fa.11.1784832746613; Thu, 23 Jul 2026 11:52:26 -0700 (PDT) Received: from archlinux ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-39ef68b68ebsm11601731fa.10.2026.07.23.11.52.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 11:52:26 -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 1/4] staging: media: atomisp: remove unused functions from pci/hmm/ Date: Thu, 23 Jul 2026 21:51:18 +0300 Message-ID: <20260723185217.317981-2-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: quoted-printable Content-Type: text/plain; charset="utf-8" These functions are declared and defined but are not called anywhere. Signed-off-by: Nikolay Kulikov --- .../staging/media/atomisp/include/hmm/hmm.h | 16 --- .../media/atomisp/include/hmm/hmm_bo.h | 19 ---- drivers/staging/media/atomisp/pci/hmm/hmm.c | 41 -------- .../staging/media/atomisp/pci/hmm/hmm_bo.c | 97 ------------------- 4 files changed, 173 deletions(-) diff --git a/drivers/staging/media/atomisp/include/hmm/hmm.h b/drivers/stag= ing/media/atomisp/include/hmm/hmm.h index a7aef27f54de..6bda02b9ff85 100644 --- a/drivers/staging/media/atomisp/include/hmm/hmm.h +++ b/drivers/staging/media/atomisp/include/hmm/hmm.h @@ -32,12 +32,6 @@ void hmm_free(ia_css_ptr ptr); int hmm_load(ia_css_ptr virt, void *data, unsigned int bytes); int hmm_store(ia_css_ptr virt, const void *data, unsigned int bytes); int hmm_set(ia_css_ptr virt, int c, unsigned int bytes); -int hmm_flush(ia_css_ptr virt, unsigned int bytes); - -/* - * get kernel memory physical address from ISP virtual address. - */ -phys_addr_t hmm_virt_to_phys(ia_css_ptr virt); =20 /* * map ISP memory starts with virt to kernel virtual address @@ -55,16 +49,6 @@ void hmm_vunmap(ia_css_ptr virt); */ void hmm_flush_vmap(ia_css_ptr virt); =20 -/* - * map ISP memory starts with virt to specific vma. - * - * used for mmap operation. - * - * virt must be the start address of ISP memory (return by hmm_alloc), - * do not pass any other address. - */ -int hmm_mmap(struct vm_area_struct *vma, ia_css_ptr virt); - extern struct hmm_bo_device bo_device; =20 #endif diff --git a/drivers/staging/media/atomisp/include/hmm/hmm_bo.h b/drivers/s= taging/media/atomisp/include/hmm/hmm_bo.h index e09ac29ac43d..ba3c582a0f89 100644 --- a/drivers/staging/media/atomisp/include/hmm/hmm_bo.h +++ b/drivers/staging/media/atomisp/include/hmm/hmm_bo.h @@ -205,7 +205,6 @@ int hmm_bo_page_allocated(struct hmm_buffer_object *bo); */ int hmm_bo_bind(struct hmm_buffer_object *bo); void hmm_bo_unbind(struct hmm_buffer_object *bo); -int hmm_bo_binded(struct hmm_buffer_object *bo); =20 /* * vmap buffer object's pages to contiguous kernel virtual address. @@ -224,17 +223,6 @@ void hmm_bo_flush_vmap(struct hmm_buffer_object *bo); */ void hmm_bo_vunmap(struct hmm_buffer_object *bo); =20 -/* - * mmap the bo's physical pages to specific vma. - * - * vma's address space size must be the same as bo's size, - * otherwise it will return -EINVAL. - * - * vma->vm_flags will be set to (VM_RESERVED | VM_IO). - */ -int hmm_bo_mmap(struct vm_area_struct *vma, - struct hmm_buffer_object *bo); - /* * find the buffer object by its virtual address vaddr. * return NULL if no such buffer object found. @@ -251,11 +239,4 @@ struct hmm_buffer_object *hmm_bo_device_search_start( struct hmm_buffer_object *hmm_bo_device_search_in_range( struct hmm_bo_device *bdev, ia_css_ptr vaddr); =20 -/* - * find the buffer object with kernel virtual address vaddr. - * return NULL if no such buffer object found. - */ -struct hmm_buffer_object *hmm_bo_device_search_vmap_start( - struct hmm_bo_device *bdev, const void *vaddr); - #endif diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm.c b/drivers/staging/= media/atomisp/pci/hmm/hmm.c index f998b57f90c4..8130be4a30e3 100644 --- a/drivers/staging/media/atomisp/pci/hmm/hmm.c +++ b/drivers/staging/media/atomisp/pci/hmm/hmm.c @@ -262,12 +262,6 @@ int hmm_load(ia_css_ptr virt, void *data, unsigned int= bytes) return load_and_flush(virt, data, bytes); } =20 -/* Flush hmm data from the data cache */ -int hmm_flush(ia_css_ptr virt, unsigned int bytes) -{ - return load_and_flush(virt, NULL, bytes); -} - /* Write function in ISP memory management */ int hmm_store(ia_css_ptr virt, const void *data, unsigned int bytes) { @@ -411,41 +405,6 @@ int hmm_set(ia_css_ptr virt, int c, unsigned int bytes) return 0; } =20 -/* Virtual address to physical address convert */ -phys_addr_t hmm_virt_to_phys(ia_css_ptr virt) -{ - unsigned int idx, offset; - struct hmm_buffer_object *bo; - - bo =3D hmm_bo_device_search_in_range(&bo_device, virt); - if (!bo) { - dev_err(atomisp_dev, - "can not find buffer object contains address 0x%x\n", - virt); - return -1; - } - - idx =3D (virt - bo->start) >> PAGE_SHIFT; - offset =3D (virt - bo->start) - (idx << PAGE_SHIFT); - - return page_to_phys(bo->pages[idx]) + offset; -} - -int hmm_mmap(struct vm_area_struct *vma, ia_css_ptr virt) -{ - struct hmm_buffer_object *bo; - - bo =3D hmm_bo_device_search_start(&bo_device, virt); - if (!bo) { - dev_err(atomisp_dev, - "can not find buffer object start with address 0x%x\n", - virt); - return -EINVAL; - } - - return hmm_bo_mmap(vma, bo); -} - /* Map ISP virtual address into IA virtual address */ void *hmm_vmap(ia_css_ptr virt, bool cached) { diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c b/drivers/stagi= ng/media/atomisp/pci/hmm/hmm_bo.c index 0a8f401a1ca1..837077f1d229 100644 --- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c @@ -578,31 +578,6 @@ struct hmm_buffer_object *hmm_bo_device_search_in_rang= e( return bo; } =20 -struct hmm_buffer_object *hmm_bo_device_search_vmap_start( - struct hmm_bo_device *bdev, const void *vaddr) -{ - struct list_head *pos; - struct hmm_buffer_object *bo; - unsigned long flags; - - check_bodev_null_return(bdev, NULL); - - spin_lock_irqsave(&bdev->list_lock, flags); - list_for_each(pos, &bdev->entire_bo_list) { - bo =3D list_to_hmm_bo(pos); - /* pass bo which has no vm_node allocated */ - if ((bo->status & HMM_BO_MASK) =3D=3D HMM_BO_FREE) - continue; - if (bo->vmap_addr =3D=3D vaddr) - goto found; - } - spin_unlock_irqrestore(&bdev->list_lock, flags); - return NULL; -found: - spin_unlock_irqrestore(&bdev->list_lock, flags); - return bo; -} - static void free_pages_bulk_array(unsigned long nr_pages, struct page **pa= ge_array) { unsigned long i; @@ -885,21 +860,6 @@ void hmm_bo_unbind(struct hmm_buffer_object *bo) "buffer vm or page not allocated or not binded yet.\n"); } =20 -int hmm_bo_binded(struct hmm_buffer_object *bo) -{ - int ret; - - check_bo_null_return(bo, 0); - - mutex_lock(&bo->mutex); - - ret =3D bo->status & HMM_BO_BINDED; - - mutex_unlock(&bo->mutex); - - return ret; -} - void *hmm_bo_vmap(struct hmm_buffer_object *bo, bool cached) { check_bo_null_return(bo, NULL); @@ -1023,60 +983,3 @@ static const struct vm_operations_struct hmm_bo_vm_op= s =3D { .open =3D hmm_bo_vm_open, .close =3D hmm_bo_vm_close, }; - -/* - * mmap the bo to user space. - */ -int hmm_bo_mmap(struct vm_area_struct *vma, struct hmm_buffer_object *bo) -{ - unsigned int start, end; - unsigned int virt; - unsigned int pgnr, i; - unsigned int pfn; - - check_bo_null_return(bo, -EINVAL); - - check_bo_status_yes_goto(bo, HMM_BO_PAGE_ALLOCED, status_err); - - pgnr =3D bo->pgnr; - start =3D vma->vm_start; - end =3D vma->vm_end; - - /* - * check vma's virtual address space size and buffer object's size. - * must be the same. - */ - if ((start + pgnr_to_size(pgnr)) !=3D end) { - dev_warn(atomisp_dev, - "vma's address space size not equal to buffer object's size"); - return -EINVAL; - } - - virt =3D vma->vm_start; - for (i =3D 0; i < pgnr; i++) { - pfn =3D page_to_pfn(bo->pages[i]); - if (remap_pfn_range(vma, virt, pfn, PAGE_SIZE, PAGE_SHARED)) { - dev_warn(atomisp_dev, - "remap_pfn_range failed: virt =3D 0x%x, pfn =3D 0x%x, mapped_pgnr =3D= %d\n", - virt, pfn, 1); - return -EINVAL; - } - virt +=3D PAGE_SIZE; - } - - vma->vm_private_data =3D bo; - - vma->vm_ops =3D &hmm_bo_vm_ops; - vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP); - - /* - * call hmm_bo_vm_open explicitly. - */ - hmm_bo_vm_open(vma); - - return 0; - -status_err: - dev_err(atomisp_dev, "buffer page not allocated yet.\n"); - return -EINVAL; -} --=20 2.55.0 From nobody Fri Jul 24 04:50:33 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/s= taging/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" =20 -#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) =20 -#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/drive= rs/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) =20 -#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/stagi= ng/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 =3D=3D 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; =20 - check_bodev_null_return(bdev, -EINVAL); + if (!bdev) { + dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); + return -EINVAL; + } =20 ret =3D isp_mmu_init(&bdev->mmu, mmu_driver); if (ret) { @@ -382,9 +388,14 @@ struct hmm_buffer_object *hmm_bo_alloc(struct hmm_bo_d= evice *bdev, unsigned int pgnr) { struct hmm_buffer_object *bo, *new_bo; - struct rb_root *root =3D &bdev->free_rbtree; + struct rb_root *root; + + if (!bdev) { + dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); + return NULL; + } =20 - check_bodev_null_return(bdev, NULL); + root =3D &bdev->free_rbtree; var_equal_return(hmm_bo_device_inited(bdev), 0, NULL, "hmm_bo_device not inited yet.\n"); =20 @@ -493,7 +504,10 @@ void hmm_bo_device_exit(struct hmm_bo_device *bdev) =20 dev_dbg(atomisp_dev, "%s: entering!\n", __func__); =20 - check_bodev_null_return_void(bdev); + if (!bdev) { + dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); + return; + } =20 /* * release all allocated bos even they a in use @@ -526,14 +540,20 @@ void hmm_bo_device_exit(struct hmm_bo_device *bdev) =20 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; + } =20 return bdev->flag =3D=3D HMM_BO_DEVICE_INITED; } =20 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; + } =20 return bo->status & HMM_BO_ALLOCED; } @@ -543,7 +563,10 @@ struct hmm_buffer_object *hmm_bo_device_search_start( { struct hmm_buffer_object *bo; =20 - check_bodev_null_return(bdev, NULL); + if (!bdev) { + dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); + return NULL; + } =20 mutex_lock(&bdev->rbtree_mutex); bo =3D __bo_search_by_addr(&bdev->allocated_rbtree, vaddr); @@ -563,7 +586,10 @@ struct hmm_buffer_object *hmm_bo_device_search_in_rang= e( { struct hmm_buffer_object *bo; =20 - check_bodev_null_return(bdev, NULL); + if (!bdev) { + dev_err(atomisp_dev, "NULL hmm_bo_device.\n"); + return NULL; + } =20 mutex_lock(&bdev->rbtree_mutex); bo =3D __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 =3D -EINVAL; =20 - check_bo_null_return(bo, -EINVAL); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return -EINVAL; + } =20 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; + } =20 mutex_lock(&bo->mutex); =20 @@ -731,7 +763,10 @@ void hmm_bo_free_pages(struct hmm_buffer_object *bo) =20 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; + } =20 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; =20 - check_bo_null_return(bo, -EINVAL); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return -EINVAL; + } =20 mutex_lock(&bo->mutex); =20 @@ -823,7 +861,10 @@ void hmm_bo_unbind(struct hmm_buffer_object *bo) struct hmm_bo_device *bdev; unsigned int i; =20 - check_bo_null_return_void(bo); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } =20 mutex_lock(&bo->mutex); =20 @@ -862,7 +903,10 @@ void hmm_bo_unbind(struct hmm_buffer_object *bo) =20 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; + } =20 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 c= ached) =20 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; + } =20 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) =20 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; + } =20 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) =20 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; + } =20 kref_get(&bo->kref); } @@ -937,7 +990,10 @@ static void kref_hmm_bo_release(struct kref *kref) =20 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; + } =20 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 =3D vma->vm_private_data; =20 - check_bo_null_return_void(bo); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } =20 hmm_bo_ref(bo); =20 @@ -963,7 +1022,10 @@ static void hmm_bo_vm_close(struct vm_area_struct *vm= a) { struct hmm_buffer_object *bo =3D vma->vm_private_data; =20 - check_bo_null_return_void(bo); + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } =20 hmm_bo_unref(bo); =20 --=20 2.55.0 From nobody Fri Jul 24 04:50:33 2026 Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (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 A17D347FAE8 for ; Thu, 23 Jul 2026 18:52:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832763; cv=none; b=OuUxRRWqZKYlROqlOcjICDh93aWW2JOwEAcJbVCf5QOxnCSir/tWcy2ZHFTmENgEIJJ0ZpH1ZnCVtj4mYsH9Utb6W1SQKiIK2QIxT85XqBZiYiqP8R5htxCmZlAhehcNk36mmtm4Jdarsl5Drvge8K6wXyXFQ3m1s4DtsUBeqJ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832763; c=relaxed/simple; bh=417PvZV6MLha7RW5u+XT5AoGUeViXQS0dSHinR0tdNk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZUH8u8sZYPuZpBiAZi3JBvk0OXGiUP4KhrFOklt4djdH7pfZ9SDK34Nr8slIm38c9zxa+kf6UBhDk/xZSRN/864vLPb5l/exiZ7jaq4QlSO02yCOpQeSk41cOcvlC3rp88jB6XMIH6QKHUIDl5i1VHpBXrdJ0eJ5r4WtYfe333A= 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=VLbZakFB; arc=none smtp.client-ip=209.85.208.177 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="VLbZakFB" Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-39c94fccf3eso8663431fa.0 for ; Thu, 23 Jul 2026 11:52:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784832752; x=1785437552; 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=S6YqaPjKVmdDMcCcfhFit+qzoapYrDK7L6d0hrzWx1A=; b=VLbZakFBQdMiSpmcqhB4dlV4eCEm6RrWzoXt7irto3FW3FJM4VjDUoN/P2lCRB3tVo FJhhLwwUYgX9/3fUX89G3ugS1AkqfD5mEgmHLXHuMaimOfa37xYvU+oh5N8i/nuzeV6q MgYZVFQxJuLGIhROEyNyw/Cp8VgG5X93mM76F3VfrbmDq6WjIdB65Lu0iyf2vpImeto9 RtjmbeGgflbpb9l2iv1129gutx7+LIT9Qyt1puTKJsIzsLPPZ+AqREelkoxzxZ6Iuw8D tiSBat3PCC1tgIShmsTwhekr8gQ2Xl3bce7jtC0xmoWCTnPu+iZX1BQk5GXGcRCFxseu vg1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784832752; x=1785437552; 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=S6YqaPjKVmdDMcCcfhFit+qzoapYrDK7L6d0hrzWx1A=; b=UNvprL8fn2fajVptj6Z7r2ajRm0j6/Ud78UEPXeByqf/chf2mXcdNLmrnHQvA8O1p+ c1v83Qk+5tGAet0mb5aRGSC9Ro6N0Ez5kI6b60dKFBpF0RCXVTLfmL3YbtOcKg7hbjmv ScR9CDTCT0JNNlnUum9Jfho6IR4vYmmXx+rQMvgH4vnfnumN81pEA0AmkG/Kvxp15z3A 46YanPSXAjvEBvC+7qu8mKnS2sHLeQzaKbeqCDR6Wdwh4zQmbpIQ+oZXGHd7wwsepHQg ZjHTEqpDfB32LV/q+jHutpb5PNY1qh8dBZuQuyoiO6x0OhbzTeV/uiLFxosZIsRH/ciY +/IA== X-Forwarded-Encrypted: i=1; AHgh+Rq+mekJSXcL6o4pU4yxJMHZj5v+viHhAUIa12FcQjUpFIyCJquGxQewqvQ2oKrrna6gLDJsQMF+PKqtW4w=@vger.kernel.org X-Gm-Message-State: AOJu0YyM7DEd25FsPhYQUkOOfQrxAwa6Wus6rbJYY6Lsj5/2F72QwH/t YrGGuuLy4V+g1jtRfOIArhhm9rKtyh2xuyMviFZOZ1j8syLJxWyycqKMxxQAYA== X-Gm-Gg: AR+sD12vJYe3S3Qf2+ShqqXl7rtT/5pnEwgcJBLW9HxlqrnEUJI9wc5uIEm8KJpYIoM DVSJnAlL6bKZaMJqaVq/va6Nza8FpltYvMMbgojRoI9x225oeDMYSGwYSYwFx27zwPsy+A/VA7T 8J7f8pl7YvyADNbCwP5lTbBeSFffLT+uC6moNU+SRRlotFXLwHIuZdLcFzMi4BVlj2NLE0TowLu 7REhfsRyWFeyQ3zph1rsBTZIjFLLAvyVI0e9x9LIChsuO0HwR8l2OiC7APZIYH1weyUp74RUqJm QNf969bhbBDl0Pl/v3znkBaO+mT0e6rpAl2/Qn47NXDQg+LS8bmD5+YLTWIj9zZpx+ZnUMFIiUZ y7vZrYjCHamYyU++zkCJ2J+jP+3DfbZnC+zqr2aNdvz47xoNm9QCoOZlL0L9/dnPyNLggyjp4vo 4= X-Received: by 2002:a05:651c:881:b0:39b:2323:b700 with SMTP id 38308e7fff4ca-39f07c63c7emr8542801fa.10.1784832752086; Thu, 23 Jul 2026 11:52:32 -0700 (PDT) Received: from archlinux ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-39ef68b68ebsm11601731fa.10.2026.07.23.11.52.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 11:52:31 -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 3/4] staging: media: atomisp: inline the check_bo_status_*() macros Date: Thu, 23 Jul 2026 21:51:20 +0300 Message-ID: <20260723185217.317981-4-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/s= taging/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" =20 -#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) =20 diff --git a/drivers/staging/media/atomisp/include/hmm/hmm_common.h b/drive= rs/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) =20 -#define var_equal_goto(var1, var2, label, fmt, arg ...) \ - do { \ - if ((var1) =3D=3D (var2)) { \ - dev_err(atomisp_dev, \ - fmt, ## arg); \ - goto label;\ - } \ - } while (0) - -#define var_not_equal_goto(var1, var2, label, fmt, arg ...) \ - do { \ - if ((var1) !=3D (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/stagi= ng/media/atomisp/pci/hmm/hmm_bo.c index b9949cc080e5..e92538ab025e 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, } =20 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; + } =20 bo->pages =3D kzalloc_objs(struct page *, bo->pgnr); if (unlikely(!bo->pages)) { @@ -738,7 +741,10 @@ void hmm_bo_free_pages(struct hmm_buffer_object *bo) =20 mutex_lock(&bo->mutex); =20 - 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; + } =20 /* clear the flag anyway. */ bo->status &=3D (~HMM_BO_PAGE_ALLOCED); @@ -788,11 +794,15 @@ int hmm_bo_bind(struct hmm_buffer_object *bo) =20 mutex_lock(&bo->mutex); =20 - 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; + } =20 - 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; + } =20 bdev =3D bo->bdev; =20 @@ -868,10 +878,10 @@ void hmm_bo_unbind(struct hmm_buffer_object *bo) =20 mutex_lock(&bo->mutex); =20 - 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; + } =20 bdev =3D bo->bdev; =20 --=20 2.55.0 From nobody Fri Jul 24 04:50:33 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/stag= ing/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 =20 -#include "hmm_common.h" #include "hmm/hmm_bo.h" #include "ia_css_types.h" =20 diff --git a/drivers/staging/media/atomisp/include/hmm/hmm_bo.h b/drivers/s= taging/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" =20 #define rbtree_node_to_hmm_bo(root_node) \ diff --git a/drivers/staging/media/atomisp/include/hmm/hmm_common.h b/drive= rs/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) =3D=3D (var2)) { \ - dev_err(atomisp_dev, \ - fmt, ## arg); \ - return exp;\ - } \ - } while (0) - -#define var_equal_return_void(var1, var2, fmt, arg ...) \ - do { \ - if ((var1) =3D=3D (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/stagi= ng/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 =20 #include "atomisp_internal.h" -#include "hmm/hmm_common.h" #include "hmm/hmm_bo.h" =20 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_de= vice *bdev, { struct hmm_buffer_object *bo, *new_bo; struct rb_root *root; + int ret; =20 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_d= evice *bdev, } =20 root =3D &bdev->free_rbtree; - var_equal_return(hmm_bo_device_inited(bdev), 0, NULL, - "hmm_bo_device not inited yet.\n"); + ret =3D hmm_bo_device_inited(bdev); + if (!ret) { + dev_err(atomisp_dev, "hmm_bo_device not inited yet.\n"); + return NULL; + } =20 if (pgnr =3D=3D 0) { dev_err(atomisp_dev, "0 size buffer is not allowed.\n"); --=20 2.55.0