ohci-spear.c (22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b) | ohci-spear.c (e1fd7341837238c6c5380c5073887d238f706cf0) |
---|---|
1/* 2* OHCI HCD (Host Controller Driver) for USB. 3* 4* Copyright (C) 2010 ST Microelectronics. 5* Deepak Sikri<deepak.sikri@st.com> 6* 7* Based on various ohci-*.c drivers 8* --- 97 unchanged lines hidden (view full) --- 106 goto fail; 107 } 108 109 /* 110 * Right now device-tree probed devices don't get dma_mask set. 111 * Since shared usb code relies on it, set it here for now. 112 * Once we have dma capability bindings this can go away. 113 */ | 1/* 2* OHCI HCD (Host Controller Driver) for USB. 3* 4* Copyright (C) 2010 ST Microelectronics. 5* Deepak Sikri<deepak.sikri@st.com> 6* 7* Based on various ohci-*.c drivers 8* --- 97 unchanged lines hidden (view full) --- 106 goto fail; 107 } 108 109 /* 110 * Right now device-tree probed devices don't get dma_mask set. 111 * Since shared usb code relies on it, set it here for now. 112 * Once we have dma capability bindings this can go away. 113 */ |
114 if (!pdev->dev.dma_mask) 115 pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; 116 retval = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); | 114 retval = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); |
117 if (retval) 118 goto fail; 119 120 usbh_clk = devm_clk_get(&pdev->dev, NULL); 121 if (IS_ERR(usbh_clk)) { 122 dev_err(&pdev->dev, "Error getting interface clock\n"); 123 retval = PTR_ERR(usbh_clk); 124 goto fail; --- 114 unchanged lines hidden --- | 115 if (retval) 116 goto fail; 117 118 usbh_clk = devm_clk_get(&pdev->dev, NULL); 119 if (IS_ERR(usbh_clk)) { 120 dev_err(&pdev->dev, "Error getting interface clock\n"); 121 retval = PTR_ERR(usbh_clk); 122 goto fail; --- 114 unchanged lines hidden --- |