From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933314AbeALMAf (ORCPT + 1 other); Fri, 12 Jan 2018 07:00:35 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3782 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754403AbeALMAe (ORCPT ); Fri, 12 Jan 2018 07:00:34 -0500 From: Yisheng Xie To: CC: , , , Yisheng Xie Subject: [PATCH v4] devres: combine function devm_ioremap* Date: Fri, 12 Jan 2018 19:51:27 +0800 Message-ID: <1515757887-47446-1-git-send-email-xieyisheng1@huawei.com> X-Mailer: git-send-email 1.7.12.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: When I tried to use devm_ioremap function and review related code, I found devm_ioremap_* almost have the similar realize with each other, which can be combined. In the former versions, I have tried to kill ioremap_cache to reduce the size of devres, which can not work for ioremap is not the same as ioremap_nocache in some ARCHs likes ia64. Therefore, as the suggestion of Christophe, I introduce a help function __devm_ioremap, let devm_ioremap* inline and call __devm_ioremap with different devm_ioremap_type. After apply the patch, the size of devres.o can be reduce from 8216 Bytes to 7352Bytes in my compile environment. Suggested-by: Christophe LEROY Signed-off-by: Yisheng Xie --- v2: - use MARCO for ioremap v3: - kill dev_ioremap_nocache v4: - combine function devm_ioremap* include/linux/io.h | 33 +++++++++++++++++++----- lib/devres.c | 76 +++++++++++------------------------------------------- 2 files changed, 42 insertions(+), 67 deletions(-) diff --git a/include/linux/io.h b/include/linux/io.h index 32e30e8..da33a5f 100644 --- a/include/linux/io.h +++ b/include/linux/io.h @@ -73,12 +73,33 @@ static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr) #define IOMEM_ERR_PTR(err) (__force void __iomem *)ERR_PTR(err) -void __iomem *devm_ioremap(struct device *dev, resource_size_t offset, - resource_size_t size); -void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset, - resource_size_t size); -void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset, - resource_size_t size); +typedef enum { + DEVM_IOREMAP = 0, + DEVM_IOREMAP_NC, + DEVM_IOREMAP_WC, +} devm_ioremap_type; + +void __iomem *__devm_ioremap(struct device *dev, resource_size_t offset, + resource_size_t size, devm_ioremap_type type); + +static inline void __iomem *devm_ioremap(struct device *dev, + resource_size_t offset, resource_size_t size) +{ + return __devm_ioremap(dev, offset, size, DEVM_IOREMAP); +} + +static inline void __iomem *devm_ioremap_nocache(struct device *dev, + resource_size_t offset, resource_size_t size) +{ + return __devm_ioremap(dev, offset, size, DEVM_IOREMAP_NC); +} + +static inline void __iomem *devm_ioremap_wc(struct device *dev, + resource_size_t offset, resource_size_t size) +{ + return __devm_ioremap(dev, offset, size, DEVM_IOREMAP_WC); +} + void devm_iounmap(struct device *dev, void __iomem *addr); int check_signature(const volatile void __iomem *io_addr, const unsigned char *signature, int length); diff --git a/lib/devres.c b/lib/devres.c index 5f2aedd..e00eb4f 100644 --- a/lib/devres.c +++ b/lib/devres.c @@ -23,73 +23,27 @@ static int devm_ioremap_match(struct device *dev, void *res, void *match_data) * * Managed ioremap(). Map is automatically unmapped on driver detach. */ -void __iomem *devm_ioremap(struct device *dev, resource_size_t offset, - resource_size_t size) +void __iomem *__devm_ioremap(struct device *dev, resource_size_t offset, + resource_size_t size, devm_ioremap_type type) { - void __iomem **ptr, *addr; - - ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL); - if (!ptr) - return NULL; - - addr = ioremap(offset, size); - if (addr) { - *ptr = addr; - devres_add(dev, ptr); - } else - devres_free(ptr); - - return addr; -} -EXPORT_SYMBOL(devm_ioremap); - -/** - * devm_ioremap_nocache - Managed ioremap_nocache() - * @dev: Generic device to remap IO address for - * @offset: Resource address to map - * @size: Size of map - * - * Managed ioremap_nocache(). Map is automatically unmapped on driver - * detach. - */ -void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset, - resource_size_t size) -{ - void __iomem **ptr, *addr; + void __iomem **ptr, *addr = NULL; ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL); if (!ptr) return NULL; - addr = ioremap_nocache(offset, size); - if (addr) { - *ptr = addr; - devres_add(dev, ptr); - } else - devres_free(ptr); - - return addr; -} -EXPORT_SYMBOL(devm_ioremap_nocache); - -/** - * devm_ioremap_wc - Managed ioremap_wc() - * @dev: Generic device to remap IO address for - * @offset: Resource address to map - * @size: Size of map - * - * Managed ioremap_wc(). Map is automatically unmapped on driver detach. - */ -void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset, - resource_size_t size) -{ - void __iomem **ptr, *addr; - - ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL); - if (!ptr) - return NULL; + switch (type) { + case DEVM_IOREMAP: + addr = ioremap(offset, size); + break; + case DEVM_IOREMAP_NC: + addr = ioremap_nocache(offset, size); + break; + case DEVM_IOREMAP_WC: + addr = ioremap_wc(offset, size); + break; + } - addr = ioremap_wc(offset, size); if (addr) { *ptr = addr; devres_add(dev, ptr); @@ -98,7 +52,7 @@ void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset, return addr; } -EXPORT_SYMBOL(devm_ioremap_wc); +EXPORT_SYMBOL(__devm_ioremap); /** * devm_iounmap - Managed iounmap() -- 1.8.3.1