From nobody Mon Sep 28 23:55:42 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 9EAB7476042 for ; Fri, 14 Aug 2026 15:11:26 +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=1786720288; cv=none; b=K48Sn54koaJidFU0g8DfXMFgLoe7NYHWUCgSQaVxupvHqf/db685lp6Yaz1UEVgS9VDmqVbxDXct1EcFGB86VriP2PZ70Njr8pJFxwk5IDFa5c614/bY4jzq5ayw/VW6OccwEbhNXW8krmSn+Z/GfMzdj4C0b/qWXbxtb5D3MRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786720288; c=relaxed/simple; bh=0BrBkcX9UcEVHPKeK7NYdXxTwBJE9wFp4qVEes7QwFQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dsqqKgKoR6BnE4zm4byZw5RrhRzsPusCk1BvQ+bSbc31QrqRgszEykE2E7qOX9UsM8xBjQxAZEF5iqPhIQPrH7oeEUF9k1DRomP/eHcvPAFAcV4WS0D+XRhWLFxttxlAerRFPSwsR9tuaHzIoWjy5NZy8IVMkbjLzAYTBSeaXFw= 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=IcTWvEKU; 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="IcTWvEKU" Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-39ee96f8047so7943751fa.1 for ; Fri, 14 Aug 2026 08:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786720285; x=1787325085; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kRvtXqxadNf2/AlBnV7jwVTo92rSYf1Qe1Qdjea6EK4=; b=IcTWvEKUT8lFiSd0oPWJ1qghyEoeB4gouWeb2jHFOfhDAHWMqYz294thA47iwdtEdB XkF9vHRXPI65uXHFpSOl53zArjzEUwT4lSZakpEMYpZMBPYgvqbQa+SxqOoNneKHKWwi eBhZL+IXfRF6xknqe4eP7tzqw6dY+6DZWfoFCQMjoFkzuMTO+3julFXNcIeo7XTo2vMF qiPr21oCx46xLMT+qPIuXQfGD8hrdm9S6Z9YycUqRxIpaLu1XWUcRCk5ef5WK/6lqN00 MG7IsBFpquhmfksEy7ZIkTq0mLPQ9LrlpO4eF4tjC59qtrRlfQw0MrZyrRWSj352y7Hc 3srg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786720285; x=1787325085; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=kRvtXqxadNf2/AlBnV7jwVTo92rSYf1Qe1Qdjea6EK4=; b=qG79BrU11Csx9VOg1rWMESQHCSYk62SbzzqdqXw6DKDYGfUDswzRR8R+dyrE675ZVj ToKPYCWhIW3TE/QhJ6dlEVmebS0Ox7t3z8LmDhnxz6QwzgmaEeTiuLqE3dM2rCwIZC2p COO3cmBM0w4SYi86/hJ6SkhIfE0la2Tn5XdPGJFqRzouw1Bwxhfej5LAd5LiD22iLaWO erJP39AyuXBgl/p51+JJxQvdcZ04b5rOZBA5xKWl+wCeISpAsuHEwSC3j8FtDI6JwRP2 QdHJi5SrOIvwVWk/2lSKLdT/02Kt9jVAURukaHLXeytXmmHw2J/3yskjm/3Xmkf6FtBr /ZDQ== X-Gm-Message-State: AOJu0YwI/c+3NfXUpHYSwelYu4WzsbQ3jxq8NqHIKYloeHSXGvuCuqne 6UrrxxtPZkTLKH1v/5U5RmFQqu4gjcWnccomLWJWL3RcP0kq+oRAxKo8JXEaGQ== X-Gm-Gg: AR+sD10fe816rV+f19kAK2MMmZxWqZplUWeGE4zPIIySezF7DHkPcnF1ZA6zCK11SWH KbI1Aq9cy1m2bvwnDFi2wFHboNnh1/m7ghZRLo/MRWrxgOgsMDBpkUVL5ZdXQJ1f2180yncghOV VrZyacRHhlv0dj1sUMULEeGZtH5Su4bylt/pFGvwge5Q35mrDAtc3H9P1rwac8ii81/iFBaZ7VS 2HH3WUENo5rQBGgHEhL6Rkh3RETOo4VEppa6dk8rFSY26D74e4BAPUxWGYHkNm5X7WMk+hqJy5a yvbh5iBKJlFLmvmxWIiRKxffcUhJp05baAOium/m/bKShmIht9vSrMxW1GS8OyZN9XVtqldnR/9 NMKFi2KTDvIEiP3blqWt6tLhF8rLfizOFhXdCYuQxXhIhJQrBjQMDvMIjCQucIqq9tUB7XFwaJD R6eOR7SoLfwC3q1NRB4oC1n3OfpvlPjOMp6XcOptY0LuSdOzUF41X02dlQvqVTEsWr+h7IbQ== X-Received: by 2002:a2e:be9b:0:b0:39c:650c:4540 with SMTP id 38308e7fff4ca-3a132498229mr7305901fa.15.1786720284542; Fri, 14 Aug 2026 08:11:24 -0700 (PDT) Received: from [192.168.243.250] ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3a130d204b2sm7138251fa.41.2026.08.14.08.11.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 08:11:24 -0700 (PDT) From: Nikolay Kulikov Date: Fri, 14 Aug 2026 18:10:08 +0300 Subject: [PATCH v4 1/5] staging: media: atomisp: remove unused functions from pci/hmm/ Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260814-atomisp_remove_hmm-v4-1-c3c954a12b51@gmail.com> References: <20260814-atomisp_remove_hmm-v4-0-c3c954a12b51@gmail.com> In-Reply-To: <20260814-atomisp_remove_hmm-v4-0-c3c954a12b51@gmail.com> To: Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko , Andy Shevchenko , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, Nikolay Kulikov X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786720280; l=8865; i=nikolayof23@gmail.com; s=20260402; h=from:subject:message-id; bh=0BrBkcX9UcEVHPKeK7NYdXxTwBJE9wFp4qVEes7QwFQ=; b=17ov1ejH9Y4fmeXP3BlwdLqNSouwa2H9tDhTC1BBA95xdO1q9x28gFeTjPyboMALzh/ZhO6UL KTKPOMuChCSBH14x5SiQ9dtCl7PsP1+wvBSgtfUFKqiKmbTOGkSuNdW X-Developer-Key: i=nikolayof23@gmail.com; a=ed25519; pk=2GWUU1isl5NJpkwSCQ4OG80EinZ3EUZXlrgAg6Pz5zI= These functions are declared and defined but are not called anywhere. Signed-off-by: Nikolay Kulikov Reviewed-by: Andy Shevchenko --- drivers/staging/media/atomisp/include/hmm/hmm.h | 16 --- drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 19 --- drivers/staging/media/atomisp/pci/hmm/hmm.c | 41 ------ drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 139 -----------------= ---- 4 files changed, 215 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..fd40e64e660e 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); @@ -981,102 +941,3 @@ void hmm_bo_unref(struct hmm_buffer_object *bo) =20 kref_put(&bo->kref, kref_hmm_bo_release); } - -static void hmm_bo_vm_open(struct vm_area_struct *vma) -{ - struct hmm_buffer_object *bo =3D vma->vm_private_data; - - check_bo_null_return_void(bo); - - hmm_bo_ref(bo); - - mutex_lock(&bo->mutex); - - bo->status |=3D HMM_BO_MMAPED; - - bo->mmap_count++; - - mutex_unlock(&bo->mutex); -} - -static void hmm_bo_vm_close(struct vm_area_struct *vma) -{ - struct hmm_buffer_object *bo =3D vma->vm_private_data; - - check_bo_null_return_void(bo); - - hmm_bo_unref(bo); - - mutex_lock(&bo->mutex); - - bo->mmap_count--; - - if (!bo->mmap_count) { - bo->status &=3D (~HMM_BO_MMAPED); - vma->vm_private_data =3D NULL; - } - - mutex_unlock(&bo->mutex); -} - -static const struct vm_operations_struct hmm_bo_vm_ops =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 Mon Sep 28 23:55:42 2026 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (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 44D9447FB1C for ; Fri, 14 Aug 2026 15:11:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786720291; cv=none; b=jkb4Ubimpu9GfJ1Vbd7mzuqpNaF1/oyWbm2Nr++w5fhWA70p+0RKi/7381WPPPibLUtgKUQvJIRuA051rW8liTiyfuJx+e07IU6TGAQf1QjE4pdqz6x3dZ7mh4akoRTkDTvy5VhRtlocK/eWWa7eN69vW+UeI6bqqrg5qc2dHLc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786720291; c=relaxed/simple; bh=Zb0JdRTTBpBFvd+zpRkd3VNQu6Q9tb1qFNVb5sh9jvk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=O71+WiPpcxl5aJ2fY3ICI6LSTYizEJ7ZZZuj+4HS3C5IYqJWXIzVUImDnr33ozGEf+dnwnQWb/MM/vuRvpHSlZJk57eIck90yUzSIZoUbNYQMR10p/h3CQHwd8RAGb4w0psaVObD3+b2emfOa9eFcOwRKQUHmR5Hx1iqoqKrNJw= 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=OSGh6Tn7; arc=none smtp.client-ip=209.85.208.172 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="OSGh6Tn7" Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-39ee96f8047so7944211fa.1 for ; Fri, 14 Aug 2026 08:11:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786720287; x=1787325087; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=JhSnA/jaMSVMwo72ij4kRp0HfOxnSGz5aEjAkXrBOFU=; b=OSGh6Tn7oZqt5MuVEOC4jA9feE7WVDdYqc0//pDUbZ9RM0eAQ4Xd4oiBcV3l6P7T6o pF7M1Xrgt0lYxBsQI1bgFKS4ePASpbYq/d5yxy2XMbhLeFdzmKkJ4MVrkHE9+JOxo7HV 99DF5ZI206G3iEgJUUQYOjSv6/Q2MiYNVs3dYUBByHiRWw41wL4X2mnC/wKuSdx9v7XP nN/6t2RfMGOEDcBe2Q/nbeT5nKJMHVZXdx6IoaI2Ewrxzf2CbjsPrteEcP/7GZIFRdp2 xBqGQ7fI/cwJmoGd2hP/vpsjQyBQ19CZqO/hZZ2WQfIwfQmYQ8NgBv7srN7GXqG6K/yE su2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786720287; x=1787325087; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=JhSnA/jaMSVMwo72ij4kRp0HfOxnSGz5aEjAkXrBOFU=; b=Pe93XNXexZxtlF3doSJa4dCb6OWtwf22TQ7w+YrZ5a+iD6qwKNXy9DBMXuOcg9QCwH Lg5JiQOw/rMJk/pAiuTpOj/QyX6eL+7Trjg3phV7+cmgL/fbeR6Mg40ZNmuFhWWS43wP zT62XUjVsWvR1MtyFAhRev9gCWI3OPSuDWGiQ3Cbl0POv9BGltfm0BR9Pm3i5TtFvm1Q 7BR98zkqu2xGWkg1Hhwwqsjexa6qtQ9z42ykj/uVNEKHKd6XRavQeEtlz6D/sxKq0w8W uaI0BCUARZromKIy0jQ4qjnDYDLZodAlHnP6CO9s9yu18PzToGEQOBg55j5pVuJGPY+f 55SA== X-Gm-Message-State: AOJu0YzK9tlNikPleUpkGIvcU2QLlcHonuxxZKExXOvVq0J+tgRBKk3l qkkOYvlJgjcbZjx5S1SRVeKc6g+4CiPXXaHaquDB5vw8bOKK89LhG0FmavzGEQ== X-Gm-Gg: AR+sD10vVlVpYEKQl5PwfnYDTaC48WcGgSu4sGr7LLpdYuqI0yIV+tGiVtIt292rVNC 9Hv/sPMfZJ31xHqKWZgEPfJI+tR8HiR47CjDAQkQAnsjqOGFeOkxdrZJFJK7FZtqRHvjhNkqOpD hoyefDskGn8CB3tt0cfLovW3ramBT1NeWxfAYNbkqFnhxxntJYcaZW5km2cj2JEc9bY1RoXa5x5 /HB3gCxoyKJMS5PaO/np+4noMgymkMBUTNEvBA8UE9QFTAyOa/xCWMLQawdh5CBH/E78DQDts2z MtXAuVrxzsmps0UO3v5HfhNuiPgk6NpA0v+omp7QDtPLQambUxpDj6CwbaMkVicI4ijuJuYK6MP C1Hv+9YwzPRv7RqjtX4klBsKlVDb4p6jwp3nJJK4FM9b7pm7xegCOgTCAONbH/8v/KBFpXLQyRG Mia2+26BS2xBcZDF/zF3DkWknKbxgRutZyTGdBxn+806ZGRj7OmNhTQK6VsBjMUEA8N2U1Vw== X-Received: by 2002:a2e:be85:0:b0:39c:8124:93b0 with SMTP id 38308e7fff4ca-3a1323d507bmr6746051fa.7.1786720287081; Fri, 14 Aug 2026 08:11:27 -0700 (PDT) Received: from [192.168.243.250] ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3a130d204b2sm7138251fa.41.2026.08.14.08.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 08:11:26 -0700 (PDT) From: Nikolay Kulikov Date: Fri, 14 Aug 2026 18:10:09 +0300 Subject: [PATCH v4 2/5] staging: media: atomisp: inline macros for checking the bo/bodev pointer Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260814-atomisp_remove_hmm-v4-2-c3c954a12b51@gmail.com> References: <20260814-atomisp_remove_hmm-v4-0-c3c954a12b51@gmail.com> In-Reply-To: <20260814-atomisp_remove_hmm-v4-0-c3c954a12b51@gmail.com> To: Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko , Andy Shevchenko , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, Nikolay Kulikov X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786720280; l=8419; i=nikolayof23@gmail.com; s=20260402; h=from:subject:message-id; bh=Zb0JdRTTBpBFvd+zpRkd3VNQu6Q9tb1qFNVb5sh9jvk=; b=65vpxuAVvuqdRi/k+3qLyhNb5H++kFh8R8LHKfTviMxK1fGP2z3RoVvectNgNU6hv6+rA3Ccz 3meV1B1nqTFCFoON7mmV2W7gi6jIZODVXXwUROxYkhCLi9M6/T/OnoH X-Developer-Key: i=nikolayof23@gmail.com; a=ed25519; pk=2GWUU1isl5NJpkwSCQ4OG80EinZ3EUZXlrgAg6Pz5zI= These macros perform a pointer check. Replace it with direct conditional expressions to simplify the code. Signed-off-by: Nikolay Kulikov Reviewed-by: Andy Shevchenko --- drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 14 ---- .../staging/media/atomisp/include/hmm/hmm_common.h | 6 -- drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 96 +++++++++++++++++-= ---- 3 files changed, 76 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 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 fd40e64e660e..9b29b6381abf 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); @@ -653,9 +679,12 @@ int hmm_bo_alloc_pages(struct hmm_buffer_object *bo, enum hmm_bo_type type, void *vmalloc_addr) { - int ret =3D -EINVAL; + int ret; =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); } --=20 2.55.0 From nobody Mon Sep 28 23:55:42 2026 Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (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 24F264772AB for ; Fri, 14 Aug 2026 15:11:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786720293; cv=none; b=dmI3mypwcaHl2SbAuq8qT5P27Qdxrg0O16d2fe7ibmsAIeG8HOneNi2wM1U9EEy+FqdXguJBqZzjb3xi4rSL643OIrLVU5ixiaOIpohGDiTTe+V4R/9qGFenAOcvYjXraWdmkXI7oySVwGsUUoAMoOeeVx4pux8vG5U3T7UNIYU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786720293; c=relaxed/simple; bh=DOnPf8mbkyDpezzGvvZK9+aNOSxPc/LfJq7ezpXpACc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pClqzbMMv20eBmsVVnzuUT0g41aOmgy3ZjnHWcSbuTJpOz+WYF5gHRXq9GzoRNVUAV92HZdetlqyDIZWaFE1TGnmvRk3ax9OfyiRnCNN2kZrlAP3XHslc3sp8EGisrQo8TXua7RsQiZPyrhMm1OSWTJC9VzMhu4srZUH6+5P6gA= 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=WbQfh2j9; arc=none smtp.client-ip=209.85.208.174 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="WbQfh2j9" Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-39ca300db70so7491641fa.2 for ; Fri, 14 Aug 2026 08:11:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786720289; x=1787325089; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=zjjx4OZPtT3/3k2f1Byd/EarM4nIT+IrMxJaUq8W3q8=; b=WbQfh2j9qFVCibW3RhtKlAr3tZ6ns/45ZNAfBJ9Ki0SACo8YMjaAiTOx3b2fjbehaw G8caqLMZbJ2zKSv8f7SSOPOx6ZiPCdXSeVPVFijps3sCIvs3Lv1um2Vv/4gWHyqMyavb allg3PPlIz1XYov5KgYwII4nSuU7uP7witj3YXwuh6nY5i3ywEOcmj964CnDi33+I0JC PfOgn2J4y35oEyC/QD7/OOm4QNYKifPjeErFnYLNlFTHd64/OKEETZHGzhuP75iKmHUQ gdAgnjllPsqYPPg/XX2fQNIb465GvL4nlqBUgAsqus3JBwH0FjF4inwFHoQwC1Fd/cl2 t2ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786720289; x=1787325089; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=zjjx4OZPtT3/3k2f1Byd/EarM4nIT+IrMxJaUq8W3q8=; b=aSFn757bJ+W+D06wyjLMSFEhy9O5WtxshocTRIE+NDu5b0nD/Rbdg3DSHnKQeZ//xv 4Bw2Rm2ZJ/+SL1hpHrjGWCxUfIRctlrh+DPoXCx9YAe5zUB+oXDvaowT7r5Iht4x7JoT tmTQfF7boARV8zcSYumkOWlNqXMfq9BAAMBy5sRM97KF+4XY9vum9LdYl2qVVDIs7aUx gWTS+eL9mGiLbn9/wrmD1+7igXpGomGn38LI+7BjKP17o2YEFiRFli7trzOzMGwS06/Y qSKHT0ISlgDh1IV0t/eSmO4p+O6lwRtJBEISydbaCzAslguzAt6lMFwMSe8YUNlJYF4h ENhg== X-Gm-Message-State: AOJu0YwneEfQV2HomcKvwlTPiJk6BKD97/2C+mKRY4YAcqrwZZFUgg00 q0Mz1GbO/V47wHR6y7ZZVOwozjw9eF+EWjPCx99o5se+PumbBe/TK9Da X-Gm-Gg: AR+sD117iIrWgxadargSrQLf3RFRv24Cgi5/rrl3hPqMu/qLGJSTfDhjI3dkKrXH7OW dXlALT9a3xquwT4k6t9a2JeSC2tJdIY4z5X/x8dfSXFj4DsOQP1ErdL7OiKdV1ms3g5i3AjL51Z xHo5nCdoeRPvl65B4ROXwLCnoo9UdCRt2F8NDT6Isu/HxCn5Dmo89Wdz7JCgU9gARDHnWs2KuK+ TLHxt0e831Vj3ZkZl2kjF6mnIFmLR/TsGP4PoFhdEXLYvM2brQ7EqbooZh1z+Tp4dJNlymu0Ejs BmhZHF13RM2LbE2C5tJCAWSrJqZdyxC+++BUnGBMLVjuBCIAQCnF88u66c/MGHEX1fdThvE5nC7 MsYVmubSllCzt6C8lqQEC22yBHgVjJLog8sR5kQKF/PmamPqh6e7raTjhORteDPRpqsQ77j6jwt aok6Ba1cWzZ70VPrW/a6/4yraTuTeKTJtAAsz+KaHqwhUw/eI27OJ8+efhyhrbXScmjYDx6Q== X-Received: by 2002:a05:651c:54e:b0:39a:fc8e:84e2 with SMTP id 38308e7fff4ca-3a132400ebemr7614641fa.7.1786720288952; Fri, 14 Aug 2026 08:11:28 -0700 (PDT) Received: from [192.168.243.250] ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3a130d204b2sm7138251fa.41.2026.08.14.08.11.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 08:11:28 -0700 (PDT) From: Nikolay Kulikov Date: Fri, 14 Aug 2026 18:10:10 +0300 Subject: [PATCH v4 3/5] staging: media: atomisp: inline the check_bo_status_*() macros Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260814-atomisp_remove_hmm-v4-3-c3c954a12b51@gmail.com> References: <20260814-atomisp_remove_hmm-v4-0-c3c954a12b51@gmail.com> In-Reply-To: <20260814-atomisp_remove_hmm-v4-0-c3c954a12b51@gmail.com> To: Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko , Andy Shevchenko , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, Nikolay Kulikov X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786720280; l=4285; i=nikolayof23@gmail.com; s=20260402; h=from:subject:message-id; bh=DOnPf8mbkyDpezzGvvZK9+aNOSxPc/LfJq7ezpXpACc=; b=RlSiFB3sQfxO1qseXHX0zJ0Y/1QZuVJ0b3dKk4O/FhFvRxE+JcScDlvY+NmNXcuyxJsFTEXli 7N5fM3sFtZfCHPdWqniuC+xuqwgbR1wgUK5CzEqXMKuT2M42LlXxyjW X-Developer-Key: i=nikolayof23@gmail.com; a=ed25519; pk=2GWUU1isl5NJpkwSCQ4OG80EinZ3EUZXlrgAg6Pz5zI= 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 Reviewed-by: Andy Shevchenko --- drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 12 --------- .../staging/media/atomisp/include/hmm/hmm_common.h | 18 ------------- drivers/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 9b29b6381abf..46ee077026b3 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 Mon Sep 28 23:55:42 2026 Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (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 08A45480DFC for ; Fri, 14 Aug 2026 15:11:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786720294; cv=none; b=i/HCI44Ec/JUaYZm8JpWgNqsCE7QXfruiHAVQatxYdskLiKxY0kRofl55KDSDDlNWgtOrNNInVwghf92zRH6786E9mR+e5pijtYbKuPpMDyz/nq6afV00xFkE7HrNqjnZjaAgv8WDhTSvhvINfbM+bQDa4XC1dIY51k0LvCv51M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786720294; c=relaxed/simple; bh=Av4Txgg7GubX1fn2pw6x+d0xJpGMl6ZoRGhGWtZseLI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TDAtGsRNz6kKI19X/PiYWjUC8GdZji0Su6xd40WoPvLfb/CNsu5AthVxMWBBE5FOuZeD7kO0U2vH92GPW0UnB3OAjH52EY4e3oLb03t6BAp1WSXZipPTWZJo/rLunPhSkkr9gDV+Q7TE8pzXx98q7jC122RQ5rpyzOl3g257toY= 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=SBC4/AfI; arc=none smtp.client-ip=209.85.208.170 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="SBC4/AfI" Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-39f20d19895so7663031fa.2 for ; Fri, 14 Aug 2026 08:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786720291; x=1787325091; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Wc6Ml7BNAlh0t75KbKQHb44jExGL01omSop7wpIJVpw=; b=SBC4/AfIFar/va6FASmElX3CLMrxe+CFNS/SBjuZuqX4l6CivzV7NNLGW4Y6+UEmId Y4ihtqPRb3MvA9sxzqhSe7cPOOl+i8IH56lPLGFNxtokEjBBd9eD5G88vCHuXN3W3xsu eGLLbBdu21G/aPHdj8PjKubTt4PQzz7nZRq2myWong77GwE9mSVwEmNOA3tO2IL5xeqI fr4XaDRXVPXAViusRb3U26BmQcaAZX/kxxgGZqNXmeaP+6hQSzkMyicnun9Y6a9ARIyR feIRdX3PdQcKM7dDXk9Gvz0kBd4jDfx6mqzzXqsh+Bbszrkw5jqv/zG+2HgDTSvf65tH cg2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786720291; x=1787325091; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Wc6Ml7BNAlh0t75KbKQHb44jExGL01omSop7wpIJVpw=; b=Lbg0jZlnzSvTOMJnwk8Z8XnZrD/dPwSlj7hrlq3hfRDhqKvyJiSvz7kG7q3Da88hs9 EZoNOEu1MhGMVwMVHIpDghGVzUQkd3PbSdhzNLoQy01o2lZmxk7XXva5JPbYNr7cOtdm S8ZMHJJeTLPKiiNKZoFJcHdHq0hyXUeaM9a2gHJ1Jn9npsS75ntZPj9tKuvjxPFQyX/J 9wQgTdpITNiygbLw6MmtfhvMTeOhk9mQap3WT1wVU2SgsNNnLQTkXYOtAA5TbJ9n/lJa OUqYHW1sRIJjLUbzhbgQYkSavhsJuR7wqYQRqoOG6E27tdOU4H+HWpczLPi+fos02hOu MdOA== X-Gm-Message-State: AOJu0YzqWivOu0pibYo5wmceh3Wf+lhxn4sOF3xHbVZFZZo4aj7E4aWv W59F4llx1wU8753LyaoQqvPeWjaOPUzqZQ2YHUJL6X5oytIzNW+cSFDu X-Gm-Gg: AR+sD10wpHGdDOKm8dFKVRs9s4N4yWrBd2taqDHLZbf2DLyoAZwHkjMHP0axxC2/+Pf Ejv3AdRnT7KD6XG+vV4e/GHBd+UPj/p1PiQnOU9TjxTQr0IhGjLeKGKP2kMQLOqxXxFqC+dTvsz Hfe2q5H5X5avVdT8hUU7f9XGUsK/rZCwzChePOJABQXI1LGTevEerAIrgmWb/Twy8xiaSxLus+4 aXQl6XHhlPELFAg0VR+X9ZSQce8rBIyK9qLEWHMrNk+lc2XEKDKzvUdNPS7s8gkYQXEwJTvnan4 Ox3nH41Qz4Dg7qL6JfiN6yPSuD8fvZ6HG+l1Dxf7swMUE9sIuUT/vMiMQIUrUO0IZNZ0whkkmUj jG/ebAgqVMfgBgj6i2MwL8WOt+UPm6Rn6Y+8eK+CMiGdh80cWNt6U7yo+LHkrxzM60gilBEvUAa v9lc+4vTO88CPJy3Sg2PvQGEEzCum9u+KvL+gvrji8xeSXeTfVAstxKk7S4/i/QPsYTvaUox1jI PS4eyXb X-Received: by 2002:a05:651c:b0a:b0:39b:53f:bf64 with SMTP id 38308e7fff4ca-3a1323a68fbmr7660081fa.2.1786720290746; Fri, 14 Aug 2026 08:11:30 -0700 (PDT) Received: from [192.168.243.250] ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3a130d204b2sm7138251fa.41.2026.08.14.08.11.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 08:11:30 -0700 (PDT) From: Nikolay Kulikov Date: Fri, 14 Aug 2026 18:10:11 +0300 Subject: [PATCH v4 4/5] staging: media: atomisp: inline the var_equal_return*() macros Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260814-atomisp_remove_hmm-v4-4-c3c954a12b51@gmail.com> References: <20260814-atomisp_remove_hmm-v4-0-c3c954a12b51@gmail.com> In-Reply-To: <20260814-atomisp_remove_hmm-v4-0-c3c954a12b51@gmail.com> To: Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko , Andy Shevchenko , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, Nikolay Kulikov X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786720280; l=1906; i=nikolayof23@gmail.com; s=20260402; h=from:subject:message-id; bh=Av4Txgg7GubX1fn2pw6x+d0xJpGMl6ZoRGhGWtZseLI=; b=dE9wd7JjpTCgCPbE5Hj+FvHlcNkTySdIW9izprGGUKKEdgLxzPRdBMizV/HzFcszENHedCJVU FQCPt8RmfzpBWyJFa7WIWkO8mSqnnftYgzGe+Yz5iPyhygRothC/ll7 X-Developer-Key: i=nikolayof23@gmail.com; a=ed25519; pk=2GWUU1isl5NJpkwSCQ4OG80EinZ3EUZXlrgAg6Pz5zI= These macros check the passed variables for equality, hiding the 'if' and 'return' statements; replace them with a standard conditional to simplify the code. Signed-off-by: Nikolay Kulikov Reviewed-by: Andy Shevchenko --- .../staging/media/atomisp/include/hmm/hmm_common.h | 20 ----------------= ---- drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 6 ++++-- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/drivers/staging/media/atomisp/include/hmm/hmm_common.h b/drive= rs/staging/media/atomisp/include/hmm/hmm_common.h index c406fe8b1345..029620347302 100644 --- a/drivers/staging/media/atomisp/include/hmm/hmm_common.h +++ b/drivers/staging/media/atomisp/include/hmm/hmm_common.h @@ -12,25 +12,5 @@ =20 #define HMM_BO_NAME "HMM" =20 -/* - * 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) =20 #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 46ee077026b3..7d0ef0f9eec8 100644 --- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c @@ -396,8 +396,10 @@ 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"); + if (!hmm_bo_device_inited(bdev)) { + 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 From nobody Mon Sep 28 23:55:42 2026 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (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 C4F07481A99 for ; Fri, 14 Aug 2026 15:11:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786720297; cv=none; b=rAxbRgvmLhbaGr7b8fIzPv7w25Um0Ygi1YWdDMNquQmwL/uQw8gJekKQFioe50N4pp0DCQWJ0AomtD/BN7qpAFSwaewK60MD5RAmpqO7OQqEVeQO7qFK5uC/jyqA8Zi4oYhZTdmcons+C2fhnFbdHvsoA78BLBlsAfF3TgeMJdQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786720297; c=relaxed/simple; bh=XsU4KkXrbGzK0QK8y3CwxsLorSCvlWH6WhdpqA7lSP4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nyUm6hO1N3vfJumW2cZfOiOddjoRqJ45bG+dsQKFNw2IisiIQ7VH+KQJ3kJj3oMfjizA9+kH29fOfyZxcVQzxCM3WlYo72JlQwGfBO4kSUxn4ddjvY0am/aLYParmcjhB31l4M1LLf6d96YQ3RXxkTVQCeqFNmP8S3wVU+VvJ2E= 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=lmbauBgp; arc=none smtp.client-ip=209.85.208.181 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="lmbauBgp" Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-3a115c08b0bso9613411fa.0 for ; Fri, 14 Aug 2026 08:11:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786720293; x=1787325093; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=74afaLSqgvu8r2wfuVQY2p6CPs0wjD5M9FZY2Wu7Cjg=; b=lmbauBgpTLnRRksN4bhw9H1ndJVDljoDuGS6UEj4i6cvZ2u7In47iBx/mFM93TpBHN mpIm2z5mGVcC9Zxdib4djiMLEs4VwpzrWC0fi9rlzkuWQlgmtTl9w0BFwPMSJyKixpK4 XxdTyZzkvQCPYPDkm8g27ZswiSK6FZPMUtV+NVZFwS3qA9HhexMb1kk/VFVJGCuuUaWv 1hGWX2oruuELhNSBsHAooECvdg/2ScS9pApUmA7KHR8sew+3koXL37NtGLciL5YhxYcQ 3gz11tpn1BdiAv3lwKYcgCmch5zRVd0S/Jra+PNDl/cKrRwuc66eWhhuwjeAD8d1YHUJ D/jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786720293; x=1787325093; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=74afaLSqgvu8r2wfuVQY2p6CPs0wjD5M9FZY2Wu7Cjg=; b=IQy/4yENaeKYriPEjay37pPNcqzWRMImbkNm7Ye0SHgGetCkyD0bMKrltn2BHbdRmj xAa1IAH0qNX6WJVgRkbDTvwPeCtH3ORiugi4gH1QSeq4k4DQLIlFu5J2lF2EkjrjnBaU 11IKn3YbGxp8GHsByLZP/OThWDUQK6h3d+0tccla4QmZ7j9+YK08UIg0Mz0+lMpC78QJ mt0UvR9cXDlMn4uAMInvIpIciYsuLuFgAgRVlMbba1fEpFMUymoBN0jHJKsUu4IWm0CT DfbIp/Dre6H1aA1bHZl6vW4/0a7jtXl0YBniGlN4SoUHqvIlEVfhFLiKlAaT9naU7tlq Anpg== X-Gm-Message-State: AOJu0YwH6ngSDOAaUEFKNwGiE3gNyzNP6/LYqIDlf2N7ucQgpW4XLoAW qpQ4EMX5FpQtxVKzARMwLF688zh6BYVovy5nRmm0iDoeHgihEU2bkOoV X-Gm-Gg: AR+sD10KedNyzQgqczi6RjQm35ynkbTm3cji/XqfcI/dU1vkHNIhojqWaIVWqdlJs9r BEm3vkWyoRYgEWMs/S8u7spekcbROSKUrV0k6AzopIqM7w0pquVFdKZTlmELQ+qO5PFDIFsgLSv 42t/ei3vO5JDoPWxpUEYiTFQNyswTRh2eGUirULvi8sfER934j6ObgBoRWvTQK7uaaTB8dMExMU WVJutBsAyOZhP/Ns/+197EndYPvIskUiYS3GZZVZujGMKZYVuIV1+RlmAnRSPRQn9oPfccleyLt hYQsl3bEaFz/4cL63ipYt8choxQp1af20i4FAdJsVXQBImIupocEJExQtruRffQqIMYf1i/cyst UVnFhFlmqtepHQ3trT3rwVI3T7YrGmDsq1FIlBER2tAJzd61XB/n5RCRIPAVFJECzqeBR6Tq+kv 38RmCIZNxagnd++RmF+uKuwdJnEzcWPw/1HObJ3S2XBhH0QkYseWiYpo2qAX7cq62z9TEBYQ== X-Received: by 2002:a2e:a986:0:b0:39c:8c37:bfa8 with SMTP id 38308e7fff4ca-3a1327dffdbmr6928051fa.29.1786720292737; Fri, 14 Aug 2026 08:11:32 -0700 (PDT) Received: from [192.168.243.250] ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3a130d204b2sm7138251fa.41.2026.08.14.08.11.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 08:11:32 -0700 (PDT) From: Nikolay Kulikov Date: Fri, 14 Aug 2026 18:10:12 +0300 Subject: [PATCH v4 5/5] staging: media: atomisp: remove hmm/hmm_common.h file Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260814-atomisp_remove_hmm-v4-5-c3c954a12b51@gmail.com> References: <20260814-atomisp_remove_hmm-v4-0-c3c954a12b51@gmail.com> In-Reply-To: <20260814-atomisp_remove_hmm-v4-0-c3c954a12b51@gmail.com> To: Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko , Andy Shevchenko , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, Nikolay Kulikov X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786720280; l=2496; i=nikolayof23@gmail.com; s=20260402; h=from:subject:message-id; bh=XsU4KkXrbGzK0QK8y3CwxsLorSCvlWH6WhdpqA7lSP4=; b=2LUmSBJW769o+AgUiECvrtfLA+q+wU99S8oMeQTRu+HwABsH6lGWQxnlolf168u87nviYhmFv RA/PMbCUK3YA24f6AF9R7gOHbKh9vHta4oTqV7OWnE8MmjEfpJ5kYap X-Developer-Key: i=nikolayof23@gmail.com; a=ed25519; pk=2GWUU1isl5NJpkwSCQ4OG80EinZ3EUZXlrgAg6Pz5zI= Now this file contains nothing, and we can remove it and all the "#include" directives. Signed-off-by: Nikolay Kulikov Reviewed-by: Andy Shevchenko --- drivers/staging/media/atomisp/include/hmm/hmm.h | 1 - drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 1 - drivers/staging/media/atomisp/include/hmm/hmm_common.h | 16 --------------= -- drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 1 - 4 files changed, 19 deletions(-) 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 029620347302..000000000000 --- a/drivers/staging/media/atomisp/include/hmm/hmm_common.h +++ /dev/null @@ -1,16 +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" - - -#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 7d0ef0f9eec8..c26038be76b6 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, --=20 2.55.0