diff options
Diffstat (limited to 'drivers/dma/xilinx/xilinx_dma.c')
| -rw-r--r-- | drivers/dma/xilinx/xilinx_dma.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c index 8cf87b1a284b..8722bcba489d 100644 --- a/drivers/dma/xilinx/xilinx_dma.c +++ b/drivers/dma/xilinx/xilinx_dma.c | |||
| @@ -2124,7 +2124,7 @@ static int axidma_clk_init(struct platform_device *pdev, struct clk **axi_clk, | |||
| 2124 | *axi_clk = devm_clk_get(&pdev->dev, "s_axi_lite_aclk"); | 2124 | *axi_clk = devm_clk_get(&pdev->dev, "s_axi_lite_aclk"); |
| 2125 | if (IS_ERR(*axi_clk)) { | 2125 | if (IS_ERR(*axi_clk)) { |
| 2126 | err = PTR_ERR(*axi_clk); | 2126 | err = PTR_ERR(*axi_clk); |
| 2127 | dev_err(&pdev->dev, "failed to get axi_aclk (%u)\n", err); | 2127 | dev_err(&pdev->dev, "failed to get axi_aclk (%d)\n", err); |
| 2128 | return err; | 2128 | return err; |
| 2129 | } | 2129 | } |
| 2130 | 2130 | ||
| @@ -2142,25 +2142,25 @@ static int axidma_clk_init(struct platform_device *pdev, struct clk **axi_clk, | |||
| 2142 | 2142 | ||
| 2143 | err = clk_prepare_enable(*axi_clk); | 2143 | err = clk_prepare_enable(*axi_clk); |
| 2144 | if (err) { | 2144 | if (err) { |
| 2145 | dev_err(&pdev->dev, "failed to enable axi_clk (%u)\n", err); | 2145 | dev_err(&pdev->dev, "failed to enable axi_clk (%d)\n", err); |
| 2146 | return err; | 2146 | return err; |
| 2147 | } | 2147 | } |
| 2148 | 2148 | ||
| 2149 | err = clk_prepare_enable(*tx_clk); | 2149 | err = clk_prepare_enable(*tx_clk); |
| 2150 | if (err) { | 2150 | if (err) { |
| 2151 | dev_err(&pdev->dev, "failed to enable tx_clk (%u)\n", err); | 2151 | dev_err(&pdev->dev, "failed to enable tx_clk (%d)\n", err); |
| 2152 | goto err_disable_axiclk; | 2152 | goto err_disable_axiclk; |
| 2153 | } | 2153 | } |
| 2154 | 2154 | ||
| 2155 | err = clk_prepare_enable(*rx_clk); | 2155 | err = clk_prepare_enable(*rx_clk); |
| 2156 | if (err) { | 2156 | if (err) { |
| 2157 | dev_err(&pdev->dev, "failed to enable rx_clk (%u)\n", err); | 2157 | dev_err(&pdev->dev, "failed to enable rx_clk (%d)\n", err); |
| 2158 | goto err_disable_txclk; | 2158 | goto err_disable_txclk; |
| 2159 | } | 2159 | } |
| 2160 | 2160 | ||
| 2161 | err = clk_prepare_enable(*sg_clk); | 2161 | err = clk_prepare_enable(*sg_clk); |
| 2162 | if (err) { | 2162 | if (err) { |
| 2163 | dev_err(&pdev->dev, "failed to enable sg_clk (%u)\n", err); | 2163 | dev_err(&pdev->dev, "failed to enable sg_clk (%d)\n", err); |
| 2164 | goto err_disable_rxclk; | 2164 | goto err_disable_rxclk; |
| 2165 | } | 2165 | } |
| 2166 | 2166 | ||
| @@ -2189,26 +2189,26 @@ static int axicdma_clk_init(struct platform_device *pdev, struct clk **axi_clk, | |||
| 2189 | *axi_clk = devm_clk_get(&pdev->dev, "s_axi_lite_aclk"); | 2189 | *axi_clk = devm_clk_get(&pdev->dev, "s_axi_lite_aclk"); |
| 2190 | if (IS_ERR(*axi_clk)) { | 2190 | if (IS_ERR(*axi_clk)) { |
| 2191 | err = PTR_ERR(*axi_clk); | 2191 | err = PTR_ERR(*axi_clk); |
| 2192 | dev_err(&pdev->dev, "failed to get axi_clk (%u)\n", err); | 2192 | dev_err(&pdev->dev, "failed to get axi_clk (%d)\n", err); |
| 2193 | return err; | 2193 | return err; |
| 2194 | } | 2194 | } |
| 2195 | 2195 | ||
| 2196 | *dev_clk = devm_clk_get(&pdev->dev, "m_axi_aclk"); | 2196 | *dev_clk = devm_clk_get(&pdev->dev, "m_axi_aclk"); |
| 2197 | if (IS_ERR(*dev_clk)) { | 2197 | if (IS_ERR(*dev_clk)) { |
| 2198 | err = PTR_ERR(*dev_clk); | 2198 | err = PTR_ERR(*dev_clk); |
| 2199 | dev_err(&pdev->dev, "failed to get dev_clk (%u)\n", err); | 2199 | dev_err(&pdev->dev, "failed to get dev_clk (%d)\n", err); |
| 2200 | return err; | 2200 | return err; |
| 2201 | } | 2201 | } |
| 2202 | 2202 | ||
| 2203 | err = clk_prepare_enable(*axi_clk); | 2203 | err = clk_prepare_enable(*axi_clk); |
| 2204 | if (err) { | 2204 | if (err) { |
| 2205 | dev_err(&pdev->dev, "failed to enable axi_clk (%u)\n", err); | 2205 | dev_err(&pdev->dev, "failed to enable axi_clk (%d)\n", err); |
| 2206 | return err; | 2206 | return err; |
| 2207 | } | 2207 | } |
| 2208 | 2208 | ||
| 2209 | err = clk_prepare_enable(*dev_clk); | 2209 | err = clk_prepare_enable(*dev_clk); |
| 2210 | if (err) { | 2210 | if (err) { |
| 2211 | dev_err(&pdev->dev, "failed to enable dev_clk (%u)\n", err); | 2211 | dev_err(&pdev->dev, "failed to enable dev_clk (%d)\n", err); |
| 2212 | goto err_disable_axiclk; | 2212 | goto err_disable_axiclk; |
| 2213 | } | 2213 | } |
| 2214 | 2214 | ||
| @@ -2229,7 +2229,7 @@ static int axivdma_clk_init(struct platform_device *pdev, struct clk **axi_clk, | |||
| 2229 | *axi_clk = devm_clk_get(&pdev->dev, "s_axi_lite_aclk"); | 2229 | *axi_clk = devm_clk_get(&pdev->dev, "s_axi_lite_aclk"); |
| 2230 | if (IS_ERR(*axi_clk)) { | 2230 | if (IS_ERR(*axi_clk)) { |
| 2231 | err = PTR_ERR(*axi_clk); | 2231 | err = PTR_ERR(*axi_clk); |
| 2232 | dev_err(&pdev->dev, "failed to get axi_aclk (%u)\n", err); | 2232 | dev_err(&pdev->dev, "failed to get axi_aclk (%d)\n", err); |
| 2233 | return err; | 2233 | return err; |
| 2234 | } | 2234 | } |
| 2235 | 2235 | ||
| @@ -2251,31 +2251,31 @@ static int axivdma_clk_init(struct platform_device *pdev, struct clk **axi_clk, | |||
| 2251 | 2251 | ||
| 2252 | err = clk_prepare_enable(*axi_clk); | 2252 | err = clk_prepare_enable(*axi_clk); |
| 2253 | if (err) { | 2253 | if (err) { |
| 2254 | dev_err(&pdev->dev, "failed to enable axi_clk (%u)\n", err); | 2254 | dev_err(&pdev->dev, "failed to enable axi_clk (%d)\n", err); |
| 2255 | return err; | 2255 | return err; |
| 2256 | } | 2256 | } |
| 2257 | 2257 | ||
| 2258 | err = clk_prepare_enable(*tx_clk); | 2258 | err = clk_prepare_enable(*tx_clk); |
| 2259 | if (err) { | 2259 | if (err) { |
| 2260 | dev_err(&pdev->dev, "failed to enable tx_clk (%u)\n", err); | 2260 | dev_err(&pdev->dev, "failed to enable tx_clk (%d)\n", err); |
| 2261 | goto err_disable_axiclk; | 2261 | goto err_disable_axiclk; |
| 2262 | } | 2262 | } |
| 2263 | 2263 | ||
| 2264 | err = clk_prepare_enable(*txs_clk); | 2264 | err = clk_prepare_enable(*txs_clk); |
| 2265 | if (err) { | 2265 | if (err) { |
| 2266 | dev_err(&pdev->dev, "failed to enable txs_clk (%u)\n", err); | 2266 | dev_err(&pdev->dev, "failed to enable txs_clk (%d)\n", err); |
| 2267 | goto err_disable_txclk; | 2267 | goto err_disable_txclk; |
| 2268 | } | 2268 | } |
| 2269 | 2269 | ||
| 2270 | err = clk_prepare_enable(*rx_clk); | 2270 | err = clk_prepare_enable(*rx_clk); |
| 2271 | if (err) { | 2271 | if (err) { |
| 2272 | dev_err(&pdev->dev, "failed to enable rx_clk (%u)\n", err); | 2272 | dev_err(&pdev->dev, "failed to enable rx_clk (%d)\n", err); |
| 2273 | goto err_disable_txsclk; | 2273 | goto err_disable_txsclk; |
| 2274 | } | 2274 | } |
| 2275 | 2275 | ||
| 2276 | err = clk_prepare_enable(*rxs_clk); | 2276 | err = clk_prepare_enable(*rxs_clk); |
| 2277 | if (err) { | 2277 | if (err) { |
| 2278 | dev_err(&pdev->dev, "failed to enable rxs_clk (%u)\n", err); | 2278 | dev_err(&pdev->dev, "failed to enable rxs_clk (%d)\n", err); |
| 2279 | goto err_disable_rxclk; | 2279 | goto err_disable_rxclk; |
| 2280 | } | 2280 | } |
| 2281 | 2281 | ||
