The following commit has been merged into the sched/psi branch of tip: Commit-ID: 3954cf4338becb1f140bb6fa4f5e9a42f2529b86 Gitweb: https://git.kernel.org/tip/3954cf4338becb1f140bb6fa4f5e9a42f2529b86 Author: Christoph Hellwig <hch@xxxxxx> AuthorDate: Mon, 22 Aug 2022 08:14:24 +02:00 Committer: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> CommitterDate: Thu, 01 Sep 2022 18:04:43 +02:00 devres: remove devm_ioremap_np devm_ioremap_np has never been used anywhere since it was added in early 2021, so remove it. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Link: https://lore.kernel.org/r/20220822061424.151819-1-hch@xxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- Documentation/driver-api/driver-model/devres.rst | 1 +- include/linux/io.h | 2 +-- lib/devres.c | 15 +--------------- 3 files changed, 18 deletions(-) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index 5527294..2af6c9c 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -310,7 +310,6 @@ IOMAP devm_ioremap() devm_ioremap_uc() devm_ioremap_wc() - devm_ioremap_np() devm_ioremap_resource() : checks resource, requests memory region, ioremaps devm_ioremap_resource_wc() devm_platform_ioremap_resource() : calls devm_ioremap_resource() for platform device diff --git a/include/linux/io.h b/include/linux/io.h index 5fc8003..308f4f0 100644 --- a/include/linux/io.h +++ b/include/linux/io.h @@ -59,8 +59,6 @@ void __iomem *devm_ioremap_uc(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); -void __iomem *devm_ioremap_np(struct device *dev, resource_size_t offset, - resource_size_t size); 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 55eb07e..6baf439 100644 --- a/lib/devres.c +++ b/lib/devres.c @@ -104,21 +104,6 @@ void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset, EXPORT_SYMBOL(devm_ioremap_wc); /** - * devm_ioremap_np - Managed ioremap_np() - * @dev: Generic device to remap IO address for - * @offset: Resource address to map - * @size: Size of map - * - * Managed ioremap_np(). Map is automatically unmapped on driver detach. - */ -void __iomem *devm_ioremap_np(struct device *dev, resource_size_t offset, - resource_size_t size) -{ - return __devm_ioremap(dev, offset, size, DEVM_IOREMAP_NP); -} -EXPORT_SYMBOL(devm_ioremap_np); - -/** * devm_iounmap - Managed iounmap() * @dev: Generic device to unmap for * @addr: Address to unmap
![]() |