From patchwork Tue Oct 24 13:46:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13434587 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43788C00A8F for ; Tue, 24 Oct 2023 13:47:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C31826B0278; Tue, 24 Oct 2023 09:47:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B94466B0279; Tue, 24 Oct 2023 09:47:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 995FD6B027A; Tue, 24 Oct 2023 09:47:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 7C0C06B0278 for ; Tue, 24 Oct 2023 09:47:24 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 5969FA0648 for ; Tue, 24 Oct 2023 13:47:24 +0000 (UTC) X-FDA: 81380482008.18.02EB280 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf21.hostedemail.com (Postfix) with ESMTP id 7D7B11C0022 for ; Tue, 24 Oct 2023 13:47:22 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=rGFroAUS; spf=pass (imf21.hostedemail.com: domain of 36co3ZQYKCI4AC9w5ty66y3w.u64305CF-442Dsu2.69y@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=36co3ZQYKCI4AC9w5ty66y3w.u64305CF-442Dsu2.69y@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698155242; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=zb+0nW/ZZ6NW74eJtanLAYQ/ebma3WHtobF3vZ6u4HE=; b=PJiKIoT5t1aDoHj0+UNW0bF+6TF+Vv8RYKsdYseB0hSgkVrf+3V30AU9dHI9PJ6Gujn7Em 08AxVKA42AHW1zTRxUztEHxdNywAK3HuyX8SV7zsEvl+Ur48wnvZ4AV0cyAhAqoe84CX5G 0Dx09/baAmL2C9MLOp+bgaRDRdvG7To= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=rGFroAUS; spf=pass (imf21.hostedemail.com: domain of 36co3ZQYKCI4AC9w5ty66y3w.u64305CF-442Dsu2.69y@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=36co3ZQYKCI4AC9w5ty66y3w.u64305CF-442Dsu2.69y@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698155242; a=rsa-sha256; cv=none; b=7AtEqIySMYkz45bIULtHAKo7kjR1zW32b+Dy8VXNCNUh6ssvikikkJ89DI9Ntgv6TaBu3u dF2ysYh2ZvQmYarcSInm5AQZ4iSG86Xh2TeqmPtCjQZH8SVE/wg5v0lI7ZySjtoDH9UIjb cmsq9v8u1/rDiyft4xNIdvdnKIbLoNw= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-d9b9f56489fso5394883276.1 for ; Tue, 24 Oct 2023 06:47:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698155241; x=1698760041; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=zb+0nW/ZZ6NW74eJtanLAYQ/ebma3WHtobF3vZ6u4HE=; b=rGFroAUSRqZBvMUDRP9Z6RfF5NFFn6+wtcOC4W7zdVndugUF1QPtf2YeHPKoa1LiiT xWR4Ae6VhgZvfL5FsQxv8hMgS0NuZ45HweTzhNntBIzwzyzPf+WNle0jrKD10ryDSfuE oiYNGalJOEAZsmQM08V1w8lPsa30WOFxeWwcHpsKyHtPENwulwDeII/Qp6pdo/+8k8tD IYjbM4yaSuPgXa8eAb02uxvoPwEd7ewWR2Wng8TZ9r/EDgfNcEQOqy7D2L5qyFKDEG8I TqtJ3BFcAo8k2xF8XOJISGfJH79mQWSP5nvup18oNfAHo5RKkll6D/gMALVe3Kv70C/+ 3x2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698155241; x=1698760041; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zb+0nW/ZZ6NW74eJtanLAYQ/ebma3WHtobF3vZ6u4HE=; b=luqp0nNhhhORp7NaY3XIuBfk3OTLiHUBZ3fqNJqE09+l+wmSMRl5oZeuY1Tv2836bS 7Fjt/szS3JONER00NWqAvD27Dz2Kc+jO2Na4XGrPxzTey/d8nYeD6zGbiDbc3VcERRLo B0VuJ+syrMSQ4pLv+t9eQ4IsK0u7pWm7gLHt6f8NYlcgpE4myoYpvuY/JHiFGYEY+KXG smyzXqejr7fizDeibzpYx46ncgLCkVItmRh4TXLqVyQNtr5HoJFiXKezPN5r8coUxJD5 kShJxunj1FOWKPFko8h1HW5+9dblSCxrXUv5b/0S4Y4eu6JH/pBaU0t4MdmaV5efdkL3 qbcA== X-Gm-Message-State: AOJu0YzvYLcp5d939e9evxdYg2x+ubEQQ6BdkH8XZ2uSqsBVhQKdQd6U k0s7h9cYz98gMyxYyYSGUgZfTVuQ1d0= X-Google-Smtp-Source: AGHT+IEpPcNXSaLopMEVj+acIv3rs50iHU0ea/y8V1UNdWnab+iEcPBoSFwF1WABxkknLPWrzIDF+i6tstI= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:45ba:3318:d7a5:336a]) (user=surenb job=sendgmr) by 2002:a05:6902:544:b0:d13:856b:c10a with SMTP id z4-20020a056902054400b00d13856bc10amr261040ybs.3.1698155241467; Tue, 24 Oct 2023 06:47:21 -0700 (PDT) Date: Tue, 24 Oct 2023 06:46:15 -0700 In-Reply-To: <20231024134637.3120277-1-surenb@google.com> Mime-Version: 1.0 References: <20231024134637.3120277-1-surenb@google.com> X-Mailer: git-send-email 2.42.0.758.gaed0368e0e-goog Message-ID: <20231024134637.3120277-19-surenb@google.com> Subject: [PATCH v2 18/39] change alloc_pages name in ivpu_bo_ops to avoid conflicts From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: kent.overstreet@linux.dev, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, roman.gushchin@linux.dev, mgorman@suse.de, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.com, ldufour@linux.ibm.com, catalin.marinas@arm.com, will@kernel.org, arnd@arndb.de, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, peterx@redhat.com, david@redhat.com, axboe@kernel.dk, mcgrof@kernel.org, masahiroy@kernel.org, nathan@kernel.org, dennis@kernel.org, tj@kernel.org, muchun.song@linux.dev, rppt@kernel.org, paulmck@kernel.org, pasha.tatashin@soleen.com, yosryahmed@google.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, andreyknvl@gmail.com, keescook@chromium.org, ndesaulniers@google.com, vvvvvv@google.com, gregkh@linuxfoundation.org, ebiggers@google.com, ytcoode@gmail.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, bristot@redhat.com, vschneid@redhat.com, cl@linux.com, penberg@kernel.org, iamjoonsoo.kim@lge.com, 42.hyeyoo@gmail.com, glider@google.com, elver@google.com, dvyukov@google.com, shakeelb@google.com, songmuchun@bytedance.com, jbaron@akamai.com, rientjes@google.com, minchan@google.com, kaleshsingh@google.com, surenb@google.com, kernel-team@android.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org X-Rspamd-Queue-Id: 7D7B11C0022 X-Rspam-User: X-Stat-Signature: b844x4bgcipdb3yfcnkr46wwgs4xusf7 X-Rspamd-Server: rspam01 X-HE-Tag: 1698155242-990972 X-HE-Meta: U2FsdGVkX1++2JcyFuj8uvQ8GFnnVlzGmwYpzgiiIiKsle50Ie3tRHbCvxtZBSJcOyVCcnhldHL+7+s/c4ZtKEie/4UAEcClDTPvAGUnMSJQq9zc+xSa/rzgJqhoguMGdwL/LxRz+CSxxfkPHMRy3JkXnUBClNfPFmYO1NvhaP7PajyTNSMUTj01sgdyaqGlpfdRHwQcZJE99MZtDEorubNJ7YIUp/iWXEdpFKlugz9beOrMJUq0dGxmfCI9lhZt4PQJkG0tD3l6q6bDxS6sHmNPQLN+U45sXtXw4mZms2vfVaNM0603AmRnnaJjBgncSZII9GVOuxbhWwua4zKNwd6MhzQfMMP7Yrn3z/dVTz4wKCIkMFhJApUKtJx95pFE+y+kOuHIyp9N5EZ6F7IKagn+OhGL4U0+c18qucR5YBhDIEGU7Fj/9XRgL7bRzLHo3bIwENuCNODICC5BSaCHjT0Cr68+/JnXgJwTiw2RibOh5Dzc0q1SBZXvlv3t2fXaJi+x/BDTI3Q1nsROip6VPt7Dp4NIib/ywarsCtzlmMyDAbB5/kla7UrZ3Hgq/+oTWhdQVHWaclKUVcNILaL0mlxl2RCuU01Ktd+//wx4Wpxc+M7+qaWUxAD3GYLrem+7seMhxQxKY9joK0KZabFRSxpYusVh4RDSjB0n4tjpzGVyCp3heBWTP+/U0NKs4A1jG+pXCuCbPDNT2GE0lj19pvANuX5/yj96Wlr/svKk4fBXZG8b4VvILm+UYScKFxTLWOzghuJsFejN3/9ZZVopfOLoy9bfbemoXd9BOPDptm/IsuBZH2FtjSyFmPf9OfElU2/dzq75hIryK/EsepB731IODWdwFlJ7B0FnQCFcLRyZ07H73rhE31X2rV7zFDx12ENjyEtnLZsEzpTavNV0Adza+kqNwuAueINXH8kSLk+0DvR26SremTVaTN4dRQivB0UZ8xdlljRZelpG3uh N2/FzfVi qZ96KFN5Gm5clJI5RDMdh4/3PxrXmY2e8mkzEXHXoHQtQWWR9NJ3gemvHMl/yxFySNzMXIEcCucxudOaT4u+1jdL81ixKddtsh8xPJHu/A7v9mQa2BCgGcaxp5A+zO7wyBqjlJ6pqI2EA68tCdpCFR3+hvbe/2gppFeMTR44IzmFu73P1djL27DmBD/oua/1AF2PVjlxPYZKG+IQA8aeAE0Rn3oWuxWiA2Tzx76pmxbKhginR3UQ9QkgZ1KpfNCuDdijruqP3kEb9uEbhKi7Ofnl7IGYXr9iNwWOTFqUXFcybCz2WHO7+0yh16CMQd+vaqwxLehGdwCqJeq+cBlgl4uUIUUWmT0RlAqt+qDfL6aNqifVENvz9taKUJXX/gnmgkYoRYOwyPOQMh7F+Rn29YbRb6sHQVt+bDgfpQc3k8y+JKLfGvg5ruv7wqc84abKeByMKYwTJko5oqedsMd2dRjB0jjOTOO8572Dr2K/mNyZ6s4C9t3pXHxT1fXXvemG+5c4vyMg19ayaBqguWx7vRwuwbm1lX/o1YJIIt38jKfe9LmH767MU7Gh9Ob8g60NE7meBtzwc6kPl89npjPR3QxuMXByQ32CzTV9tC8vl/ZvD6RJBD6VZiOEjXW6Q3N46O+wmJ3UzOwVzV6xabeCQDIFc7v/ycfhXre7+jmtWMuV8DrbFxxJrA7F89W4p+1OUKfWg/8M6yM1yZo0F++ZC9+0M2Dg5DK0e0na6 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Kent Overstreet After redefining alloc_pages, all uses of that name are being replaced. Change the conflicting names to prevent preprocessor from replacing them when it's not intended. Signed-off-by: Kent Overstreet Signed-off-by: Suren Baghdasaryan --- drivers/accel/ivpu/ivpu_gem.c | 8 ++++---- drivers/accel/ivpu/ivpu_gem.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/accel/ivpu/ivpu_gem.c b/drivers/accel/ivpu/ivpu_gem.c index d09f13b35902..d324eaf5bbe3 100644 --- a/drivers/accel/ivpu/ivpu_gem.c +++ b/drivers/accel/ivpu/ivpu_gem.c @@ -61,7 +61,7 @@ static void prime_unmap_pages_locked(struct ivpu_bo *bo) static const struct ivpu_bo_ops prime_ops = { .type = IVPU_BO_TYPE_PRIME, .name = "prime", - .alloc_pages = prime_alloc_pages_locked, + .alloc_pages_op = prime_alloc_pages_locked, .free_pages = prime_free_pages_locked, .map_pages = prime_map_pages_locked, .unmap_pages = prime_unmap_pages_locked, @@ -134,7 +134,7 @@ static void ivpu_bo_unmap_pages_locked(struct ivpu_bo *bo) static const struct ivpu_bo_ops shmem_ops = { .type = IVPU_BO_TYPE_SHMEM, .name = "shmem", - .alloc_pages = shmem_alloc_pages_locked, + .alloc_pages_op = shmem_alloc_pages_locked, .free_pages = shmem_free_pages_locked, .map_pages = ivpu_bo_map_pages_locked, .unmap_pages = ivpu_bo_unmap_pages_locked, @@ -186,7 +186,7 @@ static void internal_free_pages_locked(struct ivpu_bo *bo) static const struct ivpu_bo_ops internal_ops = { .type = IVPU_BO_TYPE_INTERNAL, .name = "internal", - .alloc_pages = internal_alloc_pages_locked, + .alloc_pages_op = internal_alloc_pages_locked, .free_pages = internal_free_pages_locked, .map_pages = ivpu_bo_map_pages_locked, .unmap_pages = ivpu_bo_unmap_pages_locked, @@ -200,7 +200,7 @@ static int __must_check ivpu_bo_alloc_and_map_pages_locked(struct ivpu_bo *bo) lockdep_assert_held(&bo->lock); drm_WARN_ON(&vdev->drm, bo->sgt); - ret = bo->ops->alloc_pages(bo); + ret = bo->ops->alloc_pages_op(bo); if (ret) { ivpu_err(vdev, "Failed to allocate pages for BO: %d", ret); return ret; diff --git a/drivers/accel/ivpu/ivpu_gem.h b/drivers/accel/ivpu/ivpu_gem.h index 6b0ceda5f253..b81cf2af0b2d 100644 --- a/drivers/accel/ivpu/ivpu_gem.h +++ b/drivers/accel/ivpu/ivpu_gem.h @@ -42,7 +42,7 @@ enum ivpu_bo_type { struct ivpu_bo_ops { enum ivpu_bo_type type; const char *name; - int (*alloc_pages)(struct ivpu_bo *bo); + int (*alloc_pages_op)(struct ivpu_bo *bo); void (*free_pages)(struct ivpu_bo *bo); int (*map_pages)(struct ivpu_bo *bo); void (*unmap_pages)(struct ivpu_bo *bo);