ohci-at91.c (22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b) | ohci-at91.c (e1fd7341837238c6c5380c5073887d238f706cf0) |
---|---|
1/* 2 * OHCI HCD (Host Controller Driver) for USB. 3 * 4 * Copyright (C) 2004 SAN People (Pty) Ltd. 5 * Copyright (C) 2005 Thibaut VARENE <varenet@parisc-linux.org> 6 * 7 * AT91 Bus Glue 8 * --- 522 unchanged lines hidden (view full) --- 531 532 if (!np) 533 return 0; 534 535 /* Right now device-tree probed devices don't get dma_mask set. 536 * Since shared usb code relies on it, set it here for now. 537 * Once we have dma capability bindings this can go away. 538 */ | 1/* 2 * OHCI HCD (Host Controller Driver) for USB. 3 * 4 * Copyright (C) 2004 SAN People (Pty) Ltd. 5 * Copyright (C) 2005 Thibaut VARENE <varenet@parisc-linux.org> 6 * 7 * AT91 Bus Glue 8 * --- 522 unchanged lines hidden (view full) --- 531 532 if (!np) 533 return 0; 534 535 /* Right now device-tree probed devices don't get dma_mask set. 536 * Since shared usb code relies on it, set it here for now. 537 * Once we have dma capability bindings this can go away. 538 */ |
539 if (!pdev->dev.dma_mask) 540 pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; 541 ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); | 539 ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); |
542 if (ret) 543 return ret; 544 545 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); 546 if (!pdata) 547 return -ENOMEM; 548 549 if (!of_property_read_u32(np, "num-ports", &ports)) --- 198 unchanged lines hidden --- | 540 if (ret) 541 return ret; 542 543 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); 544 if (!pdata) 545 return -ENOMEM; 546 547 if (!of_property_read_u32(np, "num-ports", &ports)) --- 198 unchanged lines hidden --- |