Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp7756214imu; Fri, 28 Dec 2018 04:26:01 -0800 (PST) X-Google-Smtp-Source: ALg8bN6uk8L67JhlWqV36aHuTPNG/L3cMQJrR08YpuDNWK2NUYgnl8VX3xtd2aPRKDsDzHNcqNi/ X-Received: by 2002:a63:26c1:: with SMTP id m184mr24676580pgm.367.1545999961425; Fri, 28 Dec 2018 04:26:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545999961; cv=none; d=google.com; s=arc-20160816; b=mwuohfnnEOaytDg9BoQhGB4Rp30rStAKwR6m8po2Ypft6CStveW771ydaq4ydhZx2v D6T96mgTIXz5d9HKLsc9RJBaHrDoLFOrzgxlTjuiKF6BxyJkqpoDtXj1MX4CFsFcf6fj AvMd/2IRXR+dcVHZNsytC+iODkJGHTX/ryqM5ByUZCpSM8ZMrirVzmrXo/a2kh/NB7Cz nDL6tKWGkJ0xngIDpKC/IXoMV47SuhN7PSgWdbaBMFHbhk8XzQtG5oekLjPFxaxPDf+V gb/yMWUfn7904JuJwZZgBHqi4OAgj6ilu3wO6dGAHYtnpVeFuE4i74w9s8fyEOWJk6fs emDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=hPGTggK5mBzVng4X/eY1ndyLBHEXD2yxkrrkNdSjxi0=; b=Jo85h85/IKVl3jNybhrQkpeL34joezLhY7Eb5lq7ioRUUzvDKbg6b4qkHJ5HjqKjIR 2qs+C85eY1walU8drG5UHuJPjiU3LBrHX/K/XDhXvcZv1u6/EiKceHIiB+0D2rEIi5fI OOoEwcpg9TgdFMiQ6Ezw/4+AweUnQEDxFzcxFVMfUspv/FSBoWhPpBdwnnZjxx6Wqs8f 7LOD+AXXwUUqOG69E5SMhwEm5PIcaKySOA/uJez0nfOrGqcv75XAkDDgWayqEFNKzQIC cCyBlN0OmKcH7m/43s0PPRYS9bHRujD+4FEEoejdiRpicp/Mv1FNKuIUAoc3nCFug0aF Gl2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@iluvatar.ai header.s=key_2018 header.b=Zfq4RP+j; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=iluvatar.ai Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t12si36045420plq.190.2018.12.28.04.25.45; Fri, 28 Dec 2018 04:26:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@iluvatar.ai header.s=key_2018 header.b=Zfq4RP+j; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=iluvatar.ai Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729109AbeL1IkV (ORCPT + 99 others); Fri, 28 Dec 2018 03:40:21 -0500 Received: from owa.iluvatar.ai ([103.91.158.24]:45982 "EHLO owa.iluvatar.ai" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726700AbeL1IkU (ORCPT ); Fri, 28 Dec 2018 03:40:20 -0500 Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; d=iluvatar.ai; s=key_2018; c=relaxed/relaxed; t=1545986414; h=from:subject:to:date:message-id; bh=hPGTggK5mBzVng4X/eY1ndyLBHEXD2yxkrrkNdSjxi0=; b=Zfq4RP+jdHrA0A51NQKdLp5tsQsTocr4Or1dwH/oIl6/cFk/15xI33rESQpgeKkf542rE/7olws o3jnXO+UK7b2HiDiXH2CvnBZJUWEkARdP0Wym+B9sLFz1seKactB8dyfqDrOEXjqk6TNDVb9CyACa BYV3hS8K0Jnd3zi7h70= Received: from localhost.localdomain (10.101.1.99) by S-10-101-1-102.iluvatar.local (10.101.1.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1415.2; Fri, 28 Dec 2018 16:40:13 +0800 From: Huang Shijie To: CC: , , , , , , , , , , , Huang Shijie Subject: [PATCH] lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr Date: Fri, 28 Dec 2018 16:39:50 +0800 Message-ID: <20181228083950.20398-1-sjhuang@iluvatar.ai> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.101.1.99] X-ClientProxiedBy: S-10-101-1-102.iluvatar.local (10.101.1.102) To S-10-101-1-102.iluvatar.local (10.101.1.102) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Follow the kernel conventions, rename addr_in_gen_pool to gen_pool_has_addr. Signed-off-by: Huang Shijie --- arch/arm/mm/dma-mapping.c | 2 +- drivers/misc/sram-exec.c | 2 +- include/linux/genalloc.h | 2 +- kernel/dma/remap.c | 2 +- lib/genalloc.c | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index f1e2922e447c..a876101a0f82 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -563,7 +563,7 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page) static bool __in_atomic_pool(void *start, size_t size) { - return addr_in_gen_pool(atomic_pool, (unsigned long)start, size); + return gen_pool_has_addr(atomic_pool, (unsigned long)start, size); } static int __free_from_pool(void *start, size_t size) diff --git a/drivers/misc/sram-exec.c b/drivers/misc/sram-exec.c index 426ad912b441..d054e2842a5f 100644 --- a/drivers/misc/sram-exec.c +++ b/drivers/misc/sram-exec.c @@ -96,7 +96,7 @@ void *sram_exec_copy(struct gen_pool *pool, void *dst, void *src, if (!part) return NULL; - if (!addr_in_gen_pool(pool, (unsigned long)dst, size)) + if (!gen_pool_has_addr(pool, (unsigned long)dst, size)) return NULL; base = (unsigned long)part->base; diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h index dd0a452373e7..c5e5bed82fbc 100644 --- a/include/linux/genalloc.h +++ b/include/linux/genalloc.h @@ -156,7 +156,7 @@ extern struct gen_pool *devm_gen_pool_create(struct device *dev, int min_alloc_order, int nid, const char *name); extern struct gen_pool *gen_pool_get(struct device *dev, const char *name); -bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start, +extern bool gen_pool_has_addr(struct gen_pool *pool, unsigned long start, size_t size); #ifdef CONFIG_OF diff --git a/kernel/dma/remap.c b/kernel/dma/remap.c index 18cc09fc27b9..5022b904d7bc 100644 --- a/kernel/dma/remap.c +++ b/kernel/dma/remap.c @@ -158,7 +158,7 @@ int __init dma_atomic_pool_init(gfp_t gfp, pgprot_t prot) bool dma_in_atomic_pool(void *start, size_t size) { - return addr_in_gen_pool(atomic_pool, (unsigned long)start, size); + return gen_pool_has_addr(atomic_pool, (unsigned long)start, size); } void *dma_alloc_from_pool(size_t size, struct page **ret_page, gfp_t flags) diff --git a/lib/genalloc.c b/lib/genalloc.c index 96b6f478d275..946bbeefec81 100644 --- a/lib/genalloc.c +++ b/lib/genalloc.c @@ -423,7 +423,7 @@ void gen_pool_for_each_chunk(struct gen_pool *pool, EXPORT_SYMBOL(gen_pool_for_each_chunk); /** - * addr_in_gen_pool - checks if an address falls within the range of a pool + * gen_pool_has_addr - checks if an address falls within the range of a pool * @pool: the generic memory pool * @start: start address * @size: size of the region @@ -431,7 +431,7 @@ EXPORT_SYMBOL(gen_pool_for_each_chunk); * Check if the range of addresses falls within the specified pool. Returns * true if the entire range is contained in the pool and false otherwise. */ -bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start, +bool gen_pool_has_addr(struct gen_pool *pool, unsigned long start, size_t size) { bool found = false; @@ -450,7 +450,7 @@ bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start, rcu_read_unlock(); return found; } -EXPORT_SYMBOL(addr_in_gen_pool); +EXPORT_SYMBOL(gen_pool_has_addr); /** * gen_pool_avail - get available free space of the pool -- 2.17.1