From nobody Tue Sep 29 04:10:12 2026 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 DA2B83A9D9D for ; Wed, 12 Aug 2026 20:55:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786568128; cv=none; b=GWDSysvwTJR05KUoXJZxBKbD9HkEu2Yl49e5zSxL2eqz8xrFWSzrpozHP/Z7c10Wv27gGa6bFABVwW1zV/PDHCAwuhKXkwKjVEE+V8S4phcZyQ1IIxl0oA8S5neZLONiR6GqL7uzRe0S4sZBg7w4BvrhWQsMKy9wh2mysly+zMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786568128; c=relaxed/simple; bh=FOycCqunyoZT8bgxjzlkGYKt/0jU9FcTV7Q7HQv2ThM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m1Rvj2Mn+vL+Pk5YXAufR7FH/B/zNGzrxcrJVP0T/K7vGGHBhBURVpwUq1T4FG7B2Kx9lzdKCVKVPXx4bFshYH0lsp5Q4tj/W9lwUvbxboWPk4+JERmeKPOrp3zl700VjGSHM8644zPy9pmAc4XDPuKUyykuDdzENtoIhcYfLTc= 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=OGl1XmWx; arc=none smtp.client-ip=209.85.167.54 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="OGl1XmWx" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5b015b2d792so1238485e87.3 for ; Wed, 12 Aug 2026 13:55:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786568119; x=1787172919; 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=OGl1XmWxG4ewYLrAqqMct19jvXPjpnj0tsZDIFeJJIWZJyBALrnDz5R4ryFScshGSI MwOXnGBwhP0EfOpp7y2yFqGPgq8nqYtGDEICN69gP5713E140KXooVmHoO5ZwbT+5Tq9 NSvQx5Zq0svMHhNLWYQnHPiAIv8YBB9Wu/QoNhkzb/EFBKgHXbtUnoDkXLNqq3f032yN R7qGqk9Uv2odmwD9fdgzkYvzNaRdbz8iP6KwmY7a8CPUUtV6GRvadIMbf3R6c89eXNhI 5smQyO8ljmpcKUMhsSQ5P9UVz7/rn+tNZZZPmG14SKTKFHfrdXZhKz69lT5vTGvll5an WD2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786568119; x=1787172919; 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=dooZDm1SMRvJcew639CKa3f41Gi6MaGWQ7Hns2j0yjXoUVIvWj4Zz8hT0dsFQiVLKD cHNfAcZsFeRtu6/eSU63B0g6IPxMz2XyemGogsfhVZ78MT4ew0Nlk1cnsWgntZdXCjXW fHx8iKvhv7t4qAjITnLKh5VK5Rata1nFUOQY0uHAT6cxHPjn1WlWetQbjvWHIKGyHy4I RzkizfDAWlJ8EoyVwoPoSPFFYTnDQ0DSBCDgME+N2oaU2wzIczLitiSLB6lkKxUnNKDo LyVXxSN4yq6VzlHO5r5qy1Tn5/E67Wxxh+ygOXZtj2KZ5GjXzf4atKHr5ug6Fvlv5kxe qstQ== X-Forwarded-Encrypted: i=1; AHgh+Rp3G4QfPb2WW/D1EYpHajv4og1hVH6KsmSQ45gtJoIe6EjH8VH0/4Sk0tGDZv8VKTUNh8o4H6z3pJL/P0g=@vger.kernel.org X-Gm-Message-State: AOJu0YwDpbDEVEpl7e0lvhtAM7eG9I1Ml4b/yqYptFXrZJbL+nYtQ3El KeSywASyFaaoBlLjgugIw7pre9Pmg8s/4paCa2s1fSjXXDdB0g7bKII/ X-Gm-Gg: AR+sD13UMK7jZJkOz6fUTIV8giKPNcvME4bfkmlyXB2s5OVSaSvyUI2pF89GC0Quvmj Jtd+JPXoWWcvbDowU3A+jwSu4C35cBQFda9feielApciUsTckzjd3mwIRFZhhslYDF2jSW/LiQ0 MLOTHQ+YkCxF7e6492FkR8Bycoa7ActjTEFFf1et9KJvhG4VOQJ32NJGLHs1t2T4x4c4sQSVI4x f/VdxDZWgjQiuZoCulUxj5u7K/Wg5rkpsxYMDYsDYlOVllCaHX4YKdxjxwynRWJpkIMyYasKDTS WJI1OpUIlQCxVUPjqNllmzs64qc0eZ445ckdEm6LOK15Fr8kpctXYtS0QiULI65IwBsWO+Cn7W/ e1l0UZGrYFvLGfqL8axohbByXQQWkaLoK1u0HE1ndc7SI8GadKIVmyJi5ENTZuIrrOtJZyuVtV6 sbT02bH7gaz3rx238pqugOyy2Ly0mgaRSWaFfuyTHzLW8+P2LErky9L4m5iHA= X-Received: by 2002:a05:6512:61dc:20b0:5b4:4c28:2249 with SMTP id 2adb3069b0e04-5b453f454d2mr38340e87.24.1786568118761; Wed, 12 Aug 2026 13:55:18 -0700 (PDT) Received: from archlinux ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b4539e9605sm60999e87.22.2026.08.12.13.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 13:55:18 -0700 (PDT) From: Nikolay Kulikov To: Greg Kroah-Hartman , Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko , Andy Shevchenko Cc: linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nikolay Kulikov Subject: [PATCH v3 1/5] staging: media: atomisp: remove unused functions from pci/hmm/ Date: Wed, 12 Aug 2026 23:51:34 +0300 Message-ID: <20260812205429.39181-2-nikolayof23@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260812205429.39181-1-nikolayof23@gmail.com> References: <20260812205429.39181-1-nikolayof23@gmail.com> Precedence: bulk X-Mailing-List: linux-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 Tue Sep 29 04:10:12 2026 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 6E10B3B47DC for ; Wed, 12 Aug 2026 20:55:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786568131; cv=none; b=Hfa6ndwcn4Uee/rWGjSaHDJDrNtrhvIgb16ezZRd36d++kCSqhNFZaO2kHNppyNUEL68Y70DGRboemJR5/9OzwO1j9K9W+c01sWad0whcgyD4X0FnrgiIc/O1nxKu4YCseyFu5I/S5UXNp4k8Q5sF9veHOwRJKuOowhx3Tu5AOM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786568131; c=relaxed/simple; bh=6wQICQWyKl2ibwonxaDxgd+QgHh/waAeDTj7EAFYDcI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GO3g4K9p+Rz86u/nySmC0+mj1/gvWVBhJNsliUotQJDmLZebR+JerscknagOFxluhaZWui7hV3PdItawvnsq7W57S6K9k2bk4Wz1kBhbh9Ihporcsg9Awq2jn3BXnN5xDUWX46YxwkqvNqUAymUlaX0peLz1mj9K/mBrSfV+vrI= 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=azPFjAkm; arc=none smtp.client-ip=209.85.167.45 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="azPFjAkm" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5aec201b582so50363e87.1 for ; Wed, 12 Aug 2026 13:55:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786568123; x=1787172923; 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=L9idjNb9qT7I+5v2/X0Rr3tnkcDS+t1O2ybb3dbA6Ps=; b=azPFjAkm3jDsOn2eJuVM9h59vURURxQzXbhDh14CluIARb1zHiyjV+2fnCYG6rsTmW dgIrBDfAak78k+4i8JMbX0nxOdx1Q0ZxiBSgrUAbs1B7dqz0MjnllRU1GQZoHKhcDrJn 8adJXtbNmYdxhciO3k6tun+oIRRI1eOEZIMBeYrCb2CcvdOohpZzjP24GLZDMgT9M9tu BRul6Rm6OFkb173X3/tshNKPCrNoSCFt5nhMBgzb/8o8YrGzZUuSbMob4Q2yxqqVG/cb fIdTlnSrItuROM3iFDSlN+RF1NGqByq9Ku/mMzpXgcRYj7cMizGfy/o6fp3HAKD4WtgJ uYTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786568123; x=1787172923; 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=L9idjNb9qT7I+5v2/X0Rr3tnkcDS+t1O2ybb3dbA6Ps=; b=D7jKlvLookNSDR+/OQ2pLG++V0e84vQkva3LwCvTOeJNqOep6/8EcLmZlytGbYDzcF 79KExQc8AqJVtXa4aFL2qJrobjMB6TX6DF14/4RkKUExQr847tzUMDWvI3pBmkP5EEQn fxlKNXYLOVfqGOURS9bqWg0/hIhg/ZwNNu/iBh1HixdkZt90wx+ohVnaggfzUcvEUjHQ pZCWquPm81ewwgmHO+njjER1/AkTWz0JauHNNW9pi36a5OzZMFH53BqQRk9F6tFnS3fR AB2vODjJRsfZCndWo3O9cgFMu5OM1ki60AifuCcBqnjarKMlPZVJ5q567DJ1DqwJdbHG vLeA== X-Forwarded-Encrypted: i=1; AHgh+RrAI3eSbpirODF1ILZ7+HtB0R07i1iNKOSYQmodpeNC/9K8EAxlJKuAw7rqReNKB3VIjihlL3q5d06qycM=@vger.kernel.org X-Gm-Message-State: AOJu0YyZ1lb/Y3rI+PLvFtm9UDg7vvnUHXtMKL00rZ3TZIJqM776nIXx E5Z7wVqvKVE9Q3PePzqr5acDUUUEAqusDYx2mZ5b6BWppf+zfUkxDyXT X-Gm-Gg: AR+sD13Jwr31hl/2s0tV/yiqBG4tpbkWis0OoVywhLX584H5E2Fx3ml68tY5lJVU5yl 4Bb0kPIttirFegm29dAA79xRksI6eZYmOJnsHx+4+RpMooC9GO8UMyDXEeFCiXzo+DFtHysgOCm ZbWGJFMjlOZsSjN831Mfz7YYKQuFOY8ocEiWHcWfF/nVmqNlx81myyVyrsK9dt2xVFC8fUkJGsA cARTrYSxBXH0XuMPmStKLeMjtRUdjYTGFAh2wcnyW+gn86ORYGUoADAt//P9WBrAwhK8scDpm9h dOjUPHMsRSYEFWpgQC2vcP6SXg3PnPoYvQ1rEIcnV+t9jiRZUEBnDv1ZPk6Ag7EGQEQSrkyUhzc s8jiSdGUX+rRWakhbR2ZTYEi8niMIYqRZzqrPuICAf5IFP7luIS66gTaNfpufT1JFoIpYGI8DFi FV2//7e3/pQ6b25sCozdqVNcmZaGXGhXncHsMzYkLMSxCSLXdvtmBzZaNQVZgjLpODSzenVA== X-Received: by 2002:a05:6512:8383:b0:5ae:b6b1:5fcd with SMTP id 2adb3069b0e04-5b453f37160mr41200e87.10.1786568122505; Wed, 12 Aug 2026 13:55:22 -0700 (PDT) Received: from archlinux ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b4539e9605sm60999e87.22.2026.08.12.13.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 13:55:21 -0700 (PDT) From: Nikolay Kulikov To: Greg Kroah-Hartman , Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko , Andy Shevchenko Cc: linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nikolay Kulikov Subject: [PATCH v3 2/5] staging: media: atomisp: inline macros for checking the bo/bodev pointer Date: Wed, 12 Aug 2026 23:51:35 +0300 Message-ID: <20260812205429.39181-3-nikolayof23@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260812205429.39181-1-nikolayof23@gmail.com> References: <20260812205429.39181-1-nikolayof23@gmail.com> Precedence: bulk X-Mailing-List: linux-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 | 112 ++++++++++++++---- 3 files changed, 88 insertions(+), 44 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..ecd920e49488 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,16 +990,23 @@ 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 static void hmm_bo_vm_open(struct vm_area_struct *vma) { - struct hmm_buffer_object *bo =3D vma->vm_private_data; + struct hmm_buffer_object *bo; =20 - check_bo_null_return_void(bo); + bo =3D vma->vm_private_data; + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } =20 hmm_bo_ref(bo); =20 @@ -961,9 +1021,13 @@ static void hmm_bo_vm_open(struct vm_area_struct *vma) =20 static void hmm_bo_vm_close(struct vm_area_struct *vma) { - struct hmm_buffer_object *bo =3D vma->vm_private_data; + struct hmm_buffer_object *bo; =20 - check_bo_null_return_void(bo); + bo =3D vma->vm_private_data; + if (!bo) { + dev_err(atomisp_dev, "NULL hmm buffer object.\n"); + return; + } =20 hmm_bo_unref(bo); =20 --=20 2.55.0 From nobody Tue Sep 29 04:10:12 2026 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 935613B4EBC for ; Wed, 12 Aug 2026 20:55:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786568139; cv=none; b=OGnoDUXffwi3bW6lxy/p+0DnuwE3uLCCY8JG89S7vOcyz5eDJT5i7wLXbG+nZCpHj4GzV5ooQoeRKJcE8VivtZXk+HUDLtfzYm520S+VmJbqmGTR5G4P/nXc5cPvDHv7uSw2L9AkRp6DLTLQsiBWK7ufW35njdy39PRNW/wDaHo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786568139; c=relaxed/simple; bh=N7YavMIxn189yOCIt8BdETPEDeHw4RDxuO0Znx6qmho=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ev3aZuf+JM9RVFXQYT2a6QTg+hGitMtHGQutOl9pkWfgEkt1eM67D+rN7gEbCD0UkKPcQB/ZD4LRy44IBZhFlYUm5LN+tazMoqRJlE6lLesAWGXD7vGlPsV3DK+A8BRNRHF4AqINkVvx0qjHThZnOzXcn3kBX/PfCJSaZ9NqKdw= 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=ZDJZ5eOG; arc=none smtp.client-ip=209.85.167.47 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="ZDJZ5eOG" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-5b0f19bea2fso1802692e87.1 for ; Wed, 12 Aug 2026 13:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786568126; x=1787172926; 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=id+z5c34tokzsRgaGzBKaJJ/gVoWUF0wZyeg82CjYJg=; b=ZDJZ5eOG0YGhZAy9L3nzUtLrcINZKIvprA+DlcvTOu3vNA/izhBXmTotxaAAL5Weyv FA4MIlLIRkL8W/KtWlugW05WNSlyviHjzjp+R8aJq76KINvk4m+MYWirD71liPrHhYjX VTm9ET8zQuqO4R3OG9oa0xG8Dx7dVMaAG6raJTCXWIoVjeA+vVGKUIIcwEQHg1JZOKxT HiZL7h1RIjWhA7e0PNieMmvxxMjASTOJR2oZre2+4gypCWdieToEpQDxXVggQMZ98+IW p1079ryIHKwHrt1wywBkUAcgH6oU7zS8DCrSRVG9G5DVTpoX5bL8LisLATC9WejvThrS HuCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786568126; x=1787172926; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=id+z5c34tokzsRgaGzBKaJJ/gVoWUF0wZyeg82CjYJg=; b=RWLM1S6KZkjJVNPjtWvls0FBqHogrSQRcWpgxMNyYwHE184cKNPsI2zBw//GM91UvH PFqZnvEmtIYvxABoTJyIam23ZQUzXHV6okLVIzaD4uKDpNiAsh1gZImp/okj3vPn8GUX fZn45KzPQWXHbata1FRfZxsa1c7ahuWWwB/DFILSDuDX4SQw7JRy+kUVoHc9nxWx9jR1 2D6A5PAb6364vNc4asBOvRsN7WPlNgrRrVV3ReL3eP9izvA0OrE4SGJZVyVpduIql7IN gx9mHNk55V+TehcHsxoJoM6oU0UPhLcUtWJs0LmwYR9EdtOzzuLSnMZeOnryvX4mq18Y wu1A== X-Forwarded-Encrypted: i=1; AHgh+Rr4PG98OJCmbxyMyWDP5gOuRqxGLq+KcCw0gcWZUzsY2eQwwZJo1dibGhElesan3f5tPylYUoBFxDpADuI=@vger.kernel.org X-Gm-Message-State: AOJu0YwpgzgUV7hTB0F9786key7kAh6jat9qE8uoCO2q0aAjZt5ZGO4I xpN+S/IsnbJ0fO8kgGxqh8YWM31XoG3zjSfqL4bh6VtFqiDfFg2ofbW+ X-Gm-Gg: AR+sD128OrK13S6BAbIJdQuNbMtppbK6WSvdlfk8bUnHX3ekIMWIMdSAk32bpbUmMgi W4R3qMNyBfoK7Rg+Pb86x7WQOnOCMM7zaDJ0Na9ktnaJkHOzEiYxjp4Kj4UkFeyurOniwf3ka/Y XxyC8HnGV1OnFXywjzcz4Dj/Y+dlQ5hZf6jTg3h3DVuTZ88fpPKnk52ik1IWf0mCcXYUU0bahiu SxLm0iztBIO6S1FHWkzVWts9ZvxO4bRhB2l82oI25/Ry1Z5OSO/1Ksg1i7t7TH4dGlD2BrcOokc 5VtM1S2uuIK5w0/mSwZMjDP/Vgf6defpQ02fxImBn3wx4+quMgeMpvzUmLQWQTNslONOOqNDHdd zDfAV/Sw6GigOadv3IpwIKdbwMsGD+sMiUo/yf+Fz4Bsjj2592mTlNQJy1vaQxEwySy8kF3T7db CQTzU8/eciqtOe6cJ7GXtZ7gYGTsAnvgX+hLjYbht+NWNTdGpW9FdBQiL8ymY= X-Received: by 2002:a05:6512:805b:b0:5ae:b86b:71f0 with SMTP id 2adb3069b0e04-5b453f830e2mr30498e87.37.1786568125682; Wed, 12 Aug 2026 13:55:25 -0700 (PDT) Received: from archlinux ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b4539e9605sm60999e87.22.2026.08.12.13.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 13:55:25 -0700 (PDT) From: Nikolay Kulikov To: Greg Kroah-Hartman , Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko , Andy Shevchenko Cc: linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nikolay Kulikov Subject: [PATCH v3 3/5] staging: media: atomisp: inline the check_bo_status_*() macros Date: Wed, 12 Aug 2026 23:51:36 +0300 Message-ID: <20260812205429.39181-4-nikolayof23@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260812205429.39181-1-nikolayof23@gmail.com> References: <20260812205429.39181-1-nikolayof23@gmail.com> Precedence: bulk X-Mailing-List: linux-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 ecd920e49488..dbda4394a239 100644 --- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c @@ -687,7 +687,10 @@ int hmm_bo_alloc_pages(struct hmm_buffer_object *bo, } =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 Tue Sep 29 04:10:12 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 CA9233B6BE5 for ; Wed, 12 Aug 2026 20:55:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786568136; cv=none; b=hE1tdPMjW79Y7N9seLFYhUZwbQhErMOM/7ncPFVv9GFeIT9YPzJ3J882LCoxxsx53AdYeU9CBcpfnKIvCGKmcm5iCF7EPZbOkUFWCvQVoUn+tTgYS63cDu7/jJhIpZ4prQ4QmKLDHUi21rsMz7FqKGB5LAqcBuQZUUKGCruup8c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786568136; c=relaxed/simple; bh=yJUCgUb4KFcxXLpPv/Qf1WbDX5e+fr80HZIWVnsFP3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KdHco0u1ZfuN/gWc9v9u+6rF0aRqsQ9eMqxmU0mZ9cfaJ3r9h+AuPyFSfuhYD8OndXWK9SP0775qvamCqQQSr8BXtWw2B+Q6H2+V++7KL92UxDvXXLxuwxOmrejSYn41r/XvM9WHzvJV1fhneVyQsuJyd9LlSC8ltOG+8DggwO4= 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=NG3/SLru; arc=none smtp.client-ip=209.85.167.41 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="NG3/SLru" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-5aeb2bc82ccso1748633e87.2 for ; Wed, 12 Aug 2026 13:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786568129; x=1787172929; 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=gjB2fBDmkMwtaR91YZkC47S7tI/AMH5A7bYroiu6yaY=; b=NG3/SLruuNcjdR5iOHPh9FkWxwO8p32Yd+KvyVdxhkLIL69rRVg3jLcNhpFTfBSPkb J1N2qKr6jtr0XbKzVkYq2MUOqv6GFF18m4vasjw6xyxpDZpSTB1dyUkIrYig7LsiypP+ Dv0LBwicDxOsiLL2DwrOXavzl+IE/kpr0HHCtajGrn7DrG7gbD7ByUrOGPnRVj5jlTWB bqBbnPjTbkR5213GD2FUpZLbsLPCGbDuO9bimIfll+JU56UAVzb3me+AtzVe1DfA3V1X OisyJUyKNU2hug/ZzR2D9IzBP9FxUttYR1K90pPWXL1A6tW//cLpX7AxODerRnVp/bd8 /KKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786568129; x=1787172929; 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=gjB2fBDmkMwtaR91YZkC47S7tI/AMH5A7bYroiu6yaY=; b=g68kEt2VzLIPOCCXLYB0SkcImLI0V/LYOj+HIgAOiVj9VB6JO+GHhpFJBwUN3BM8If Hhvjdkm2ZbnYQ8yNxC8oCU+zr9DA+o7bgigXs1BXRwg0lZwaqHKXAVbGDVQ5kDV+HfVg QdDbCSjDvEhyANgpX6tOCroPG2QOCvct/BeFHAuhBDoBYk6i1Y8Bdt7Gz9yCf11xScRe QMFMxPV4NUtrvfNnN+yVo1HSTotRy8dwizc4MOHUO1VzA664PpRrnfMdCyBG7YNwasZW Bbguca/F33b37f8OAXdC254KIdvNwzjjeFD7od6ITOlCzwrCMIOS19jY4Kkds7SLbqdf JZ8g== X-Forwarded-Encrypted: i=1; AHgh+RpK7TJnKk3ts1tbarerlBFpx81wwBcpNFKfLetiomBoWoRhCAO4HDhwpD5VFoU5ln+56+dOY2ftI/fPwa8=@vger.kernel.org X-Gm-Message-State: AOJu0YywDXc+geJEdRb+xbh2zJdQXGpAVhhfHMx/8y7nvMLdxiK1NlYP m6owxwC4JEu46i6uPSbt9EpaCZt1xhNocyt1OVrfcAD0/nHb9Z8ZQoD1 X-Gm-Gg: AR+sD135IPMNmYk3YFt1Xunbs+pUZ/zdz8eBDlJNXz789hAEPAsAMjUAjm/hIf/UTwf DQJGWRq9F8iJj+1vo+qR5p23d0ifZ+f0vE876W+LDV24sPr9I7zM9Gfd/ESgJM8LPgVt2/x2dBk eVYHU2xY4DDXGOkZuWrB/1Im7lPPrJMYrWoIVG5iLrDrOt1NA3EufiKVWjg2a8IAO/TMW5V+fTE Ehysfd0XhZDDGEPvgEPQL1CvLf3omhluSVaOHMNFc4fdcgT6MqUB7SnGePvWOzrdGB5NtuC9msM tYK41px3Fo2eITbKazuvn7mN+fi0fI80exk2b8PbDHIcUuMuOoHn6oiPxr99Mpuo+DrATWLfk+8 o8eKKp2MOnK/VZ+z/Ur9TjwTYzKKx1a/5/3L2dM68vujcE6Kyb7RTWpnh+o+c5CaiR6Bex9ZQfb X45r1HYRKKOzwG49ZPahp8/PesJ4AH66XmLYFcjl6ZHx9VRldwV2H+HubY+v8= X-Received: by 2002:a05:6512:33d0:b0:5b0:137f:9476 with SMTP id 2adb3069b0e04-5b453f464b2mr52173e87.16.1786568128897; Wed, 12 Aug 2026 13:55:28 -0700 (PDT) Received: from archlinux ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b4539e9605sm60999e87.22.2026.08.12.13.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 13:55:28 -0700 (PDT) From: Nikolay Kulikov To: Greg Kroah-Hartman , Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko , Andy Shevchenko Cc: linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nikolay Kulikov Subject: [PATCH v3 4/5] staging: media: atomisp: inline the var_equal_return*() macros Date: Wed, 12 Aug 2026 23:51:37 +0300 Message-ID: <20260812205429.39181-5-nikolayof23@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260812205429.39181-1-nikolayof23@gmail.com> References: <20260812205429.39181-1-nikolayof23@gmail.com> Precedence: bulk X-Mailing-List: linux-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 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 --- .../media/atomisp/include/hmm/hmm_common.h | 20 ------------------- .../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 dbda4394a239..89e56ce07444 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 Tue Sep 29 04:10:12 2026 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 9E7133A8755 for ; Wed, 12 Aug 2026 20:55:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786568145; cv=none; b=VI+l9Y49k5felXJQ2/imD/oBfdDwJEcLLFnR3zm90dsO13qatk9KdT8idkwFP3xgCpcuPudnehpKCIUELw8h1XlZePatbviffDb8DUkHbb0JJrIa5Nz/CjZdf/hfckLcPU4TFp6awhq1UAX0Mb81tYWhtMxMg21TDrJcuONjhww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786568145; c=relaxed/simple; bh=pc5UESD6EDwQLGI9fUxjkSsSLs86VJEfjdxtMK0USzs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fqEBU+Sfugdt/uuxbGgAql/tUjJxiNGfxZpxu8jiNBnMlpJN8nNWw+1qeH4pSyNEcmjfB/5EbAOIe79UzGMj+noqKYaTIQ33RufNYdEuyl5S2qtTSHu/NumhlMcofVhpqPdR8VfGeRiyOWu1mksvdEPSweEtoYiNkfWwKos7jlo= 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=UupwkKHn; arc=none smtp.client-ip=209.85.167.53 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="UupwkKHn" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5b2aa3be376so23637e87.0 for ; Wed, 12 Aug 2026 13:55:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786568132; x=1787172932; 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=EYpha9QcagCXp8KuwiP/ovEe90DQEndNvsYkBOdtUDs=; b=UupwkKHn4gA5fB47TV7q57qnH1kE1mif5TB/9Rv5A0QzylkOQ1vLg2nuwiBjO9FwWC jV1GVuKGHGn7LWT9waM4hzhZs7mHRGQvYbcB5CZ0JCxa85b/IWKDLl8HUHPWGi1RrFDS N8ClX2qUYrr5aD7LniGId/kZSoKlq/aEFh7RSju9cpPYldIkkvbB3S85Cny0Ur/Na1QA zFCHjtLcbqPdGmYLQYZkyHr7BUlcg9BJhsDmXvIq4uqvGft+6E9UAr55Czi+C607C55G SdfbQkJDqzaAOhDL6Ke8sv7GkHayJWt9j2pXTl0tIhzYHB8NHGwyxd0rqJOjTzPfAO4J 40HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786568132; x=1787172932; 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=EYpha9QcagCXp8KuwiP/ovEe90DQEndNvsYkBOdtUDs=; b=sFR+/a8+bjIVtE15HFkCxKsDN2nqiHTNO8wwWKcNTzN9ghSdmwtfHpC1+oWZxg+Hqe pWabk17we31nt2h4XZPCkkJ5JAfPSx8XgeFgi5m6QD1dB0/XX+YyT54GSj9GvW1aG1oz WhGCJ+jMrAhU/S2KOOKMVf7ecA17LJtzHTcO92Tk0Tmohy0RMwwh600NB8ysvBDQoeJz S8lczMNlJnQC7/7+9GLnyYdDeVSuo6IVxiaJY+hUF6eqEdvuA+VGZj38Yezsqp9PHrRi 9+WdOjzoh04zurTlTQTOPV3CPDfRFrG53UdcxB9Tl3zksKdzOGVuew18/bx/cCj1HwHQ Cd9w== X-Forwarded-Encrypted: i=1; AHgh+RqX7O6+Al6Ph6VQf4zOQq7boJQMFH6RI8JU5xdo1SielUsJ0uGwgOMHpL2Su/UzSfEPRkCaqJTR7JZBIGk=@vger.kernel.org X-Gm-Message-State: AOJu0YzlEbQqAovZku8qBoRZYuh8UpEGX0F1qCXQ4q5Rrjr8OzAjkCFQ +ojOzELtweioykRbhpsh5dvt4RbmS5mOQrzq1HQ/MCAInvjcnvTStBtg X-Gm-Gg: AR+sD13ui1oEBkx/zBclaa8uX2aqivzkwGbYe4zjJ3kmdtz0bOKdgAukvyiAR5GeHag QpaNtytV3UnBw3yQJi4Q2DadjpdBTcbiq9qls+nGVS49D8ttKRGd+AYuclf4o5MSh5CvhXvsvFp ah37XluZPqoGX8EMuCpdaQkUBZjgri/1HYlNxXboGrTI4XfGgX4iS168cga39+Q7qwQaG+AO5kH 6nYdeRqBiVkAxlqD3d+/SEeuPkzFkcSaMwh814sQ2ciEh5Haja2bE8xGmVt7JUcn5lrmk57uDiw B6vtrMHeLuVFaOxt3rMfO5dO3NKgmjiY2fQk2NzxizSrRn3l/22APPzytnKCDZGS69qYRlMciDV mXHLcwJ32K7xTJQo5lWxc3tl9xgfTqExzO81rHQzbjl3Vfpuzbmmhz5CMkwDbZEaOa7TtQoKRJ7 sxZeoXFZL7gq8K2TkDnCYLAKEoCBUd9XMlnLig3arnkz1Ci/IlcrevRXjBK7wi X-Received: by 2002:a05:6512:3196:b0:5ae:b260:cf47 with SMTP id 2adb3069b0e04-5b453f317f1mr52261e87.10.1786568132298; Wed, 12 Aug 2026 13:55:32 -0700 (PDT) Received: from archlinux ([94.229.19.199]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b4539e9605sm60999e87.22.2026.08.12.13.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 13:55:31 -0700 (PDT) From: Nikolay Kulikov To: Greg Kroah-Hartman , Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Andy Shevchenko , Andy Shevchenko Cc: linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nikolay Kulikov Subject: [PATCH v3 5/5] staging: media: atomisp: remove hmm/hmm_common.h file Date: Wed, 12 Aug 2026 23:51:38 +0300 Message-ID: <20260812205429.39181-6-nikolayof23@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260812205429.39181-1-nikolayof23@gmail.com> References: <20260812205429.39181-1-nikolayof23@gmail.com> Precedence: bulk X-Mailing-List: linux-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" Now this file contains nothing, and we can remove it and all the "#include" directives. Signed-off-by: Nikolay Kulikov --- drivers/staging/media/atomisp/include/hmm/hmm.h | 1 - .../staging/media/atomisp/include/hmm/hmm_bo.h | 1 - .../media/atomisp/include/hmm/hmm_common.h | 16 ---------------- drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 1 - 4 files changed, 19 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 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 89e56ce07444..ce0c8b2717a4 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