usb/isp1760: Let OF bindings depend on general CONFIG_OF instead of PPC_OF .

[pandora-kernel.git] / drivers / usb / host / isp1760-if.c

diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 3b28dbf..791792d 100644 (file)
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -17,18 +17,19 @@
 
 #include "isp1760-hcd.h"
 
-#ifdef CONFIG_PPC_OF
+#ifdef CONFIG_OF
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #endif
 
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
 #endif
 
-#ifdef CONFIG_PPC_OF
-static int of_isp1760_probe(struct platform_device *dev,
-               const struct of_device_id *match)
+#ifdef CONFIG_OF
+static int of_isp1760_probe(struct platform_device *dev)
 {
        struct usb_hcd *hcd;
        struct device_node *dp = dev->dev.of_node;
@@ -80,7 +81,7 @@ static int of_isp1760_probe(struct platform_device *dev,
                devflags |= ISP1760_FLAG_DREQ_POL_HIGH;
 
        hcd = isp1760_register(memory.start, res_len, virq,
-               IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev),
+               IRQF_SHARED, &dev->dev, dev_name(&dev->dev),
                devflags);
        if (IS_ERR(hcd)) {
                ret = PTR_ERR(hcd);
@@ -119,7 +120,7 @@ static const struct of_device_id of_isp1760_match[] = {
 };
 MODULE_DEVICE_TABLE(of, of_isp1760_match);
 
-static struct of_platform_driver isp1760_of_driver = {
+static struct platform_driver isp1760_of_driver = {
        .driver = {
                .name = "nxp-isp1760",
                .owner = THIS_MODULE,
@@ -241,7 +242,7 @@ static int __devinit isp1761_pci_probe(struct pci_dev *dev,
 
        dev->dev.dma_mask = NULL;
        hcd = isp1760_register(pci_mem_phy0, memlength, dev->irq,
-               IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev),
+               IRQF_SHARED, &dev->dev, dev_name(&dev->dev),
                devflags);
        if (IS_ERR(hcd)) {
                ret_status = -ENODEV;
@@ -314,7 +315,7 @@ static int __devinit isp1760_plat_probe(struct platform_device *pdev)
        resource_size_t mem_size;
        struct isp1760_platform_data *priv = pdev->dev.platform_data;
        unsigned int devflags = 0;
-       unsigned long irqflags = IRQF_SHARED | IRQF_DISABLED;
+       unsigned long irqflags = IRQF_SHARED;
 
        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!mem_res) {
@@ -397,8 +398,8 @@ static int __init isp1760_init(void)
        ret = platform_driver_register(&isp1760_plat_driver);
        if (!ret)
                any_ret = 0;
-#ifdef CONFIG_PPC_OF
-       ret = of_register_platform_driver(&isp1760_of_driver);
+#ifdef CONFIG_OF
+       ret = platform_driver_register(&isp1760_of_driver);
        if (!ret)
                any_ret = 0;
 #endif
@@ -417,8 +418,8 @@ module_init(isp1760_init);
 static void __exit isp1760_exit(void)
 {
        platform_driver_unregister(&isp1760_plat_driver);
-#ifdef CONFIG_PPC_OF
-       of_unregister_platform_driver(&isp1760_of_driver);
+#ifdef CONFIG_OF
+       platform_driver_unregister(&isp1760_of_driver);
 #endif
 #ifdef CONFIG_PCI
        pci_unregister_driver(&isp1761_pci_driver);