1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index fff114fd5461..bbb791bd7617 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -43,7 +43,6 @@ static int of_isp1760_probe(struct platform_device *dev)
         struct device_node *dp = dev->dev.of_node;
         struct resource *res;
         struct resource memory;
-        struct of_irq oirq;
         int virq;
         resource_size_t res_len;
         int ret;
@@ -69,14 +68,12 @@ static int of_isp1760_probe(struct platform_device *dev)
                 goto free_data;
         }
 
-        if (of_irq_map_one(dp, 0, &oirq)) {
+        virq = irq_of_parse_and_map(dp, 0);
+        if (!virq) {
                 ret = -ENODEV;
                 goto release_reg;
         }
 
-        virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                        oirq.size);
-
         if (of_device_is_compatible(dp, "nxp,usb-isp1761"))
                 devflags |= ISP1760_FLAG_ISP1761;
 
@@ -175,7 +172,7 @@ static struct platform_driver isp1760_of_driver = {
 #endif
 
 #ifdef CONFIG_PCI
-static int __devinit isp1761_pci_probe(struct pci_dev *dev,
+static int isp1761_pci_probe(struct pci_dev *dev,
                 const struct pci_device_id *id)
 {
         u8 latency, limit;
@@ -349,7 +346,7 @@ static struct pci_driver isp1761_pci_driver = {
 };
 #endif
 
-static int __devinit isp1760_plat_probe(struct platform_device *pdev)
+static int isp1760_plat_probe(struct platform_device *pdev)
 {
         int ret = 0;
         struct usb_hcd *hcd;
@@ -416,7 +413,7 @@ out:
         return ret;
 }
 
-static int __devexit isp1760_plat_remove(struct platform_device *pdev)
+static int isp1760_plat_remove(struct platform_device *pdev)
 {
         struct resource *mem_res;
         resource_size_t mem_size;
@@ -435,7 +432,7 @@ static int __devexit isp1760_plat_remove(struct platform_device *pdev)
 
 static struct platform_driver isp1760_plat_driver = {
         .probe  = isp1760_plat_probe,
-        .remove = __devexit_p(isp1760_plat_remove),
+        .remove = isp1760_plat_remove,
         .driver = {
                 .name   = "isp1760",
         },