Re: [PATCH 20/21] usb: use devm_irq_of_parse_and_map() where appropriate

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 2014-06-04 13:13, nyushchenko@xxxxxxxxxxxxx wrote:
From: Nikita Yushchenko <nyushchenko@xxxxxxxxxxxxx>

This avoids leak of IRQ mapping on error paths, and makes it possible
to use devm_request_irq() without facing unmap-while-handler-installed
issues.

Signed-off-by: Nikita Yushchenko <nyushchenko@xxxxxxxxxxxxx>
---
  drivers/usb/gadget/gr_udc.c       |   17 +++++++++++------
  drivers/usb/host/ehci-grlib.c     |   11 ++++-------
  drivers/usb/host/ehci-orion.c     |    3 ++-
  drivers/usb/host/ehci-ppc-of.c    |   11 ++++-------
  drivers/usb/host/ehci-xilinx-of.c |    8 ++++----
  drivers/usb/host/ohci-ppc-of.c    |    7 ++-----
  6 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/drivers/usb/gadget/gr_udc.c b/drivers/usb/gadget/gr_udc.c
index f984ee7..0a3e586 100644
--- a/drivers/usb/gadget/gr_udc.c
+++ b/drivers/usb/gadget/gr_udc.c
@@ -2108,19 +2108,24 @@ static int gr_probe(struct platform_device *ofdev)
  	if (IS_ERR(regs))
  		return PTR_ERR(regs);

-	dev->irq = irq_of_parse_and_map(dev->dev->of_node, 0);
-	if (!dev->irq) {
+	dev->irq = devm_irq_of_parse_and_map(dev->dev, dev->dev->of_node, 0);
+	if (dev->irq <= 0) {
  		dev_err(dev->dev, "No irq found\n");
  		return -ENODEV;
  	}

  	/* Some core configurations has separate irqs for IN and OUT events */
-	dev->irqi = irq_of_parse_and_map(dev->dev->of_node, 1);
+	dev->irqi = devm_irq_of_parse_and_map(dev->dev, dev->dev->of_node, 1);
+	if (dev->irqi < 0) {
+		dev_err(dev->dev, "could not locate irq\n");
+		return dev->irqi;
+	}
  	if (dev->irqi) {
-		dev->irqo = irq_of_parse_and_map(dev->dev->of_node, 2);
-		if (!dev->irqo) {
+		dev->irqo = devm_irq_of_parse_and_map(dev->dev,
+				dev->dev->of_node, 2);
+		if (dev->irqo <= 0) {
  			dev_err(dev->dev, "Found irqi but not irqo\n");
-			return -ENODEV;
+			return dev->irqo ? dev->irqo : -ENODEV;
  		}
  	}

diff --git a/drivers/usb/host/ehci-grlib.c b/drivers/usb/host/ehci-grlib.c
index 495b6fb..666c03e 100644
--- a/drivers/usb/host/ehci-grlib.c
+++ b/drivers/usb/host/ehci-grlib.c
@@ -111,11 +111,11 @@ static int ehci_hcd_grlib_probe(struct platform_device *op)
  	hcd->rsrc_start = res.start;
  	hcd->rsrc_len = resource_size(&res);

-	irq = irq_of_parse_and_map(dn, 0);
-	if (irq == NO_IRQ) {
-		dev_err(&op->dev, "%s: irq_of_parse_and_map failed\n",
+	irq = devm_irq_of_parse_and_map(&op->dev, dn, 0);
+	if (irq <= 0) {
+		dev_err(&op->dev, "%s: devm_irq_of_parse_and_map failed\n",
  			__FILE__);
-		rv = -EBUSY;
+		rv = irq ? irq : -EINVAL;

Here and in more places below you change the return value from -EBUSY to -EINVAL when irq == 0. These changes and the reason for them is not something that is commented upon in the commit message. Maybe these changes were not intended or should be in a separate patch?

  		goto err_irq;
  	}

@@ -145,7 +145,6 @@ static int ehci_hcd_grlib_probe(struct platform_device *op)
  	return 0;

  err_ioremap:
-	irq_dispose_mapping(irq);
  err_irq:
  	usb_put_hcd(hcd);

@@ -161,8 +160,6 @@ static int ehci_hcd_grlib_remove(struct platform_device *op)

  	usb_remove_hcd(hcd);

-	irq_dispose_mapping(hcd->irq);
-
  	usb_put_hcd(hcd);

  	return 0;
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index 30d35e5..c88177b 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -155,7 +155,8 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)
  	pr_debug("Initializing Orion-SoC USB Host Controller\n");

  	if (pdev->dev.of_node)
-		irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
+		irq = devm_irq_of_parse_and_map(&pdev->dev,
+				pdev->dev.of_node, 0);
  	else
  		irq = platform_get_irq(pdev, 0);
  	if (irq <= 0) {
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
index 5479247..cc64210 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -117,11 +117,11 @@ static int ehci_hcd_ppc_of_probe(struct platform_device *op)
  	hcd->rsrc_start = res.start;
  	hcd->rsrc_len = resource_size(&res);

-	irq = irq_of_parse_and_map(dn, 0);
-	if (irq == NO_IRQ) {
-		dev_err(&op->dev, "%s: irq_of_parse_and_map failed\n",
+	irq = devm_irq_of_parse_and_map(&op->dev, dn, 0);
+	if (irq <= 0) {
+		dev_err(&op->dev, "%s: devm_irq_of_parse_and_map failed\n",
  			__FILE__);
-		rv = -EBUSY;
+		rv = irq ? irq : -EINVAL;
  		goto err_irq;
  	}

@@ -174,7 +174,6 @@ static int ehci_hcd_ppc_of_probe(struct platform_device *op)
  	return 0;

  err_ioremap:
-	irq_dispose_mapping(irq);
  err_irq:
  	usb_put_hcd(hcd);

@@ -194,8 +193,6 @@ static int ehci_hcd_ppc_of_remove(struct platform_device *op)

  	usb_remove_hcd(hcd);

-	irq_dispose_mapping(hcd->irq);
-
  	/* use request_mem_region to test if the ohci driver is loaded.  if so
  	 * ensure the ohci core is operational.
  	 */
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
index fe57710..6c6f8c7 100644
--- a/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -153,11 +153,11 @@ static int ehci_hcd_xilinx_of_probe(struct platform_device *op)
  	hcd->rsrc_start = res.start;
  	hcd->rsrc_len = resource_size(&res);

-	irq = irq_of_parse_and_map(dn, 0);
-	if (!irq) {
-		dev_err(&op->dev, "%s: irq_of_parse_and_map failed\n",
+	irq = devm_irq_of_parse_and_map(&op->dev, dn, 0);
+	if (irq <= 0) {
+		dev_err(&op->dev, "%s: devm_irq_of_parse_and_map failed\n",
  			__FILE__);
-		rv = -EBUSY;
+		rv = irq ? irq : -EINVAL;
  		goto err_irq;
  	}

diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 965e3e9..fcdd23a 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -121,11 +121,11 @@ static int ohci_hcd_ppc_of_probe(struct platform_device *op)
  		goto err_rmr;
  	}

-	irq = irq_of_parse_and_map(dn, 0);
+	irq = devm_irq_of_parse_and_map(*op->dev, dn, 0);
  	if (irq == NO_IRQ) {
  		dev_err(&op->dev, "%s: irq_of_parse_and_map failed\n",
  			__FILE__);
-		rv = -EBUSY;
+		rv = irq ? irq : -EINVAL;
  		goto err_rmr;
  	}

@@ -170,7 +170,6 @@ static int ohci_hcd_ppc_of_probe(struct platform_device *op)
  			pr_debug("%s: cannot get ehci offset from fdt\n", __FILE__);
  	}

-	irq_dispose_mapping(irq);
  err_rmr:
   	usb_put_hcd(hcd);

@@ -185,8 +184,6 @@ static int ohci_hcd_ppc_of_remove(struct platform_device *op)

  	usb_remove_hcd(hcd);

-	irq_dispose_mapping(hcd->irq);
-
  	usb_put_hcd(hcd);

  	return 0;

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]
  Powered by Linux