MIPS: MSP71xx: Remove checks for two macros

[cascardo/linux.git] / arch / mips / pmcs-msp71xx / msp_usb.c

diff --git a/arch/mips/pmcs-msp71xx/msp_usb.c b/arch/mips/pmcs-msp71xx/msp_usb.c
index 4dab915..c87c5f8 100644 (file)
--- a/arch/mips/pmcs-msp71xx/msp_usb.c
+++ b/arch/mips/pmcs-msp71xx/msp_usb.c
@@ -75,47 +75,6 @@ static struct mspusb_device msp_usbhost0_device = {
                .resource       = msp_usbhost0_resources,
        },
 };
-
-/* MSP7140/MSP82XX has two USB2 hosts. */
-#ifdef CONFIG_MSP_HAS_DUAL_USB
-static u64 msp_usbhost1_dma_mask = 0xffffffffUL;
-
-static struct resource msp_usbhost1_resources[] = {
-       [0] = { /* EHCI-HS operational and capabilities registers */
-               .start  = MSP_USB1_HS_START,
-               .end    = MSP_USB1_HS_END,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = MSP_INT_USB,
-               .end    = MSP_INT_USB,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [2] = { /* MSBus-to-AMBA bridge register space */
-               .start  = MSP_USB1_MAB_START,
-               .end    = MSP_USB1_MAB_END,
-               .flags  = IORESOURCE_MEM,
-       },
-       [3] = { /* Identification and general hardware parameters */
-               .start  = MSP_USB1_ID_START,
-               .end    = MSP_USB1_ID_END,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct mspusb_device msp_usbhost1_device = {
-       .dev    = {
-               .name   = "pmcmsp-ehci",
-               .id     = 1,
-               .dev    = {
-                       .dma_mask = &msp_usbhost1_dma_mask,
-                       .coherent_dma_mask = 0xffffffffUL,
-               },
-               .num_resources  = ARRAY_SIZE(msp_usbhost1_resources),
-               .resource       = msp_usbhost1_resources,
-       },
-};
-#endif /* CONFIG_MSP_HAS_DUAL_USB */
 #endif /* CONFIG_USB_EHCI_HCD */
 
 #if defined(CONFIG_USB_GADGET)
@@ -157,46 +116,6 @@ static struct mspusb_device msp_usbdev0_device = {
                .resource       = msp_usbdev0_resources,
        },
 };
-
-#ifdef CONFIG_MSP_HAS_DUAL_USB
-static struct resource msp_usbdev1_resources[] = {
-       [0] = { /* EHCI-HS operational and capabilities registers */
-               .start  = MSP_USB1_HS_START,
-               .end    = MSP_USB1_HS_END,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = MSP_INT_USB,
-               .end    = MSP_INT_USB,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [2] = { /* MSBus-to-AMBA bridge register space */
-               .start  = MSP_USB1_MAB_START,
-               .end    = MSP_USB1_MAB_END,
-               .flags  = IORESOURCE_MEM,
-       },
-       [3] = { /* Identification and general hardware parameters */
-               .start  = MSP_USB1_ID_START,
-               .end    = MSP_USB1_ID_END,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-/* This may need to be converted to a mspusb_device, too. */
-static struct mspusb_device msp_usbdev1_device = {
-       .dev    = {
-               .name   = "msp71xx_udc",
-               .id     = 0,
-               .dev    = {
-                       .dma_mask = &msp_usbdev_dma_mask,
-                       .coherent_dma_mask = 0xffffffffUL,
-               },
-               .num_resources  = ARRAY_SIZE(msp_usbdev1_resources),
-               .resource       = msp_usbdev1_resources,
-       },
-};
-
-#endif /* CONFIG_MSP_HAS_DUAL_USB */
 #endif /* CONFIG_USB_GADGET */
 
 static int __init msp_usb_setup(void)
@@ -231,10 +150,6 @@ static int __init msp_usb_setup(void)
 #if defined(CONFIG_USB_EHCI_HCD)
                msp_devs[0] = &msp_usbhost0_device.dev;
                ppfinit("platform add USB HOST done %s.\n", msp_devs[0]->name);
-#ifdef CONFIG_MSP_HAS_DUAL_USB
-               msp_devs[1] = &msp_usbhost1_device.dev;
-               ppfinit("platform add USB HOST done %s.\n", msp_devs[1]->name);
-#endif
 #else
                ppfinit("%s: echi_hcd not supported\n", __FILE__);
 #endif /* CONFIG_USB_EHCI_HCD */
@@ -244,11 +159,6 @@ static int __init msp_usb_setup(void)
                msp_devs[0] = &msp_usbdev0_device.dev;
                ppfinit("platform add USB DEVICE done %s.\n"
                                        , msp_devs[0]->name);
-#ifdef CONFIG_MSP_HAS_DUAL_USB
-               msp_devs[1] = &msp_usbdev1_device.dev;
-               ppfinit("platform add USB DEVICE done %s.\n"
-                                       , msp_devs[1]->name);
-#endif
 #else
                ppfinit("%s: usb_gadget not supported\n", __FILE__);
 #endif /* CONFIG_USB_GADGET */