Skip to contentSkip to conversation

devres: remove devm_request_and_ioremap()

PATCH In review Jingoo Han 2 participants 2 messages Jun 11, 2014

Subsystems (7)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 1/1 devres: remove devm_request_and_ioremap()

devm_request_and_ioremap() was obsoleted by the commit 7509657 ("lib: devres: Introduce devm_ioremap_resource()") and has been deprecated for a long time. So, let's remove this function. In addition, all usages of devm_request_and_ioremap() are also removed.

---
Based-on the latest linux kernel
(dfb9454 Merge git://www.linux-watchdog.org/linux-watchdog)

 Documentation/driver-model/devres.txt              |    1 -
 drivers/bus/brcmstb_gisb.c                         |    6 +-
 drivers/gpu/drm/armada/armada_crtc.c               |    8 +-
 include/linux/device.h                             |    2 -
 lib/devres.c                                       |   28 ------
 scripts/coccinelle/api/devm_ioremap_resource.cocci |   90 --------------------
 6 files changed, 6 insertions(+), 129 deletions(-)
 delete mode 100644 scripts/coccinelle/api/devm_ioremap_resource.cocci
Documentation/driver-model/devres.txt +0 -1
index 8947255..001740b 100644
@@ -278,7 +278,6 @@ IOMAP
   devm_ioremap_nocache()
   devm_iounmap()
   devm_ioremap_resource() : checks resource, requests memory region, ioremaps
-  devm_request_and_ioremap() : obsoleted by devm_ioremap_resource()
   pcim_iomap()
   pcim_iounmap()
   pcim_iomap_table()	: array of mapped addresses indexed by BAR
drivers/bus/brcmstb_gisb.c +3 -3
index 6159b77..f2cd6a2d 100644
@@ -212,9 +212,9 @@ static int brcmstb_gisb_arb_probe(struct platform_device *pdev)
 	mutex_init(&gdev->lock);
 	INIT_LIST_HEAD(&gdev->next);
 
-	gdev->base = devm_request_and_ioremap(&pdev->dev, r);
-	if (!gdev->base)
-		return -ENOMEM;
+	gdev->base = devm_ioremap_resource(&pdev->dev, r);
+	if (IS_ERR(gdev->base))
+		return PTR_ERR(gdev->base);
 
 	err = devm_request_irq(&pdev->dev, timeout_irq,
 				brcmstb_gisb_timeout_handler, 0, pdev->name,
drivers/gpu/drm/armada/armada_crtc.c +3 -5
index 81c34f9..3aedf9e 100644
@@ -1039,11 +1039,9 @@ int armada_drm_crtc_create(struct drm_device *dev, unsigned num,
 	if (ret)
 		return ret;
 
-	base = devm_request_and_ioremap(dev->dev, res);
-	if (!base) {
-		DRM_ERROR("failed to ioremap register\n");
-		return -ENOMEM;
-	}
+	base = devm_ioremap_resource(dev->dev, res);
+	if (IS_ERR(base))
+		return PTR_ERR(base);
 
 	dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL);
 	if (!dcrtc) {
include/linux/device.h +0 -2
index af424ac..921fa0a 100644
@@ -631,8 +631,6 @@ extern unsigned long devm_get_free_pages(struct device *dev,
 extern void devm_free_pages(struct device *dev, unsigned long addr);
 
 void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res);
-void __iomem *devm_request_and_ioremap(struct device *dev,
-			struct resource *res);
 
 /* allows to add/remove a custom action to devres stack */
 int devm_add_action(struct device *dev, void (*action)(void *), void *data);
lib/devres.c +0 -28
index f562bf6..6a4aee8 100644
@@ -142,34 +142,6 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)
 }
 EXPORT_SYMBOL(devm_ioremap_resource);
 
-/**
- * devm_request_and_ioremap() - Check, request region, and ioremap resource
- * @dev: Generic device to handle the resource for
- * @res: resource to be handled
- *
- * Takes all necessary steps to ioremap a mem resource. Uses managed device, so
- * everything is undone on driver detach. Checks arguments, so you can feed
- * it the result from e.g. platform_get_resource() directly. Returns the
- * remapped pointer or NULL on error. Usage example:
- *
- *	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- *	base = devm_request_and_ioremap(&pdev->dev, res);
- *	if (!base)
- *		return -EADDRNOTAVAIL;
- */
-void __iomem *devm_request_and_ioremap(struct device *dev,
-				       struct resource *res)
-{
-	void __iomem *dest_ptr;
-
-	dest_ptr = devm_ioremap_resource(dev, res);
-	if (IS_ERR(dest_ptr))
-		return NULL;
-
-	return dest_ptr;
-}
-EXPORT_SYMBOL(devm_request_and_ioremap);
-
 #ifdef CONFIG_HAS_IOPORT_MAP
 /*
  * Generic iomap devres
scripts/coccinelle/api/devm_ioremap_resource.cocci deleted +0 -90

90 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 11 lines · Jingoo Han

devm_request_and_ioremap() was obsoleted by the commit 7509657 ("lib: devres: Introduce devm_ioremap_resource()") and has been deprecated for a long time. So, let's remove this function. In addition, all usages of devm_request_and_ioremap() are also removed.

---
Based-on the latest linux kernel
(dfb9454 Merge git://www.linux-watchdog.org/linux-watchdog)

Quoted 8 lines
 Documentation/driver-model/devres.txt              |    1 -
 drivers/bus/brcmstb_gisb.c                         |    6 +-
 drivers/gpu/drm/armada/armada_crtc.c               |    8 +-
 include/linux/device.h                             |    2 -
 lib/devres.c                                       |   28 ------
 scripts/coccinelle/api/devm_ioremap_resource.cocci |   90 --------------------
 6 files changed, 6 insertions(+), 129 deletions(-)
 delete mode 100644 scripts/coccinelle/api/devm_ioremap_resource.cocci

Thanks, I'll queue it up after 3.16-rc1 is out.

greg k-h