ohci-exynos.c (22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b) | ohci-exynos.c (e1fd7341837238c6c5380c5073887d238f706cf0) |
---|---|
1/* 2 * SAMSUNG EXYNOS USB HOST OHCI Controller 3 * 4 * Copyright (C) 2011 Samsung Electronics Co.Ltd 5 * Author: Jingoo Han <jg1.han@samsung.com> 6 * 7 * This program is free software; you can redistribute it and/or modify it 8 * under the terms of the GNU General Public License as published by the --- 100 unchanged lines hidden (view full) --- 109 int irq; 110 int err; 111 112 /* 113 * Right now device-tree probed devices don't get dma_mask set. 114 * Since shared usb code relies on it, set it here for now. 115 * Once we move to full device tree support this will vanish off. 116 */ | 1/* 2 * SAMSUNG EXYNOS USB HOST OHCI Controller 3 * 4 * Copyright (C) 2011 Samsung Electronics Co.Ltd 5 * Author: Jingoo Han <jg1.han@samsung.com> 6 * 7 * This program is free software; you can redistribute it and/or modify it 8 * under the terms of the GNU General Public License as published by the --- 100 unchanged lines hidden (view full) --- 109 int irq; 110 int err; 111 112 /* 113 * Right now device-tree probed devices don't get dma_mask set. 114 * Since shared usb code relies on it, set it here for now. 115 * Once we move to full device tree support this will vanish off. 116 */ |
117 if (!pdev->dev.dma_mask) 118 pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; 119 err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); | 117 err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); |
120 if (err) 121 return err; 122 123 exynos_ohci = devm_kzalloc(&pdev->dev, sizeof(struct exynos_ohci_hcd), 124 GFP_KERNEL); 125 if (!exynos_ohci) 126 return -ENOMEM; 127 --- 210 unchanged lines hidden --- | 118 if (err) 119 return err; 120 121 exynos_ohci = devm_kzalloc(&pdev->dev, sizeof(struct exynos_ohci_hcd), 122 GFP_KERNEL); 123 if (!exynos_ohci) 124 return -ENOMEM; 125 --- 210 unchanged lines hidden --- |