diff options
| -rw-r--r-- | drivers/usb/host/uhci-platform.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c index 37607f985cc012..5e02f2ceafb6ee 100644 --- a/drivers/usb/host/uhci-platform.c +++ b/drivers/usb/host/uhci-platform.c @@ -65,13 +65,10 @@ static const struct hc_driver uhci_platform_hc_driver = { .hub_control = uhci_hub_control, }; -static const u64 dma_mask_32 = DMA_BIT_MASK(32); -static const u64 dma_mask_64 = DMA_BIT_MASK(64); - static int uhci_hcd_platform_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; - const u64 *dma_mask_ptr; + bool dma_mask_64 = false; struct usb_hcd *hcd; struct uhci_hcd *uhci; struct resource *res; @@ -85,11 +82,11 @@ static int uhci_hcd_platform_probe(struct platform_device *pdev) * Since shared usb code relies on it, set it here for now. * Once we have dma capability bindings this can go away. */ - dma_mask_ptr = (u64 *)of_device_get_match_data(&pdev->dev); - if (!dma_mask_ptr) - dma_mask_ptr = &dma_mask_32; + if (of_device_get_match_data(&pdev->dev)) + dma_mask_64 = true; - ret = dma_coerce_mask_and_coherent(&pdev->dev, *dma_mask_ptr); + ret = dma_coerce_mask_and_coherent(&pdev->dev, + dma_mask_64 ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32)); if (ret) return ret; @@ -200,7 +197,7 @@ static void uhci_hcd_platform_shutdown(struct platform_device *op) static const struct of_device_id platform_uhci_ids[] = { { .compatible = "generic-uhci", }, { .compatible = "platform-uhci", }, - { .compatible = "aspeed,ast2700-uhci", .data = &dma_mask_64}, + { .compatible = "aspeed,ast2700-uhci", .data = (void *)1 }, {} }; MODULE_DEVICE_TABLE(of, platform_uhci_ids); |