Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: spi-pl022: convert to clk_prepare()/clk_unprepare()

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

+10
+10
drivers/spi/spi-pl022.c
··· 2187 2187 dev_err(&adev->dev, "could not retrieve SSP/SPI bus clock\n"); 2188 2188 goto err_no_clk; 2189 2189 } 2190 + 2191 + status = clk_prepare(pl022->clk); 2192 + if (status) { 2193 + dev_err(&adev->dev, "could not prepare SSP/SPI bus clock\n"); 2194 + goto err_clk_prep; 2195 + } 2196 + 2190 2197 /* Disable SSP */ 2191 2198 writew((readw(SSP_CR1(pl022->virtbase)) & (~SSP_CR1_MASK_SSE)), 2192 2199 SSP_CR1(pl022->virtbase)); ··· 2245 2238 pl022_dma_remove(pl022); 2246 2239 free_irq(adev->irq[0], pl022); 2247 2240 err_no_irq: 2241 + clk_unprepare(pl022->clk); 2242 + err_clk_prep: 2248 2243 clk_put(pl022->clk); 2249 2244 err_no_clk: 2250 2245 iounmap(pl022->virtbase); ··· 2280 2271 pl022_dma_remove(pl022); 2281 2272 free_irq(adev->irq[0], pl022); 2282 2273 clk_disable(pl022->clk); 2274 + clk_unprepare(pl022->clk); 2283 2275 clk_put(pl022->clk); 2284 2276 iounmap(pl022->virtbase); 2285 2277 amba_release_regions(adev);