@@ -265,7 +265,6 @@ static void qoriq_tmu_action(void *p)
265265 struct qoriq_tmu_data * data = p ;
266266
267267 regmap_write (data -> regmap , REGS_TMR , TMR_DISABLE );
268- clk_disable_unprepare (data -> clk );
269268}
270269
271270static int qoriq_tmu_probe (struct platform_device * pdev )
@@ -296,38 +295,27 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
296295
297296 base = devm_platform_ioremap_resource (pdev , 0 );
298297 ret = PTR_ERR_OR_ZERO (base );
299- if (ret ) {
300- dev_err (dev , "Failed to get memory region\n" );
301- return ret ;
302- }
298+ if (ret )
299+ return dev_err_probe (dev , ret , "Failed to get memory region\n" );
303300
304301 data -> regmap = devm_regmap_init_mmio (dev , base , & regmap_config );
305302 ret = PTR_ERR_OR_ZERO (data -> regmap );
306- if (ret ) {
307- dev_err (dev , "Failed to init regmap (%d)\n" , ret );
308- return ret ;
309- }
303+ if (ret )
304+ return dev_err_probe (dev , ret , "Failed to init regmap\n" );
310305
311- data -> clk = devm_clk_get_optional (dev , NULL );
306+ data -> clk = devm_clk_get_optional_enabled (dev , NULL );
312307 if (IS_ERR (data -> clk ))
313308 return PTR_ERR (data -> clk );
314309
315- ret = clk_prepare_enable (data -> clk );
316- if (ret ) {
317- dev_err (dev , "Failed to enable clock\n" );
318- return ret ;
319- }
320-
321310 ret = devm_add_action_or_reset (dev , qoriq_tmu_action , data );
322311 if (ret )
323312 return ret ;
324313
325314 /* version register offset at: 0xbf8 on both v1 and v2 */
326315 ret = regmap_read (data -> regmap , REGS_IPBRR (0 ), & ver );
327- if (ret ) {
328- dev_err (& pdev -> dev , "Failed to read IP block version\n" );
329- return ret ;
330- }
316+ if (ret )
317+ return dev_err_probe (dev , ret , "Failed to read IP block version\n" );
318+
331319 data -> ver = (ver >> 8 ) & 0xff ;
332320
333321 qoriq_tmu_init_device (data ); /* TMU initialization */
@@ -337,10 +325,8 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
337325 return ret ;
338326
339327 ret = qoriq_tmu_register_tmu_zone (dev , data );
340- if (ret < 0 ) {
341- dev_err (dev , "Failed to register sensors\n" );
342- return ret ;
343- }
328+ if (ret < 0 )
329+ return dev_err_probe (dev , ret , "Failed to register sensors\n" );
344330
345331 platform_set_drvdata (pdev , data );
346332
0 commit comments