USB: host: ohci-at91: depend on OF

Make the driver depend on CONFIG_OF and remove the now useless #ifdef

Also, fix the Kconfig indentation.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 5f0567927f1f44bd1e9e60d789aec05e5ac5218a..079991e283e9e0a1dd1abcaf5794aa6dbf1aceb8 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -448,10 +448,10 @@ config USB_OHCI_HCD_PXA27X
          PXA27x/PXA3xx chips.
 
 config USB_OHCI_HCD_AT91
-        tristate "Support for Atmel on-chip OHCI USB controller"
-        depends on USB_OHCI_HCD && ARCH_AT91
-        default y
-        ---help---
+       tristate "Support for Atmel on-chip OHCI USB controller"
+       depends on USB_OHCI_HCD && ARCH_AT91 && OF
+       default y
+       ---help---
           Enables support for the on-chip OHCI controller on
           Atmel chips.
 

diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 72dc4f9e2a0fdc6eeac4c4548ca477a7a24ff4bb..8e17d5ba26c6594365ff4251501a42c99f9862da 100644 (file)
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -442,7 +442,6 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id at91_ohci_dt_ids[] = {
        { .compatible = "atmel,at91rm9200-ohci" },
        { /* sentinel */ }
@@ -492,12 +491,6 @@ static int ohci_at91_of_init(struct platform_device *pdev)
 
        return 0;
 }
-#else
-static int ohci_at91_of_init(struct platform_device *pdev)
-{
-       return 0;
-}
-#endif
 
 /*-------------------------------------------------------------------------*/
 
@@ -684,7 +677,7 @@ static struct platform_driver ohci_hcd_at91_driver = {
        .driver         = {
                .name   = "at91_ohci",
                .pm     = &ohci_hcd_at91_pm_ops,
-               .of_match_table = of_match_ptr(at91_ohci_dt_ids),
+               .of_match_table = at91_ohci_dt_ids,
        },
 };